0.8.0 WIP

Author: thautwarm

purescripto/__init__.py

@@ -1,2 +1,2 @@
-from purescripto.purescript_loader import LoadPureScript
-from purescripto.utilities import auto_link_repo
+from purescripto.purescript_loader import LoadPureScript
+from purescripto.utilities import auto_link_repo

purescripto/purescript_loader.py

@@ -9,6 +9,8 @@
 from py_sexpr.stack_vm.emit import module_code
 from purescripto.topdown import load_topdown
 import marshal
+import zipfile
+import io
 import functools
 
 RES = "res"
@@ -53,12 +55,13 @@ def source_to_prog(self, src: bytes, path: Path) -> CodeType:
         if path.name.endswith(".raw.py"):
             meta_code = compile(src, filename, "eval")
             sexpr = eval(meta_code, META_ENV)
-            code = module_code(sexpr, name=self.qualified_name + "$", filename=filename)
         else:
             assert path.name.endswith(".zip.py")
-            with path.open(mode="utf8") as f:
-                code = load_topdown(f, META_ENV)
+            zip = zipfile.ZipFile(filename)
+            file = io.StringIO(zip.read('source').decode('utf8'))
+            sexpr = load_topdown(file, META_ENV)
 
+        code = module_code(sexpr, name=self.qualified_name + "$", filename=filename)
         return code
 
     def load_program(self, b: bytes) -> CodeType:

purescripto/topdown.py

@@ -50,7 +50,7 @@ def read_int(readline=readline, append=push_object):
 
     # noinspection PyDefaultArgument
     def read_bool(
-        readline=readline, mapping={"true": True, "false": False}, append=push_object,
+        readline=readline, mapping={"t": True, "f": False}, append=push_object,
     ):
         return append(mapping[readline()[:-1]])