From 7ef2f53db8a3ce22ad4f21f07f2103986cf3720f Mon Sep 17 00:00:00 2001
From: Reid 'arrdem' McKenzie <me@arrdem.com>
Date: Sat, 21 Aug 2021 21:38:42 -0600
Subject: [PATCH] Dirty awful hacks to get exec working

---
 projects/lilith/BUILD                         |   3 +
 projects/lilith/src/lilith/designdoc.lil      |  19 ++-
 projects/lilith/src/python/lilith/__main__.py |   7 +-
 projects/lilith/src/python/lilith/prelude.lil | 130 +++++++++---------
 4 files changed, 88 insertions(+), 71 deletions(-)

diff --git a/projects/lilith/BUILD b/projects/lilith/BUILD
index f58e9a0..c7909ad 100644
--- a/projects/lilith/BUILD
+++ b/projects/lilith/BUILD
@@ -6,6 +6,9 @@ py_project(
         py_requirement("pyyaml"),
         py_requirement("markdown"),
     ],
+    main_deps = [
+        py_requirement("prompt-toolkit"),
+    ],
     test_deps = [
         py_requirement("hypothesis"),
     ],
diff --git a/projects/lilith/src/lilith/designdoc.lil b/projects/lilith/src/lilith/designdoc.lil
index 804e5f9..6fc5375 100644
--- a/projects/lilith/src/lilith/designdoc.lil
+++ b/projects/lilith/src/lilith/designdoc.lil
@@ -1,4 +1,4 @@
-!def[pitch, md[]]
+!def[pitch, md]
 # The Lilith Pitch
 
 Code is more than .. just code for the compiler.
@@ -14,7 +14,7 @@ idea: the parser is going to IGNORE stuff by default.
 
 Let's build an M-expression syntax with support for multiple co-equal languages and fragments/scopes with a meta-syntax allowing for references between them and consuming fragment-notation-defined blocks? (FIXME: better word?)
 
-!def[sytnax, md[]]
+!def[syntax, md]
 
 \![] bang-brackets is a meta-syntactic directive used both by the lil tangler and the lil object language.
 
@@ -34,9 +34,16 @@ FIXME: we need bare words, we need strings
 
 FIXME: We need the object language
 
-!def[openapi, yaml[]]
+!def[openapi, yaml]
+---
+openapi: 3.1.0
 
-!def[main, lang[lilith]]
-; is importing a bang-operation?
+!def[join, py]
+return lambda s, frags: s.join(frags)
 
-print[str.join["", [pitch, syntax]]]
+!def[md, py]
+from markdown import markdown
+return lambda *args, body=None, **kwargs: markdown(body)
+
+!def[main, lil]
+print[join["\n", [pitch, syntax]]]
diff --git a/projects/lilith/src/python/lilith/__main__.py b/projects/lilith/src/python/lilith/__main__.py
index 7e0e03b..4d28939 100644
--- a/projects/lilith/src/python/lilith/__main__.py
+++ b/projects/lilith/src/python/lilith/__main__.py
@@ -40,6 +40,7 @@ def repl(opts, args, runtime):
     session = PromptSession(history=FileHistory(".lilith.history"))
     module = Module(
         "__repl__",
+        [],
         {},
     )
 
@@ -143,7 +144,11 @@ if __name__ == "__main__":
 
     def py(runtime=None, module=None, expr=None, body=None, name=None):
         """The implementation of the Python lang as an eval type."""
-        return eval(body)
+        g = globals().copy()
+        l = {}
+        body = f"def _shim():\n" + "\n".join("  " + l for l in body.splitlines()) + "\n\n_escape = _shim()"
+        exec(body, g, l)
+        return l["_escape"]
 
     def lil(runtime=None, module=None, expr=None, body=None, name=None):
         """The implementation of the Lilith lang as an eval type."""
diff --git a/projects/lilith/src/python/lilith/prelude.lil b/projects/lilith/src/python/lilith/prelude.lil
index e560e38..26f01d2 100644
--- a/projects/lilith/src/python/lilith/prelude.lil
+++ b/projects/lilith/src/python/lilith/prelude.lil
@@ -1,131 +1,133 @@
 !import[lilith.bootstrap, [py, lil]]
 !def[lil, lilith.bootstrap.lil]
 lilith.bootstrap.lil
+!def[py, lilith.bootstrap.lil]
+lilith.bootstrap.py
 !def[abs, py]
-abs
+return abs
 !def[delattr, py]
-delattr
+return delattr
 !def[hash, py]
-hash
+return hash
 !def[set, py]
-set
+return set
 !def[all, py]
-all
+return all
 !def[dict, py]
-dict
+return dict
 !def[min, py]
-min
+return min
 !def[any, py]
-any
+return any
 !def[dir, py]
-dir
+return dir
 !def[hex, py]
-hex
+return hex
 !def[next, py]
-next
+return next
 !def[slice, py]
-slice
+return slice
 !def[ascii, py]
-ascii
+return ascii
 !def[divmod, py]
-divmod
+return divmod
 !def[id, py]
-id
+return id
 !def[object, py]
-object
+return object
 !def[sorted, py]
-sorted
+return sorted
 !def[bin, py]
-bin
+return bin
 !def[enumerate, py]
-enumerate
+return enumerate
 !def[input, py]
-input
+return input
 !def[oct, py]
-oct
+return oct
 !def[staticmethod, py]
-staticmethod
+return staticmethod
 !def[bool, py]
-bool
+return bool
 !def[eval, py]
-eval
+return eval
 !def[int, py]
-int
+return int
 !def[open, py]
-open
+return open
 !def[str, py]
-str
+return str
 !def[breakpoint, py]
-breakpoint
+return breakpoint
 !def[exec, py]
-exec
+return exec
 !def[isinstance, py]
-isinstance
+return isinstance
 !def[ord, py]
-ord
+return ord
 !def[sum, py]
-sum
+return sum
 !def[bytearray, py]
-bytearray
+return bytearray
 !def[filter, py]
-filter
+return filter
 !def[issubclass, py]
-issubclass
+return issubclass
 !def[pow, py]
-pow
+return pow
 !def[super, py]
-super
+return super
 !def[bytes, py]
-bytes
+return bytes
 !def[float, py]
-float
+return float
 !def[iter, py]
-iter
+return iter
 !def[print, py]
-print
+return print
 !def[tuple, py]
-tuple
+return tuple
 !def[callable, py]
-callable
+return callable
 !def[format, py]
-format
+return format
 !def[len, py]
-len
+return len
 !def[property, py]
-property
+return property
 !def[type, py]
-type
+return type
 !def[chr, py]
-chr
+return chr
 !def[frozenset, py]
-frozenset
+return frozenset
 !def[list, py]
-list
+return list
 !def[range, py]
-range
+return range
 !def[vars, py]
-vars
+return vars
 !def[classmethod, py]
-classmethod
+return classmethod
 !def[getattr, py]
-getattr
+return getattr
 !def[locals, py]
-locals
+return locals
 !def[repr, py]
-repr
+return repr
 !def[zip, py]
-zip
+return zip
 !def[compile, py]
-compile
+return compile
 !def[map, py]
-map
+return map
 !def[reversed, py]
-reversed
+return reversed
 !def[complex, py]
-complex
+return complex
 !def[hasattr, py]
-hasattr
+return hasattr
 !def[max, py]
-max
+return max
 !def[round, py]
-round
+return round