提交: 1f5c0f0be8af91291b969d522bcbdc25add99369 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 1f5c0f0be8af91291b969d522bcbdc25add99369 (tree)
• 时间: 2022-02-17 10:51:25
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Refactor RPython Cammy modules.

We will be implementing several tools in RPython, so we need to share
the code while still keeping the Nix expressions clean and minimal. I
don't want to rebuild the JIT when I'm only changing the REPL.

更改概述

• add: cammy-rpy/builder.nix
• add: cammy-rpy/cammylib/__init__.py
• add: cammy-rpy/cammylib/hax.py
• add: cammy-rpy/default.nix
• add: cammy-rpy/repl.nix
• add: cammy-rpy/repl.py
• delete: cammy-run/default.nix
• modified: default.nix
• add: hive/fun/graph.cammy
• modified: todo.txt
• delete: {cammy-run => cammy-rpy/cammylib}/stb.py
• delete: {cammy-run => cammy-rpy}/main.py

差异

--- /dev/null
+++ b/cammy-rpy/builder.nix
@@ -0,0 +1,52 @@
+{ nixpkgs ? import <nixpkgs> {} }:
+let
+  inherit (nixpkgs.pkgs)
+  fetchFromGitLab stdenv
+  pkg-config libffi stb
+  pypy pypyPackages;
+  # https://foss.heptapod.net/pypy/pypy/
+  pypySrc = fetchFromGitLab {
+    domain = "foss.heptapod.net";
+    owner = "pypy";
+    repo = "pypy";
+    # release candidate from branch release-pypy3.8-v7.x
+    rev = "90fd9ed34d52181de59cbfff863719472b05418e";
+    sha256 = "03cshgvh8qcsyac4q4vf0sbvcm1m2ikgwycwip4cc7sw9pzpw6a3";
+  };
+in
+entrypoint: exe: enableJIT:
+  let
+    opt = if enableJIT then "jit" else "2";
+  in stdenv.mkDerivation {
+    name = exe;
+
+    src = builtins.filterSource
+      (path: type: baseNameOf path == entrypoint
+       || builtins.match ".*cammylib.*" path != null)
+      ./.;
+
+    buildInputs = [
+      # always required
+      pypySrc pkg-config stb
+      pypy pypyPackages.py
+      # only required for JIT
+      pypyPackages.pytest libffi
+    ];
+
+    buildPhase = ''
+      source $stdenv/setup
+      mkdir -p ./rpython/_cache
+      cp -r ${pypySrc}/rpython .
+      chmod -R u+w rpython/
+      # Do the actual translation.
+      ${pypy}/bin/pypy -mrpython -O${opt} ${entrypoint}
+      '';
+
+    installPhase = ''
+      mkdir -p $out/bin/
+      cp ${exe} $out/bin/
+      '';
+
+    separateDebugInfo = true;
+  }
+

--- /dev/null
+++ b/cammy-rpy/cammylib/hax.py
@@ -0,0 +1,26 @@
+from ctypes import util
+
+ctypes_is_patched = False
+
+def patch_ctypes_for_ffi():
+    """
+    Monkey-patch the stdlib so that ctypes uses the generic name for libc
+    instead of a full path. This is required to make rffi work.
+
+    This code was borrowed from Typhon.
+
+    NOT_RPYTHON
+    """
+
+    global ctypes_is_patched
+    if ctypes_is_patched:
+        return
+    ctypes_is_patched = True
+
+    fl = util.find_library
+    def patched_find_library(name):
+        if name == "c":
+            return "libc.so.6"
+        else:
+            return fl(name)
+    util.find_library = patched_find_library

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

--- a/cammy-run/main.py
+++ b/cammy-rpy/main.py
@@ -1,12 +1,3 @@
-# Monkey-patch the stdlib. Borrowed from Typhon.
-from ctypes import util
-fl = util.find_library
-def patched_find_library(name):
-    if name == "c":
-        return "libc.so.6"
-    else:
-        return fl(name)
-util.find_library = patched_find_library
 
 import math, sys
 
@@ -15,7 +6,8 @@ from rpython.rlib.rbigint import rbigint
 from rpython.rlib.rfloat import string_to_float
 from rpython.rlib.rstring import StringBuilder, split
 
-import stb
+from cammylib.hax import patch_ctypes_for_ffi
+from cammylib import stb
 
 class TypeFail(Exception):
     def __init__(self, reason):
@@ -554,6 +546,7 @@ def main(argv):
 
 
 def target(driver, *args):
+    patch_ctypes_for_ffi()
     driver.exe_name = "cammy-run"
     return main, None
 

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

--- /dev/null
+++ b/cammy-rpy/repl.py
@@ -0,0 +1,22 @@
+# Inspired by https://www.pypy.org/posts/2018/11/guest-post-implementing-calculator-repl-6271483514675006846.html
+
+from rpython.rlib.rfile import create_stdio
+
+LINE_BUFFER_LENGTH = 1024
+
+def repl(stdin, stdout):
+    while True:
+        stdout.write("> ")
+        line = stdin.readline(LINE_BUFFER_LENGTH)
+        print line
+
+def main(argv):
+    stdin, stdout, stderr = create_stdio()
+    try:
+        repl(stdin, stdout)
+    except:
+        return 0
+
+def target(driver, *args):
+    driver.exe_name = "cammy-repl"
+    return main, None

--- a/cammy-run/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ nixpkgs ? import <nixpkgs> {} }:
-let
-  inherit (nixpkgs.pkgs)
-  fetchFromGitLab stdenv
-  pypy pypyPackages pkg-config libffi stb;
-  # https://foss.heptapod.net/pypy/pypy/
-  pypySrc = fetchFromGitLab {
-    domain = "foss.heptapod.net";
-    owner = "pypy";
-    repo = "pypy";
-    # release candidate from branch release-pypy3.8-v7.x
-    rev = "90fd9ed34d52181de59cbfff863719472b05418e";
-    sha256 = "03cshgvh8qcsyac4q4vf0sbvcm1m2ikgwycwip4cc7sw9pzpw6a3";
-  };
-in
-stdenv.mkDerivation {
-  name = "cammy-run";
-
-  src = ./.;
-
-  buildInputs = [
-    # always required
-    pypy pypyPackages.py pypySrc pkg-config stb
-    # only required for JIT
-    pypyPackages.pytest libffi ];
-
-  buildPhase = ''
-    source $stdenv/setup
-    mkdir -p ./rpython/_cache
-    cp -r ${pypySrc}/rpython .
-    chmod -R u+w rpython/
-    # Do the actual translation.
-    ${pypy}/bin/pypy -mrpython -Ojit main.py
-    '';
-
-  installPhase = ''
-    mkdir -p $out/bin/
-    cp cammy-run $out/bin/
-    '';
-
-  separateDebugInfo = true;
-}

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

--- /dev/null
+++ b/hive/fun/graph.cammy
@@ -0,0 +1 @@
+(pair id @0)

--- a/todo.txt
+++ b/todo.txt
@@ -40,3 +40,7 @@
   * Monad: X → [N, X]
   * Distributive law: [N, X] + 1 → [N, X + 1]
     * Creates a stream+maybe monad: X → [N, X + 1]
+* Subtypes?
+  * Interval type?
+* Cantor's type of bitstrings: N -> 2
+* The square type: For a type X, 2 -> X