提交: 1530ce8f9d6c265874e059a13bf32ebdfae834cf - rpypkgs (git)

Nix flake for RPython interpreters

Commit MetaInfo

• 修訂: 1530ce8f9d6c265874e059a13bf32ebdfae834cf (tree)
• 時間: 2024-05-15 11:09:37
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

reguix: Wire up basic inherits.

Change Summary

• modified: regiux/heap.py
• modified: regiux/main.py
• modified: regiux/parser.py

差異

--- a/regiux/heap.py
+++ b/regiux/heap.py
@@ -4,6 +4,10 @@ class WrongType(Exception):
     "A runtime typecheck failed."
     def __init__(self, message): self.message = message
 
+class MissingAttr(Exception):
+    "An attrset was missing an attr at runtime."
+    def __init__(self, attr): self.attr = attr
+
 class HeapObject(object):
     "A possibly-cyclic possibly-incomplete value."
     # .resolve() is implementation-internal, always call .evaluate()
@@ -20,16 +24,16 @@ class HeapObject(object):
                         self.__class__.__name__)
 
 class MutableObject(HeapObject):
-    evaluated = loop = False
+    loop = False
+    cache = None
     def evaluate(self):
-        if not self.evaluated:
+        if not self.cache:
             if self.loop: raise InfiniteLoop()
             try:
                 self.loop = True
-                return self.resolve()
-            finally:
-                self.loop = False
-                self.evaluated = True
+                self.cache = self.resolve()
+            finally: self.loop = False
+        return self.cache
 
 class HeapInt(HeapObject):
     _immutable_ = True
@@ -57,19 +61,19 @@ class HeapAttrSet(MutableObject):
             return "{ <attrset with %d items> }" % len(self.attrs)
         return "{ %s }" % " ".join(["%s = %s;" % (name, obj) for (name, obj) in self.attrs.items()])
     def resolve(self):
-        # XXX update dict?
         for obj in self.attrs.values(): obj.evaluate()
         return self
-    def getAttr(self, name): return self.attrs.get(name)
+    def getAttr(self, name):
+        try: return self.attrs[name]
+        except KeyError: raise MissingAttr(name)
 
 class HeapList(MutableObject):
     def __init__(self, objs): self.objs = objs
     def asStr(self):
-        if self.evaluated:
+        if self.cache:
             return "[ %s ]" % " ".join([obj.asStr() for obj in self.objs])
         else: return "[ <list of %d items> ]" % len(self.objs)
     def resolve(self):
-        # XXX update list?
         for obj in self.objs: obj.evaluate()
         return self
     def length(self): return len(self.objs)
@@ -81,9 +85,7 @@ class HeapSelect(MutableObject):
     def asStr(self): return self.obj.asStr() + "." + ".".join(self.path)
     def resolve(self):
         obj = self.obj
-        for segment in self.path:
-            obj = obj.evaluate().getAttr(segment)
-            if obj is None: raise ValueError("Missing attr!")
+        for segment in self.path: obj = obj.evaluate().getAttr(segment)
         return obj
 
 class HeapApp(MutableObject):

--- a/regiux/main.py
+++ b/regiux/main.py
@@ -1,7 +1,7 @@
 import sys
 
-from heap import defaultScope, WrongType
-from parser import parse, NotAnExpr, ParseError
+from heap import defaultScope, InfiniteLoop, MissingAttr, WrongType
+from parser import parse, MissingVar, NotAnExpr, ParseError
 
 def entryPoint(argv):
     if len(argv) < 2:
@@ -31,6 +31,17 @@ def entryPoint(argv):
         print "Error while compiling"
         print "Input syntax was not an expr, but:", e.cls
         return 1
+    except MissingVar as e:
+        print "Error while compiling"
+        print "Name was missing:", e.name
+        return 1
+    except InfiniteLoop as e:
+        print "Error while executing: infinite loop"
+        return 1
+    except MissingAttr as e:
+        print "Error while executing"
+        print "Attr was missing:", e.attr
+        return 1
     except WrongType as e:
         print "Error while executing"
         print "Type error:", e.message

--- a/regiux/parser.py
+++ b/regiux/parser.py
@@ -65,6 +65,9 @@ lexer = lg.build()
 class NotAnExpr(Exception):
     def __init__(self, cls): self.cls = cls
 
+class MissingVar(Exception):
+    def __init__(self, name): self.name = name
+
 class RegiuxBox(BaseBox):
     "A box for any syntax."
     cls = "unknown"
@@ -96,8 +99,9 @@ class BindsBox(EBox):
     def compile(self, scope):
         attrs = {}
         for bind in self.binds:
-            # XXX do actual codegen
-            for name in bind.getnames(): attrs[name] = heap.HeapStr("...")
+            for name in bind.getnames():
+                if name not in scope: raise MissingVar(name)
+                attrs[name] = scope[name]
         return heap.HeapAttrSet(attrs)
 
 class ListBox(EBox):
@@ -133,7 +137,7 @@ class VarBox(EBox):
     def pretty(self): return self.name
     def compile(self, scope):
         if self.name in scope: return scope[self.name]
-        raise ValueError("Name not in scope")
+        raise MissingVar(self.name)
 
 class AppBox(EBox):
     def __init__(self, func, arg):