diff options
| -rw-r--r-- | .vscode/launch.json | 16 | ||||
| -rw-r--r-- | Cargo.lock | 22 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/test.rs | 8 |
4 files changed, 24 insertions, 24 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index c4c60c9..07691f6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,15 +7,15 @@ { "type": "lldb", "request": "launch", - "name": "Debug executable 'prog-lang-dev1'", + "name": "Debug executable 'tunk'", "cargo": { "args": [ "build", - "--bin=prog-lang-dev1", - "--package=prog-lang-dev1" + "--bin=tunk", + "--package=tunk" ], "filter": { - "name": "prog-lang-dev1", + "name": "tunk", "kind": "bin" } }, @@ -27,16 +27,16 @@ { "type": "lldb", "request": "launch", - "name": "Debug unit tests in executable 'prog-lang-dev1'", + "name": "Debug unit tests in executable 'tunk'", "cargo": { "args": [ "test", "--no-run", - "--bin=prog-lang-dev1", - "--package=prog-lang-dev1" + "--bin=tunk", + "--package=tunk" ], "filter": { - "name": "prog-lang-dev1", + "name": "tunk", "kind": "bin" } }, @@ -191,15 +191,6 @@ dependencies = [ ] [[package]] -name = "prog-lang-dev1" -version = "0.1.0" -dependencies = [ - "pest", - "pest_derive", - "serial_test", -] - -[[package]] name = "quote" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -265,9 +256,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "syn" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" +checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" dependencies = [ "proc-macro2", "quote", @@ -275,6 +266,15 @@ dependencies = [ ] [[package]] +name = "tunk" +version = "0.1.0" +dependencies = [ + "pest", + "pest_derive", + "serial_test", +] + +[[package]] name = "typenum" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1,5 +1,5 @@ [package] -name = "prog-lang-dev1" +name = "tunk" version = "0.1.0" edition = "2021" diff --git a/src/test.rs b/src/test.rs index 3ec0ac3..c799b21 100644 --- a/src/test.rs +++ b/src/test.rs @@ -7,7 +7,7 @@ use std::sync::atomic::Ordering; fn evaluate_from_source( content: String, - initial_symbol_table: Option<HashMap<String, Rc<Term>>>, + initial_symbol_table: Option<&mut HashMap<String, Rc<Term>>>, ) -> ProcessResult { use ast::Program; use pest::Parser; @@ -136,7 +136,7 @@ fn reduce_parameterized_func() -> Result<(), String> { initial_symbol_table.insert("f".to_owned(), Rc::clone(&predefined_f)); let (terms, symbol_table) = - evaluate_from_source(source.to_owned(), Some(initial_symbol_table))?; + evaluate_from_source(source.to_owned(), Some(&mut initial_symbol_table))?; assert_eq!(terms.len(), 1); let term = &terms[0]; @@ -356,7 +356,7 @@ fn problem_triangle_numbers() -> Result<(), String> { n (triangle (int.sub n 1))); - triangle 500; + triangle 100; "; let (terms, symbol_table) = evaluate_from_source(source.to_owned(), None)?; @@ -364,7 +364,7 @@ fn problem_triangle_numbers() -> Result<(), String> { let term1 = &terms[0]; let result_rc = repeatedly_reduce_term(&symbol_table, Rc::clone(term1), &None)?; - let expected = Term::Primitive(Value::Integer(125250)); + let expected = Term::Primitive(Value::Integer(5050)); assert_eq!(*result_rc, expected); |