rpython: complete the eval_ast merge, add DEBUG-EVAL

Commit 0338927 had only updated stepA.

impls/rpython/env.py

@@ -38,3 +38,9 @@ def get(self, key):
         env = self.find(key)
         if not env: throw_str("'" + str(key.value) + "' not found")
         return env.data[key.value]
+
+    def get_or_None:
+        assert isinstance(key, MalSym)
+        env = self.find(key)
+        if not env: return None
+        return env.data[key.value]

impls/rpython/step2_eval.py

@@ -12,17 +12,20 @@ def READ(str):
 
 # eval
 def eval_ast(ast, env):
+    assert isinstance(ast, MalList)
+    res = []
+    for a in ast.values:
+        res.append(EVAL(a, env))
+    return MalList(res)
+
+def EVAL(ast, env):
+    # print(u"EVAL " + printer._pr_str(ast))
     if types._symbol_Q(ast):
         assert isinstance(ast, MalSym)
         if ast.value in env:
             return env[ast.value]
         else:
             raise Exception(u"'" + ast.value + u"' not found")
-    elif types._list_Q(ast):
-        res = []
-        for a in ast.values:
-            res.append(EVAL(a, env))
-        return MalList(res)
     elif types._vector_Q(ast):
         res = []
         for a in ast.values:
@@ -33,14 +36,9 @@ def eval_ast(ast, env):
         for k in ast.dct.keys():
             new_dct[k] = EVAL(ast.dct[k], env)
         return MalHashMap(new_dct)
-    else:
+    elif not types._list_Q(ast):
         return ast  # primitive value, return unchanged
-
-def EVAL(ast, env):
-        #print("EVAL %s" % printer._pr_str(ast))
-        if not types._list_Q(ast):
-            return eval_ast(ast, env)
-
+    else:
         # apply list
         if len(ast) == 0: return ast
         el = eval_ast(ast, env)

impls/rpython/step3_env.py

@@ -3,6 +3,7 @@
 import mal_types as types
 from mal_types import (MalSym, MalInt, MalStr,
                        _symbol, _keywordu,
+                       nil, false, throw_str,
                        MalList, _list, MalVector, MalHashMap, MalFunc)
 import reader, printer
 from env import Env
@@ -13,14 +14,18 @@ def READ(str):
 
 # eval
 def eval_ast(ast, env):
+    assert isinstance(ast, MalList)
+    res = []
+    for a in ast.values:
+        res.append(EVAL(a, env))
+    return MalList(res)
+
+def EVAL(ast, env):
+    if env.get_or_None(MalSym(u"DEBUG-EVAL")) not in (None, nil, false):
+        print(u"EVAL " + printer._pr_str(ast))
     if types._symbol_Q(ast):
         assert isinstance(ast, MalSym)
         return env.get(ast)
-    elif types._list_Q(ast):
-        res = []
-        for a in ast.values:
-            res.append(EVAL(a, env))
-        return MalList(res)
     elif types._vector_Q(ast):
         res = []
         for a in ast.values:
@@ -31,14 +36,9 @@ def eval_ast(ast, env):
         for k in ast.dct.keys():
             new_dct[k] = EVAL(ast.dct[k], env)
         return MalHashMap(new_dct)
-    else:
+    elif not types._list_Q(ast):
         return ast  # primitive value, return unchanged
-
-def EVAL(ast, env):
-        #print("EVAL %s" % printer._pr_str(ast))
-        if not types._list_Q(ast):
-            return eval_ast(ast, env)
-
+    else:
         # apply list
         if len(ast) == 0: return ast
         a0 = ast[0]

impls/rpython/step4_if_fn_do.py

@@ -3,6 +3,7 @@
 import mal_types as types
 from mal_types import (MalSym, MalInt, MalStr,
                        nil, true, false, _symbol, _keywordu,
+                       throw_str,
                        MalList, _list, MalVector, MalHashMap, MalFunc)
 import reader, printer
 from env import Env
@@ -14,14 +15,18 @@ def READ(str):
 
 # eval
 def eval_ast(ast, env):
+    assert isinstance(ast, MalList)
+    res = []
+    for a in ast.values:
+        res.append(EVAL(a, env))
+    return MalList(res)
+
+def EVAL(ast, env):
+    if env.get_or_None(MalSym(u"DEBUG-EVAL")) not in (None, nil, false):
+        print(u"EVAL " + printer._pr_str(ast))
     if types._symbol_Q(ast):
         assert isinstance(ast, MalSym)
         return env.get(ast)
-    elif types._list_Q(ast):
-        res = []
-        for a in ast.values:
-            res.append(EVAL(a, env))
-        return MalList(res)
     elif types._vector_Q(ast):
         res = []
         for a in ast.values:
@@ -32,14 +37,9 @@ def eval_ast(ast, env):
         for k in ast.dct.keys():
             new_dct[k] = EVAL(ast.dct[k], env)
         return MalHashMap(new_dct)
-    else:
+    elif not types._list_Q(ast):
         return ast  # primitive value, return unchanged
-
-def EVAL(ast, env):
-        #print("EVAL %s" % printer._pr_str(ast))
-        if not types._list_Q(ast):
-            return eval_ast(ast, env)
-
+    else:
         # apply list
         if len(ast) == 0: return ast
         a0 = ast[0]

impls/rpython/step5_tco.py

