提交: f36a6db0034bf03bb209dc9539ebb04e3e04d075 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: f36a6db0034bf03bb209dc9539ebb04e3e04d075 (tree)
• 时间: 2022-02-21 08:24:56
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Refactor canonicalization.

更改概述

• modified: cammy-rpy/cammylib/hive.py
• modified: cammy-rpy/cammylib/sexp.py
• modified: cammy-rpy/repl.py

差异

--- a/cammy-rpy/cammylib/hive.py
+++ b/cammy-rpy/cammylib/hive.py
@@ -1,18 +1,6 @@
 import os.path
 
 from cammylib.parser import parse
-from cammylib.sexp import Atom, Functor, Hole
-
-BASIS_ATOMS = (
-    "id", "ignore", "fst", "snd", "left", "right",
-    "zero", "succ", "nil", "cons", "t", "f", "not", "conj", "disj",
-    "f-zero", "f-one", "f-pi", "f-sign", "f-floor", "f-negate", "f-recip",
-    "f-lt", "f-add", "f-mul", "f-sqrt", "f-sin", "f-cos", "f-atan2"
-)
-
-BASIS_FUNCTORS = (
-    "comp", "pair", "case", "curry", "uncurry", "pr", "fold", "either",
-)
 
 
 class Hive(object):
@@ -28,25 +16,7 @@ class Hive(object):
         fullpath = os.path.join(self.hivepath, filename)
         with open(fullpath, "r") as handle:
             sexp, trail = parse(handle.read())
-        sexp = self.canonicalize(sexp)
+        sexp = sexp.canonicalize(self)
         self.exprs[atom] = sexp
         print "Loaded", atom, sexp
         return sexp
-
-    def canonicalize(self, expr):
-        if isinstance(expr, Atom):
-            if expr.symbol in BASIS_ATOMS:
-                return expr
-            else:
-                return self.load(expr.symbol)
-        elif isinstance(expr, Functor):
-            args = [self.canonicalize(arg) for arg in expr.arguments]
-            if expr.constructor in BASIS_FUNCTORS:
-                return Functor(expr.constructor, args)
-            else:
-                functor = self.load(expr.constructor)
-                return functor.substitute(args)
-        elif isinstance(expr, Hole):
-            return expr
-        else:
-            assert False, "not ready yet"

--- a/cammy-rpy/cammylib/sexp.py
+++ b/cammy-rpy/cammylib/sexp.py
@@ -1,6 +1,19 @@
+BASIS_ATOMS = (
+    "id", "ignore", "fst", "snd", "left", "right",
+    "zero", "succ", "nil", "cons", "t", "f", "not", "conj", "disj",
+    "f-zero", "f-one", "f-pi", "f-sign", "f-floor", "f-negate", "f-recip",
+    "f-lt", "f-add", "f-mul", "f-sqrt", "f-sin", "f-cos", "f-atan2"
+)
+
+BASIS_FUNCTORS = (
+    "comp", "pair", "case", "curry", "uncurry", "pr", "fold", "either",
+)
+
+
 class SExp(object):
     "An S-expression."
 
+
 class Atom(SExp):
     "An S-expression atom."
 
@@ -15,6 +28,13 @@ class Atom(SExp):
     def substitute(self, args):
         return self
 
+    def canonicalize(self, hive):
+        if self.symbol in BASIS_ATOMS:
+            return self
+        else:
+            return hive.load(self.symbol)
+
+
 class Functor(SExp):
     "A list of S-expressions with a distinguished head."
 
@@ -32,6 +52,15 @@ class Functor(SExp):
         return Functor(self.constructor,
                 [arg.substitute(args) for arg in self.arguments])
 
+    def canonicalize(self, hive):
+        args = [arg.canonicalize(hive) for arg in self.arguments]
+        if self.constructor in BASIS_FUNCTORS:
+            return Functor(self.constructor, args)
+        else:
+            functor = hive.load(self.constructor)
+            return functor.substitute(args)
+
+
 class Hole(SExp):
     "A hole where an S-expression could be."
 
@@ -45,3 +74,6 @@ class Hole(SExp):
 
     def substitute(self, args):
         return args[self.index]
+
+    def canonicalize(self, hive):
+        return self

--- a/cammy-rpy/repl.py
+++ b/cammy-rpy/repl.py
@@ -19,7 +19,7 @@ def repl(hive, stdin, stdout):
         print "Got:", line
         print "S-expression:", sexp.asStr()
         print "Trail:", trail
-        sexp = hive.canonicalize(sexp)
+        sexp = sexp.canonicalize(hive)
         print "Canonicalized:", sexp.asStr()
         try:
             arrow = buildArrow(sexp)