diff options
Diffstat (limited to 'test/Spec.hs')
| -rw-r--r-- | test/Spec.hs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/test/Spec.hs b/test/Spec.hs index 1b712a8..710e528 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -5,32 +5,32 @@ import qualified Data.Map as M import Builtins import Tokenizer ( tokenize ) import Parser ( parse ) -import Evaluator ( evaluate ) -import Lib ( runInlineScript ) +import Interpreter ( evaluate, runInlineScript ) import Utils import TestUtils tokenizeTests = testGroup "tokenize" [ - do got <- expectSuccessL $ tokenize "<test>" "(+ 1 (- 10 5))" + do (got, _) <- expectSuccessL M.empty $ tokenize "<test>" "(+ 1 (- 10 5))" let expected = ["(", "+", "1", "(", "-", "10", "5", ")", ")"] assertEqual "" (map tokenContent got) expected ] parseTests = testGroup "parse" [ - do got <- expectSuccessL $ parse (map makeNonsenseToken ["(", "+", "1", "2", ")"]) + do (got, _) <- expectSuccessL M.empty $ parse (map makeNonsenseToken ["(", "+", "1", "2", ")"]) let expected = [astFunctionCall [ astSymbol "+", astInteger 1, astInteger 2 ]] assertEqual "" got expected - , do got <- expectErrorL $ parse (map makeNonsenseToken ["(", "+", "1", "2"]) + , do got <- expectErrorL M.empty $ parse (map makeNonsenseToken ["(", "+", "1", "2"]) let expected = "unbalanced function call" assertEqual "" got expected ] evaluateTests = testGroup "evaluate" [ do let env = M.fromList [builtinAdd2] :: Env - (gotEnv, gotAST) <- expectSuccessL $ evaluate 0 env (astFunctionCall - [astSymbol "+", astInteger 1, astInteger 2]) + (gotAST, LState { stateEnv = gotEnv }) <- expectSuccessL env $ + evaluate 0 (astFunctionCall [astSymbol "+", astInteger 1, astInteger 2]) + let expectedAST = astInteger 3 assertEqual "" gotAST expectedAST assertEqual "" (M.keys gotEnv) (M.keys env) @@ -39,7 +39,9 @@ evaluateTests = testGroup "evaluate" [ e2eTests = testGroup "e2e" [ do let env = M.fromList [builtinSubtract2] :: Env let script1 = "(let! sub2 (\\[a b] (- a b)))\n(sub2 3 2)" - (gotEnv, gotASTs) <- expectSuccessL $ runInlineScript "<test>" env script1 + (gotASTs, LState { stateEnv = gotEnv }) <- expectSuccessL env $ + runInlineScript "<test>" script1 + let expectedEnvKeys = ["-", "sub2"] assertEqual "" (M.keys gotEnv) expectedEnvKeys assertEqual "" (last gotASTs) (astInteger 1) |