@@ -3,6 +3,7 @@
 import mal_types as types
 from mal_types import (MalSym, MalInt, MalStr,
                        nil, true, false, _symbol, _keywordu,
+                       throw_str,
                        MalList, _list, MalVector, MalHashMap, MalFunc)
 import reader, printer
 from env import Env
@@ -14,14 +15,19 @@ def READ(str):
 
 # eval
 def eval_ast(ast, env):
+    assert isinstance(ast, MalList)
+    res = []
+    for a in ast.values:
+        res.append(EVAL(a, env))
+    return MalList(res)
+
+def EVAL(ast, env):
+  while True:
+    if env.get_or_None(MalSym(u"DEBUG-EVAL")) not in (None, nil, false):
+        print(u"EVAL " + printer._pr_str(ast))
     if types._symbol_Q(ast):
         assert isinstance(ast, MalSym)
         return env.get(ast)
-    elif types._list_Q(ast):
-        res = []
-        for a in ast.values:
-            res.append(EVAL(a, env))
-        return MalList(res)
     elif types._vector_Q(ast):
         res = []
         for a in ast.values:
@@ -32,15 +38,9 @@ def eval_ast(ast, env):
         for k in ast.dct.keys():
             new_dct[k] = EVAL(ast.dct[k], env)
         return MalHashMap(new_dct)
-    else:
+    elif not types._list_Q(ast):
         return ast  # primitive value, return unchanged
-
-def EVAL(ast, env):
-    while True:
-        #print("EVAL %s" % printer._pr_str(ast))
-        if not types._list_Q(ast):
-            return eval_ast(ast, env)
-
+    else:
         # apply list
         if len(ast) == 0: return ast
         a0 = ast[0]

impls/rpython/step6_file.py

@@ -3,6 +3,7 @@
 import mal_types as types
 from mal_types import (MalSym, MalInt, MalStr,
                        nil, true, false, _symbol, _keywordu,
+                       throw_str,
                        MalList, _list, MalVector, MalHashMap, MalFunc)
 import reader, printer
 from env import Env
@@ -14,14 +15,19 @@ def READ(str):
 
 # eval
 def eval_ast(ast, env):
+    assert isinstance(ast, MalList)
+    res = []
+    for a in ast.values:
+        res.append(EVAL(a, env))
+    return MalList(res)
+
+def EVAL(ast, env):
+  while True:
+    if env.get_or_None(MalSym(u"DEBUG-EVAL")) not in (None, nil, false):
+        print(u"EVAL " + printer._pr_str(ast))
     if types._symbol_Q(ast):
         assert isinstance(ast, MalSym)
         return env.get(ast)
-    elif types._list_Q(ast):
-        res = []
-        for a in ast.values:
-            res.append(EVAL(a, env))
-        return MalList(res)
     elif types._vector_Q(ast):
         res = []
         for a in ast.values:
@@ -32,15 +38,9 @@ def eval_ast(ast, env):
         for k in ast.dct.keys():
             new_dct[k] = EVAL(ast.dct[k], env)
         return MalHashMap(new_dct)
-    else:
+    elif not types._list_Q(ast):
         return ast  # primitive value, return unchanged
-
-def EVAL(ast, env):
-    while True:
-        #print("EVAL %s" % printer._pr_str(ast))
-        if not types._list_Q(ast):
-            return eval_ast(ast, env)
-
+    else:
         # apply list
         if len(ast) == 0: return ast
         a0 = ast[0]

impls/rpython/step7_quote.py

@@ -3,6 +3,7 @@
 import mal_types as types
 from mal_types import (MalSym, MalInt, MalStr,
                        nil, true, false, _symbol, _keywordu,
+                       throw_str,
                        MalList, _list, MalVector, MalHashMap, MalFunc)
 import reader, printer
 from env import Env
@@ -41,14 +42,19 @@ def quasiquote(ast):
         return ast
 
 def eval_ast(ast, env):
+    assert isinstance(ast, MalList)
+    res = []
+    for a in ast.values:
+        res.append(EVAL(a, env))
+    return MalList(res)
+
+def EVAL(ast, env):
+  while True:
+    if env.get_or_None(MalSym(u"DEBUG-EVAL")) not in (None, nil, false):
+        print(u"EVAL " + printer._pr_str(ast))
     if types._symbol_Q(ast):
         assert isinstance(ast, MalSym)
         return env.get(ast)
-    elif types._list_Q(ast):
-        res = []
-        for a in ast.values:
-            res.append(EVAL(a, env))
-        return MalList(res)
     elif types._vector_Q(ast):
         res = []
         for a in ast.values:
@@ -59,15 +65,9 @@ def eval_ast(ast, env):
         for k in ast.dct.keys():
             new_dct[k] = EVAL(ast.dct[k], env)
         return MalHashMap(new_dct)
-    else:
+    elif not types._list_Q(ast):
         return ast  # primitive value, return unchanged
-
-def EVAL(ast, env):
-    while True:
-        #print("EVAL %s" % printer._pr_str(ast))
-        if not types._list_Q(ast):
-            return eval_ast(ast, env)
-
+    else:
         # apply list
         if len(ast) == 0: return ast
         a0 = ast[0]
@@ -89,8 +89,6 @@ def EVAL(ast, env):
             env = let_env # Continue loop (TCO)
         elif u"quote" == a0sym:
             return ast[1]
-        elif u"quasiquoteexpand" == a0sym:
-            return quasiquote(ast[1])
         elif u"quasiquote" == a0sym:
             ast = quasiquote(ast[1]) # Continue loop (TCO)
         elif u"do" == a0sym: