add option data-format for user-specified data format IR

Author: thautwarm

purescripto/configure.py

@@ -13,7 +13,7 @@
 - .pure-py/
 """
 from importlib import import_module
-from typing import Dict, List, Iterable, cast
+from typing import Dict, List, Iterable
 from subprocess import check_call
 from distutils.dir_util import copy_tree
 from purescripto.configure_consts import *
@@ -24,11 +24,11 @@
 import wisepy2
 
 _TEMPLATE = {
-    CKey.CoreFnDir: CValue.CoreFnDir,
+    CKey.CoreFnDir  : CValue.CoreFnDir,
     CKey.EntryModule: CValue.EntryModule,
-    CKey.BluePrint: CValue.BluePrint,
+    CKey.BluePrint  : CValue.BluePrint,
     CKey.IndexMirror: CValue.IndexMirror,
-    CKey.IsPrettyPrint: CValue.IsPrettyPrint,
+    CKey.DataFormat : CValue.DataFormat,
 }
 
 
@@ -41,7 +41,7 @@ def mk_ps_blueprint_cmd(
     python_pack_name: str,
     entry: str,
     ffi_deps_path: str,
-    is_pretty_print: bool,
+    format: str,
 ):
     return [
         pspy_blueprint,
@@ -51,8 +51,8 @@ def mk_ps_blueprint_cmd(
         entry,
         "--ffi-dep",
         ffi_deps_path,
-        "--out-pretty",
-        str(is_pretty_print),
+        "--out-format",
+        format,
     ]
 
 
@@ -171,15 +171,15 @@ def pspy(
     conf_dict.setdefault(CKey.PyPack, py_pack_name_default)
     conf_dict.setdefault(CKey.CoreFnDir, CValue.CoreFnDir)
     conf_dict.setdefault(CKey.EntryModule, CValue.EntryModule)
-    conf_dict.setdefault(CKey.IsPrettyPrint, CValue.IsPrettyPrint)
+    conf_dict.setdefault(CKey.DataFormat, CValue.DataFormat)
 
     conf = CValue()
     conf.IndexMirror = conf_dict[CKey.IndexMirror]
     conf.BluePrint = conf_dict[CKey.BluePrint]
     conf.PyPack = conf_dict[CKey.PyPack]
     conf.CoreFnDir = conf_dict[CKey.CoreFnDir]
     conf.EntryModule = conf_dict[CKey.EntryModule]
-    conf.IsPrettyPrint = cast(bool, conf_dict[CKey.IsPrettyPrint])
+    conf.DataFormat = conf_dict[CKey.DataFormat]
 
     # TODO: currently unused.
     #   support custom corefn output path in pspy-blueprint.
@@ -209,7 +209,7 @@ def pspy(
         conf.PyPack,
         conf.EntryModule,
         str(ffi_deps_file),
-        conf.IsPrettyPrint,
+        conf.DataFormat,
     )
     try:
         check_call(cmd)

purescripto/configure_consts.py

@@ -7,7 +7,7 @@ class CKey:
     PyPack = "python-package"
     CoreFnDir = "corefn-dir"
     EntryModule = "entry-module"
-    IsPrettyPrint = "pretty-print?"
+    DataFormat = "data-format"
 
 
 class CValue:
@@ -16,7 +16,7 @@ class CValue:
     PyPack = "python"
     CoreFnDir = "output"
     EntryModule = "Main"
-    IsPrettyPrint = False
+    DataFormat = "Compressed"
 
 
 STR_PSPY_BLUEPRINT_CMD = "pspy-blueprint"

purescripto/purescript_loader.py

@@ -2,63 +2,25 @@
 from typing import Union, Tuple
 from types import CodeType
 from pie import LoaderForBetterLife
-from importlib import import_module
-from purescripto import rts
-from purescripto.utilities import import_from_path
-from purescripto.workaround import suppress_cpy38_literal_is, workaround
 from py_sexpr.stack_vm.emit import module_code
 from purescripto.topdown import load_topdown
+from purescripto.rts import META_ENV, RTS_TEMPLATE
 import marshal
 import zipfile
 import io
-import functools
-
-RES = "res"
-"""generated code object is stored in global variable $RES"""
-
-
-@functools.lru_cache()
-def _import_module_to_dict(m: str):
-    with suppress_cpy38_literal_is():
-        package, _, module = m.rpartition(".")
-        entry_path = import_module(package).__file__
-        loc = entry_path[: -len("__init__.py")] + module + ".py"
-        return import_from_path(m, loc).__dict__
-
-
-RTS_TEMPLATE = {
-    "zfsr32": rts.zfsr32,
-    "Error": Exception,
-    "import_module": _import_module_to_dict,
-}
-
-
-def _META_ENV():
-    with workaround():
-        import py_sexpr.terms as terms
-
-        def make_pair(a, b):
-            return a, b
-
-        env = {each: getattr(terms, each) for each in terms.__all__}
-        env[make_pair.__name__] = make_pair
-    return env
-
-
-META_ENV = _META_ENV()
-
+import sys
 
 class LoadPureScriptImplCode(LoaderForBetterLife[CodeType]):
     def source_to_prog(self, src: bytes, path: Path) -> CodeType:
-
+        sys.setrecursionlimit(3000)
         filename = str(path.absolute())
         if path.name.endswith(".raw.py"):
             meta_code = compile(src, filename, "eval")
             sexpr = eval(meta_code, META_ENV)
         else:
             assert path.name.endswith(".zip.py")
             zip = zipfile.ZipFile(filename)
-            file = io.StringIO(zip.read('source').decode('utf8'))
+            file = io.StringIO(zip.read("source").decode("utf8"))
             sexpr = load_topdown(file, META_ENV)
 
         code = module_code(sexpr, name=self.qualified_name + "$", filename=filename)

purescripto/rts.py

@@ -1,3 +1,68 @@
+from purescripto.utilities import import_from_path
+from purescripto.workaround import suppress_cpy38_literal_is, workaround
+from importlib import import_module
+import functools
+from py_sexpr.terms import *
+
+
 def zfsr32(val, n):
     """zero fill shift right for 32 bit integers"""
     return (val >> n) if val >= 0 else ((val + 4294967296) >> n)
+
+
+__all__ = ["META_ENV", "RTS_TEMPLATE"]
+
+
+def _META_ENV():
+    with workaround():
+        import py_sexpr.terms as terms
+
+        def make_pair(a, b):
+            return a, b
+
+        env = {each: getattr(terms, each) for each in terms.__all__}
+        env[make_pair.__name__] = make_pair
+        env[get_attr_looper.__name__] = lambda a, b, c: call(
+            "$" + get_attr_looper.__name__, a, b, c
+        )
+        env[get_item_looper.__name__] = lambda a, b, c: call(
+            "$" + get_item_looper.__name__, a, b, c
+        )
+
+    return env
+
+
+@functools.lru_cache()
+def _import_module_to_dict(m: str):
+    with suppress_cpy38_literal_is():
+        package, _, module = m.rpartition(".")
+        entry_path = import_module(package).__file__
+        loc = entry_path[: -len("__init__.py")] + module + ".py"
+        return import_from_path(m, loc).__dict__
+
+
+def get_item_looper(depth, base, item):
+    while depth > 0:
+        base = base[item]
+        depth -= 1
+    return base
+
+
+def get_attr_looper(depth, base, attr):
+    # TODO: specializer here
+    while depth > 0:
+        base = get_attr(base, attr)
+        depth -= 1
+    return base
+
+
+RTS_TEMPLATE = {
+    "zfsr32": zfsr32,
+    "Error": Exception,
+    "import_module": _import_module_to_dict,
+    ("$" + get_attr_looper.__name__): get_attr_looper,
+    ("$" + get_item_looper.__name__): get_item_looper,
+}
+
+
+META_ENV = _META_ENV()

purescripto/topdown.py

@@ -17,6 +17,7 @@ def make_pair(a, b):
 
 def load_topdown(file_io: TextIO, env):
     readline, read = file_io.readline, file_io.read
+
     n_entry = int(readline()[:-1])
     ACTION_ATTR = 0
     ACTION_APP = 1
@@ -87,7 +88,7 @@ def read_seq(readline=readline, ACTION_SEQ=ACTION_SEQ):
         "b": read_bool,
         "n": read_nil,
         "f": read_float,
-        "v": read_var,
+        "v": read_var
     }
     non_term_maps = {"a": read_acc, "c": read_cons, "l": read_seq}
 

purescripto/workaround.py

@@ -34,3 +34,5 @@ def suppress_cpy38_literal_is():
             "ignore", category=SyntaxWarning, message='"is" with a literal'
         )
         yield
+
+

runtests/test_load.py

@@ -0,0 +1,11 @@
+from purescripto.rts import META_ENV
+from purescripto.topdown import load_topdown
+from py_sexpr.stack_vm.emit import module_code
+import zipfile
+import io
+filename = "C:/Users/twshe/Desktop/mydb/com-haskell/v0.1/purescript-cyberbrain/purescript_cyberbrain/Data/Show/pure.zip.py"
+# filename = 'C:\\Users\\twshe\\Desktop\\mydb\\com-haskell\\v0.1\\purescript-cyberbrain\\purescript_cyberbrain\\Cyberbrain\\PyInstructions\\pure.zip.py'
+zip = zipfile.ZipFile(filename)
+file = io.StringIO(zip.read("source").decode("utf8"))
+sexpr = load_topdown(file, META_ENV)
+module_code(sexpr)