1 files changed, 23 insertions, 5 deletions
diff --git a/neb/std/repl.py b/neb/std/repl.py
index 16efb20..6b6be83 100644
--- a/neb/std/repl.py
+++ b/neb/std/repl.py
@@ -1,10 +1,11 @@
-from .. import TypeEnum, Environment, Arg, Builtin, UserFunction, Function, evaluate, InterpretPanic
+from .. import TypeEnum, Environment, Arg, Builtin, UserFunction, Function, evaluate, InterpretPanic, Callable, NebSyntax, lex, parse
+from .core import interpretQuote
 from ..structs import *
 
 REPL = Environment()
 
 def interpretHowTo(symbol, args, env, ns):
-    if not isinstance(args[0], Function):
+    if not isinstance(args[0], Callable):
         raise InterpretPanic(symbol, "expects a :func", args[0])
     print(args[0].describe())
     return List([])
@@ -12,19 +13,36 @@ def interpretHowTo(symbol, args, env, ns):
 REPL.register("howto", Builtin("howto", interpretHowTo, [Arg("symbol", TypeEnum.ANY)], return_type=Type(":list")))
 
 def interpretSymbols(symbol, args, env, ns):
-    keys = [Symbol(k, -1) for k,v in sorted(env.environment.items())]
+    keys = [Symbol(k, -1) for k,v in sorted(env.get_all().items())]
     return List(keys)
 
 REPL.register("symbols", Builtin("symbols", interpretSymbols, [], return_type=Type(":list")))
 
 def interpretFuncs(symbol, args, env, ns):
-    keys = [Symbol(k, -1) for k,v in env.environment.items() if isinstance(v, Builtin)]
+    keys = [Symbol(k, -1) for k,v in sorted(env.get_all().items()) if isinstance(v, Function)]
     return List(keys)
 
 REPL.register("funcs", Builtin("funcs", interpretFuncs, [], return_type=Type(":list")))
 
 def interpretUserSymbols(symbol, args, env, ns):
-    keys = [Symbol(k, -1) for k,v in env.environment.items() if isinstance(v, UserFunction) or isinstance(v, Literal)]
+    keys = [Symbol(k, -1) for k,v in env.get_all().items() if isinstance(v, UserFunction) or isinstance(v, Literal)]
     return List(keys)
 
 REPL.register("user-symbols", Builtin("user-symbols", interpretUserSymbols, [], return_type=Type(":list")))
+
+def interpretUserFuncs(symbol, args, env, ns):
+    keys = [Symbol(k, -1) for k,v in env.get_all().items() if isinstance(v, UserFunction)]
+    return List(keys)
+
+REPL.register("user-funcs", Builtin("user-funcs", interpretUserFuncs, [], return_type=Type(":list")))
+
+def interpretSyntax(symbol, args, env, ns):
+    keys = [Symbol(k, -1) for k,v in sorted(env.get_all().items()) if isinstance(v, NebSyntax)]
+    return List(keys)
+
+REPL.register("syntax", Builtin("syntax", interpretSyntax, [], return_type=Type(":list")))
+
+def interpretParseNeb(symbol, args, env, ns):
+    return interpretQuote(None, [parse(lex(args[0].value))[0]], env, ns)
+
+REPL.register("parse-neb", Builtin("parse-neb", interpretParseNeb, [Arg("string", TypeEnum.STRING)], return_type=Type(":any")))