Fix metadata on functions.

- Don't use metadata to store ast, env, params data.
- In Clojure, store metadata on the :meta key of the real metadata.
  This also allows using any datatype as metadata.

1 files changed, 3 insertions, 4 deletions

diff --git a/python/step8_macros.py b/python/step8_macros.py
index 6e2bd45..5d9151a 100644
--- a/python/step8_macros.py
+++ b/python/step8_macros.py
@@ -107,10 +107,9 @@ def EVAL(ast, env):
         else:
             el = eval_ast(ast, env)
             f = el[0]
-            if hasattr(f, '__meta__') and f.__meta__.has_key("exp"):
-                m = f.__meta__
-                ast = m['exp']
-                env = Env(m['env'], m['params'], el[1:])
+            if hasattr(f, '__ast__'):
+                ast = f.__ast__
+                env = f.__gen_env__(el[1:])
             else:
                 return f(*el[1:])