Changeset 1751

Timestamp:

11/18/07 21:17:43 (14 months ago)

Author:

nishio

Message:

lang/unlambda/impl/in_python: support [d], the delay special form

Files:

• lang/unlambda/impl/in_python/unlambda.py (modified) (9 diffs)

lang/unlambda/impl/in_python/unlambda.py

@@ -4 +4 @@
 >>> run("`.ai")
 a
+>>> run("``i.ai")
+a
+>>> run("`i`.ai")
+a
+>>> run("`d`.ai")
+>>> run("``d`.aii")
+a
+>>> run("`.b`i`.ai")
+ab
+>>> run("`.b`d`.ai")
+b
+>>> run("``.b`d`.aii")
+ba
+"""
 
-"""
-globals().clear()
 # Main loop
 #
@@ -30 +42 @@
 def EvalTask(node, cont):
     def run():
+        #print node
         return node.eval(cont)
     return run
@@ -40 +53 @@
 class I(Node):
     "identity"
+    def __str__(self):
+        return "I"
     def eval(self, cont):
         def I0(X, cont):
-            return cont.invoke(X)
+            return cont(X)
         return cont(I0)
 
@@ -49 +64 @@
     def __init__(self, c):
         self.c = c
+    def __str__(self):
+        return "(print %r)" % self.c
     def eval(self, cont):
         def Dot0(X, cont):
@@ -62 +79 @@
         self.nX = X
         self.nY = Y
+    def __str__(self):
+        return "(apply %s %s)" % (self.nX, self.nY)
     def eval(self, cont):
         nY = self.nY
@@ -68 +87 @@
                 "evalated X and not-evaluated Y"
 
-#                if X.isDelay:
-#                     return self.cont.invoke(D1Function(self.nY))
+                if X.__class__ == D:
+                    def Promise0(Y, cont):
+                        def next(X):
+                            def Promise1(X, cont):
+                                return X(Y, cont)
+                            return cont(Promise1)
+                        return nY.eval(next)
+                    return cont(Promise0)
 
                 def next(Y):
@@ -78 +103 @@
             return _App1
         return EvalTask(self.nX, next)
-    
+
+class D(Node):
+    def __str__(self):
+         return "D"
+    def eval(self, cont):
+        return cont(self)
+    def __call__(self, Y, cont):
+        raise NotImplemented
+
 def _parse(iter):
     c = iter.next()
@@ -85 +118 @@
         ".": lambda: Dot(iter.next()),
         "`": lambda: (lambda f=_parse(iter): Apply(f, _parse(iter)))(),
+        "r": lambda: Dor("\n"),
+        "d": lambda: D(), # special form
 
-        "r": lambda: R(),
         "v": lambda: V(),
-        "d": lambda: "(delay)", # special form
         "c": lambda: C(),
         "s": lambda: S(),
@@ -103 +136 @@
     doctest.testmod()
 
-run("`.ai")