we now have macros

halgari · halgari · commit 3144802dbc91 · 2014-10-10T21:24:55.000-06:00
diff --git a/pixie/stdlib.lisp b/pixie/stdlib.lisp
@@ -166,3 +166,12 @@
 (extend -seq PersistentVector sequence)
 
 (def concat (fn [& args] (transduce cat conj args)))
+
+(def defn (fn [nm & rest] `(def ~nm (fn ~nm ~@rest))))
+(set-macro! defn)
+
+(defn defmacro [nm & rest]
+  `(do (defn ~nm ~@rest)
+       (set-macro! ~nm)
+       ~nm))
+(set-macro! defmacro)
diff --git a/pixie/vm/code.py b/pixie/vm/code.py
@@ -43,7 +43,13 @@
 
 class BaseCode(object.Object):
     def __init__(self):
-        pass
+        self._is_macro = False
+
+    def set_macro(self):
+        self._is_macro = true
+
+    def is_macro(self):
+        return self._is_macro
 
     def _invoke(self, args):
         raise NotImplementedError()
@@ -71,6 +77,7 @@ def type(self):
         return MultiArityFn._type
 
     def __init__(self, arities, required_arity=0, rest_fn=None):
+        BaseCode.__init__(self)
         self._arities = arities
         self._required_arity = required_arity
         self._rest_fn = rest_fn
@@ -188,7 +195,7 @@ def type(self):
 
 class Var(BaseCode):
     _type = object.Type(u"Var")
-    _immutable_fields_ = ["_rev?"]
+    _immutable_fields_ = ["_rev?", "_is_macro?"]
 
     def type(self):
         return Var._type
@@ -214,10 +221,15 @@ def deref(self):
         assert val is not undefined, u"Var " + self._name + u" is undefined"
         return val
 
+    def is_defined(self):
+        return self._root is not undefined
+
     def _invoke(self, args):
         return self.deref().invoke(args)
 
 
+
+
 class Namespace(py_object):
     def __init__(self, name):
         self._registry = {}
@@ -307,6 +319,7 @@ def type(self):
 
     __immutable_fields__ = ["_rev?"]
     def __init__(self, name, protocol):
+        BaseCode.__init__(self)
         self._name = name
         self._dict = {}
         self._rev = 0
diff --git a/pixie/vm/compiler.py b/pixie/vm/compiler.py
@@ -203,8 +203,36 @@ def emit(self, ctx):
 
 
 
-
-
+def resolve_var(ctx, name):
+    var = code.get_var_if_defined(ctx.ns, name)
+    if var is None:
+        var = code.get_var_if_defined(u"pixie.stdlib", name)
+    return var
+
+def resolve_local(ctx, name):
+    return ctx.get_local(name)
+
+
+def is_macro_call(form, ctx):
+    if rt.seq_QMARK_(form) is true and isinstance(rt.first(form), symbol.Symbol):
+        name = rt.first(form)._str
+        if resolve_local(ctx, name):
+            return None
+        var = resolve_var(ctx, name)
+
+        if var and var.is_defined():
+            val = var.deref()
+            if isinstance(val, code.BaseCode) and val.is_macro():
+                return val
+    return None
+
+def call_macro(var, form, ctx):
+    form = rt.next(form)
+    args = []
+    while form is not nil:
+        args.append(rt.first(form))
+        form = rt.next(form)
+    return var.invoke(args)
 
 def compile_form(form, ctx):
     if rt.instance_QMARK_(form, rt.ISeq.deref()) is true and form is not nil:
@@ -215,12 +243,9 @@ def compile_form(form, ctx):
 
     if isinstance(form, symbol.Symbol):
         name = form._str
-        loc = ctx.get_local(name)
+        loc = resolve_local(ctx, name)
         if loc is None:
-            var = code.get_var_if_defined(ctx.ns, name)
-            if var is None:
-                var = code.get_var_if_defined(u"pixie.stdlib", name)
-
+            var = resolve_var(ctx, name)
             if var is None:
                 var = _type_registry.get_by_name(name, None)
                 if var is not None:
@@ -412,10 +437,10 @@ def compile_if(form, ctx):
     ctx.mark(else_lbl)
 
 def compile_def(form, ctx):
-    form = form.next()
-    name = form.first()
-    form = form.next()
-    val = form.first()
+    form = rt.next(form)
+    name = rt.first(form)
+    form = rt.next(form)
+    val = rt.first(form)
 
     assert isinstance(name, symbol.Symbol)
 
@@ -426,12 +451,12 @@ def compile_def(form, ctx):
     ctx.sub_sp(1)
 
 def compile_do(form, ctx):
-    form = form.next()
+    form = rt.next(form)
     assert form is not nil
 
     while True:
-        compile_form(form.first(), ctx)
-        form = form.next()
+        compile_form(rt.first(form), ctx)
+        form = rt.next(form)
 
         if form is nil:
             return
@@ -546,10 +571,15 @@ def compile_loop(form, ctx):
             u"let": compile_let,
             u"loop": compile_loop}
 
+
 def compile_cons(form, ctx):
     if isinstance(form.first(), symbol.Symbol) and form.first()._str in builtins:
         return builtins[form.first()._str](form, ctx)
 
+    macro = is_macro_call(form, ctx)
+    if macro:
+        return compile_cons(call_macro(macro, form, ctx), ctx)
+
     cnt = 0
     ctc = ctx.can_tail_call
     while form is not nil:
diff --git a/pixie/vm/protocols.py b/pixie/vm/protocols.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from pixie.vm.object import Object, Type, _type_registry
-from pixie.vm.code import BaseCode, PolymorphicFn, wrap_fn, as_var, defprotocol, extend, Protocol
+from pixie.vm.code import BaseCode, PolymorphicFn, wrap_fn, as_var, defprotocol, extend, Protocol, Var
 from types import MethodType
 from pixie.vm.primitives import true, false, nil
 import pixie.vm.numbers as numbers
@@ -205,3 +205,9 @@ def eq(a, b):
         return true
     else:
         return rt._eq(a, b)
+
+@as_var("set-macro!")
+def set_macro(f):
+    assert isinstance(f, BaseCode)
+    f.set_macro()
+    return f
diff --git a/pixie/vm/reader.py b/pixie/vm/reader.py
@@ -171,7 +171,6 @@ def syntax_quote(self, form):
             ret = rt.list(SEQ, rt.cons(CONCAT, self.expand_list(rt.seq(form))))
         else:
             ret = rt.list(QUOTE, form)
-        print rt._str(ret)._str
         return ret
 
     def expand_list(self, form):
diff --git a/target.py b/target.py
@@ -68,6 +68,13 @@ def entry_point(foo=None):
 
     return 0
 
+@wrap_fn
+def bootstrap():
+    import pixie.vm.rt as rt
+    from pixie.vm.string import String
+    rt.load_file(String(u"pixie/stdlib.lisp"))
+
+
 from rpython.rtyper.lltypesystem import lltype
 from rpython.jit.metainterp import warmspot
 
@@ -132,8 +139,6 @@ def target(*args):
 print rpython.config.translationoption.get_combined_translation_config()
 
 if __name__ == "__main__":
-    import pixie.vm.rt as rt
-    from pixie.vm.string import String
-    rt.load_file(String(u"pixie/stdlib.lisp"))
     #run_debug(sys.argv)
+    with_stacklets(bootstrap)
     entry_point()
