started implementing transducers, fixed closure in closure bug

halgari · halgari · commit c78ac404533f · 2014-10-07T10:23:21.000-06:00
diff --git a/pixie/vm/code.py b/pixie/vm/code.py
@@ -80,8 +80,8 @@ def get_fn(self, arity):
         f = self._arities.get(arity, None)
         if f is not None:
             return promote(f)
-        if self.rest_fn is not None and arity >= self._rest_fn:
-            return promote(self._rest_fn)
+        #if self.rest_fn is not None and arity >= self._rest_fn:
+        #    return promote(self._rest_fn)
         raise AssertionError("Wrong number of args to fn")
 
     def _invoke(self, args):
diff --git a/pixie/vm/compiler.py b/pixie/vm/compiler.py
@@ -15,10 +15,14 @@
 rt.init()
 
 class Context(object):
-    def __init__(self, name, argc, parent_locals):
-        locals = parent_locals.copy()
-        for x in locals:
-            locals[x] = Closure(locals[x])
+    def __init__(self, name, argc, parent_ctx):
+        if parent_ctx is not None:
+            assert isinstance(parent_ctx, Context)
+            locals = parent_ctx.locals[-1].copy()
+            for x in locals:
+                locals[x] = Closure(locals[x], parent_ctx)
+        else:
+            locals = {}
 
         self.bytecode = []
         self.consts = []
@@ -75,7 +79,10 @@ def get_local(self, s_name):
                 if x is local:
                     break
                 idx += 1
-            self.closed_overs.append(local.local)
+            if isinstance(local.local, Closure):
+                self.closed_overs.append(local.ctx.get_local(s_name))
+            else:
+                self.closed_overs.append(local.local)
 
             return ClosureCell(idx)
         return local
@@ -170,8 +177,9 @@ def emit(self, ctx):
         ctx.add_sp(1)
 
 class Closure(LocalType):
-    def __init__(self, local):
+    def __init__(self, local, ctx):
         self.local = local
+        self.ctx = ctx
 
 class ClosureCell(LocalType):
     def __init__(self, idx):
@@ -300,7 +308,7 @@ def compile_fn(form, ctx):
 
 def compile_fn_body(name, args, body, ctx):
     print args
-    new_ctx = Context(name._str, rt.count(args).int_val(), ctx.locals[-1])
+    new_ctx = Context(name._str, rt.count(args).int_val(), ctx)
     add_args(args, new_ctx)
     bc = 0
 
@@ -520,7 +528,7 @@ def compile_cons(form, ctx):
 
 
 def compile(form):
-    ctx = Context(u"main", 0, {})
+    ctx = Context(u"main", 0, None)
     compile_form(form, ctx)
     ctx.bytecode.append(code.RETURN)
     return ctx.to_code()
diff --git a/pixie/vm/persistent_vector.py b/pixie/vm/persistent_vector.py
@@ -121,6 +121,19 @@ def _nth(self, idx):
 def _conj(self, v):
     return self.conj(v)
 
+@extend(proto._reduce, PersistentVector._type)
+def _reduce(self, f, init):
+    assert isinstance(self, PersistentVector)
+    i = 0
+    while i < self._cnt:
+        array = self.array_for(i)
+        for j in range(len(array)):
+            init = f.invoke([init, array[j]])
+        step = len(array)
+        i += step
+    return init
+
+
 @as_var("vector")
 def vector__args(args):
     acc = EMPTY
diff --git a/pixie/vm/protocols.py b/pixie/vm/protocols.py
@@ -19,6 +19,8 @@
 
 defprotocol("pixie.stdlib", "IObject", ["-hash", "-eq", "-str", "-repr"])
 
+defprotocol("pixie.stdlib", "IReduce", ["-reduce"])
+
 def default_str(x):
     from pixie.vm.string import String
 
@@ -111,3 +113,18 @@ def _instance(o, proto):
 import pixie.vm.rt as rt
 
 
+@as_var("load_file")
+def load_file(filename):
+    import pixie.vm.reader as reader
+    import pixie.vm.compiler as compiler
+    f = open(filename._str)
+    data = f.read()
+    f.close()
+    rdr = reader.StringReader(unicode(data))
+    result = nil
+    while True:
+        form = reader.read(rdr, False)
+        if form is reader.eof:
+            return result
+
+        result = compiler.compile(form).invoke([])
diff --git a/pixie/vm/reader.py b/pixie/vm/reader.py
@@ -197,9 +197,18 @@ def read(rdr, error_on_eof):
     if macro is not None:
         return macro.invoke(rdr, ch)
 
-    if is_digit(ch) or ch == u"-":
+    if is_digit(ch):
         return read_number(rdr, ch)
 
+    if ch == u"-":
+        ch2 = rdr.read()
+        if is_digit(ch2):
+            rdr.unread(ch2)
+            return read_number(rdr, ch)
+        else:
+            rdr.unread(ch2)
+            return read_symbol(rdr, ch)
+
     return read_symbol(rdr, ch)
 
 
diff --git a/pixie/vm/util.py b/pixie/vm/util.py
@@ -56,4 +56,6 @@ def fmix(h1, length):
     h1 ^= h1 >> 13
     h1 *= 0xc2b2ae35
     h1 ^= h1 >> 16
-    return h1
+    return h1
+
+
diff --git a/target.py b/target.py
@@ -45,6 +45,7 @@ def entry_point(foo=None):
     from pixie.vm.keyword import keyword
     import pixie.vm.rt as rt
     from pixie.vm.string import String
+    rt.load_file(String(u"pixie/stdlib.lisp"))
 
     rdr = PromptReader()
     while True:
