提交: cc80fa3f9a450a2a7a586b96382519443aea2cc6 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: cc80fa3f9a450a2a7a586b96382519443aea2cc6 (tree)
• 时间: 2022-02-23 16:31:12
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Port cammy-frame to RPython.

Spent more time debugging cammylib than on the main entrypoint. I
suppose that this means that cammylib is reasonably factored.

更改概述

• modified: cammy-rpy/cammylib/hive.py
• modified: cammy-rpy/cammylib/sexp.py
• modified: cammy-rpy/draw.nix
• add: cammy-rpy/frame.nix
• add: cammy-rpy/frame.py
• modified: cammy-rpy/repl.py
• modified: default.nix

差异

--- a/cammy-rpy/cammylib/hive.py
+++ b/cammy-rpy/cammylib/hive.py
@@ -3,6 +3,13 @@ import os.path
 from cammylib.parser import parse
 
 
+class MissingAtom(Exception):
+    "An atom is missing from a hive."
+
+    def __init__(self, atom):
+        self.atom = atom
+
+
 class Hive(object):
     "A self-referential collection of S-expressions."
 
@@ -11,12 +18,15 @@ class Hive(object):
         self.exprs = {}
 
     def load(self, atom):
-        print "Loading", atom
+        print("Loading", atom)
         filename = atom + ".cammy"
         fullpath = os.path.join(self.hivepath, filename)
         with open(fullpath, "r") as handle:
-            sexp, trail = parse(handle.read())
-        sexp = sexp.canonicalize(self)
-        self.exprs[atom] = sexp
-        print "Loaded", atom, sexp
-        return sexp
+            try:
+                sexp, trail = parse(handle.read())
+                sexp = sexp.canonicalize(self)
+                self.exprs[atom] = sexp
+                print("Loaded", atom, sexp)
+                return sexp
+            except IOError:
+                raise MissingAtom(atom)

--- a/cammy-rpy/cammylib/sexp.py
+++ b/cammy-rpy/cammylib/sexp.py
@@ -1,12 +1,12 @@
 BASIS_ATOMS = (
     "id", "ignore", "fst", "snd", "left", "right",
-    "zero", "succ", "nil", "cons", "t", "f", "not", "conj", "disj",
+    "zero", "succ", "nil", "cons", "t", "f", "not", "conj", "disj", "either",
     "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",
+    "comp", "pair", "case", "curry", "uncurry", "pr", "fold",
 )
 
 

--- a/cammy-rpy/draw.nix
+++ b/cammy-rpy/draw.nix
@@ -2,4 +2,4 @@
 let
   makeBuilder = import ./builder.nix { inherit nixpkgs; };
 in
-  makeBuilder ./draw.py "cammy-draw" true
+  makeBuilder ./draw.py "cammy-draw" false # true

--- /dev/null
+++ b/cammy-rpy/frame.nix
@@ -0,0 +1,5 @@
+{ nixpkgs ? import <nixpkgs> {} }:
+let
+  makeBuilder = import ./builder.nix { inherit nixpkgs; };
+in
+  makeBuilder ./frame.py "cammy-frame" false

--- /dev/null
+++ b/cammy-rpy/frame.py
@@ -0,0 +1,24 @@
+from rpython.rlib.rfile import create_stdio
+
+from cammylib.hive import Hive, MissingAtom
+from cammylib.parser import parse
+
+
+def main(argv):
+    hivepath = argv[-1]
+    hive = Hive(hivepath)
+    stdin, stdout, stderr = create_stdio()
+    try:
+        sexp, trail = parse(stdin.read())
+        stdout.write(sexp.canonicalize(hive).asStr())
+        stdout.write("\n")
+        return 0
+    except MissingAtom as ma:
+        stderr.write("Missing atom in hive: ")
+        stderr.write(ma.atom)
+        stderr.write("\n")
+        return 1
+
+def target(driver, *args):
+    driver.exe_name = "cammy-frame"
+    return main, None

--- a/cammy-rpy/repl.py
+++ b/cammy-rpy/repl.py
@@ -3,7 +3,7 @@
 from rpython.rlib.rfile import create_stdio
 
 from cammylib.arrows import buildArrow, BuildProblem
-from cammylib.hive import Hive
+from cammylib.hive import Hive, MissingAtom
 from cammylib.parser import parse
 
 LINE_BUFFER_LENGTH = 1024
@@ -19,8 +19,11 @@ def repl(hive, stdin, stdout):
         print "Got:", line
         print "S-expression:", sexp.asStr()
         print "Trail:", trail
-        sexp = sexp.canonicalize(hive)
-        print "Canonicalized:", sexp.asStr()
+        try:
+            sexp = sexp.canonicalize(hive)
+            print "Canonicalized:", sexp.asStr()
+        except MissingAtom as ma:
+            print "Couldn't canonicalize S-expression; missing atom:", ma.atom
         try:
             arrow = buildArrow(sexp)
             print "Arrow:", arrow
@@ -32,10 +35,7 @@ def main(argv):
     hivepath = argv[-1]
     hive = Hive(hivepath)
     stdin, stdout, stderr = create_stdio()
-    try:
-        return repl(hive, stdin, stdout)
-    except:
-        return 1
+    return repl(hive, stdin, stdout)
 
 def target(driver, *args):
     driver.exe_name = "cammy-repl"

--- a/default.nix
+++ b/default.nix
@@ -5,6 +5,7 @@ let
   jelly = (import jelly/Cargo.nix { pkgs = nixpkgs; }).rootCrate.build;
   movelist = import ./movelist { inherit nixpkgs; };
   cammy-draw = import ./cammy-rpy/draw.nix { inherit nixpkgs; };
+  cammy-frame = import ./cammy-rpy/frame.nix { inherit nixpkgs; };
   cammy-repl = import ./cammy-rpy/repl.nix { inherit nixpkgs; };
   eggs = builtins.attrValues (removeAttrs (import ./eggs.nix {
     inherit pkgs;
@@ -47,6 +48,7 @@ in pkgs.stdenv.mkDerivation {
     makeWrapper ${movelist}/bin/movelist $out/bin/cammy-movelist
 
     makeWrapper ${cammy-draw}/bin/cammy-draw $out/bin/cammy-draw
+    makeWrapper ${cammy-frame}/bin/cammy-frame $out/bin/cammy-frame
     makeWrapper ${cammy-repl}/bin/cammy-repl $out/bin/cammy-repl
   '';
 }