From 8cb5cda46cf3aef847ae3926dc53a5e5f87fe261 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Wed, 16 Apr 2014 23:57:50 -0500 Subject: All: move some fns to core. Major cleanup. - Don't import/require core until step4. - Define cond/or macros from step8 --- cs/step2_eval.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'cs/step2_eval.cs') diff --git a/cs/step2_eval.cs b/cs/step2_eval.cs index 09bf36d..dc467de 100644 --- a/cs/step2_eval.cs +++ b/cs/step2_eval.cs @@ -53,13 +53,13 @@ namespace Mal { // apply list MalList ast = (MalList)orig_ast; if (ast.size() == 0) { return ast; } - a0 = ast.nth(0); + a0 = ast[0]; if (!(a0 is MalSymbol)) { throw new Mal.types.MalError("attempt to apply on non-symbol '" + Mal.printer._pr_str(a0,true) + "'"); } var el = (MalList)eval_ast(ast, env); - var f = (MalFunction)el.nth(0); + var f = (MalFunction)el[0]; return f.apply(el.rest()); } @@ -92,10 +92,10 @@ namespace Mal { {"*", multiply}, {"/", divide}, }; + if (args.Length > 0 && args[0] == "--raw") { Mal.readline.mode = Mal.readline.Mode.Raw; } - while (true) { string line; try { @@ -109,14 +109,9 @@ namespace Mal { Console.WriteLine(PRINT(RE(repl_env, line))); } catch (Mal.types.MalContinue) { continue; - } catch (Mal.reader.ParseError e) { - Console.WriteLine(e.Message); - continue; - } catch (Mal.types.MalError e) { - Console.WriteLine("Error: " + e.Message); - continue; } catch (Exception e) { Console.WriteLine("Error: " + e.Message); + Console.WriteLine(e.StackTrace); continue; } } -- cgit v1.2.3