cleanup after moving func/def stuff into parsing

1 files changed, 7 insertions, 55 deletions

diff --git a/neb/std/core.py b/neb/std/core.py
index 569a87d..15a7d61 100644
--- a/neb/std/core.py
+++ b/neb/std/core.py
@@ -1,4 +1,4 @@
-from .. import TypeEnum, Environment, Arg, Builtin, UserFunction, evaluate, interpret, parse, lex, InterpretPanic, TypeWrap, Function, UserType, NebSyntax, MultiFunction
+from .. import TypeEnum, Environment, Arg, Builtin, UserFunction, evaluate, interpret, parse, lex, InterpretPanic, TypeWrap, UserType, NebSyntax, MultiFunction
 from ..structs import *
 from pathlib import Path
 from datetime import datetime
@@ -21,17 +21,9 @@ t_branch = Arg("t-branch", TypeEnum.ANY)
 f_branch = Arg("f-branch", TypeEnum.ANY, optional=True)
 CORE.register("if", NebSyntax("if", interpretIf, [cond, t_branch, f_branch]))
 
-def interpretDef(symbol, args, env, ns):
-    if not isinstance(args[0], Symbol):
-        raise InterpretPanic(symbol, "requires a :symbol", args[0])
-    name = args[0].name  # NOTE: we are not evaluating the name!!
-    res = evaluate(args[1], env, ns)
-    env.register(name, res)
-    return List([])
-
 def_name_arg = Arg("name", TypeEnum.ANY)
 def_val_arg = Arg("value", TypeEnum.ANY)
-CORE.register("def", NebSyntax("def", interpretDef, [def_name_arg, def_val_arg], return_type=Type(":list")))
+CORE.register("def", NebSyntax("def", None, [def_name_arg, def_val_arg], return_type=Type(":list")))
 
 def interpretRedef(symbol, args, env, ns):
     if not isinstance(args[0], Symbol):
@@ -46,23 +38,9 @@ def interpretRedef(symbol, args, env, ns):
 
 CORE.register("redef", NebSyntax("redef", interpretRedef, [def_name_arg, def_val_arg], return_type=Type(":list")))
 
-def interpretLambda(symbol, args, env, ns):
-    new_args = args
-    return_type = Type(":any")
-    if isinstance(args[0], Type):
-        return_type = args[0]
-        new_args = args[1:]
-
-    if len(new_args[0].args) != 0:
-        func = UserFunction("<lambda>", new_args[0].args, new_args[1:])
-    else:
-        func = UserFunction("<lambda>", [], new_args[1:])
-    func.return_type = return_type
-    return func
-
 lambda_args_arg = Arg("args", TypeEnum.ANY)
 lambda_body_arg = Arg("body", TypeEnum.ANY)
-CORE.register("lambda", NebSyntax("lambda", interpretLambda, [lambda_args_arg, lambda_body_arg], lambda_body_arg))
+CORE.register("lambda", NebSyntax("lambda", None, [lambda_args_arg, lambda_body_arg], lambda_body_arg))
 
 def interpretForCount(symbol, args, env, ns):
     num = evaluate(args[0], env, ns)
@@ -155,34 +133,7 @@ def interpretBranch(symbol, args, env, ns):
 
 CORE.register("branch", NebSyntax("branch", interpretBranch, [for_body_arg], for_body_arg))
 
-def interpretFunc(symbol, args, env, ns):
-    if not isinstance(args[0], Symbol):
-        raise InterpretPanic(symbol, "requires a :symbol")
-    name = args[0].name  # NOTE: we are not evaluating the name!!
-
-    if ns is not None:
-        name = f"{ns}/{name}"
-
-    # compose a lambda
-    func = interpretLambda(None, args[1:], env, ns)
-
-    # add the name to the function
-    func.name = name
-
-    if env.contains(name) and isinstance(env.get(name), MultiFunction):
-        # TODO this doesn't check for ambiguity/overwrites!!!
-        mf = env.get(name)
-        mf.register(func)
-        env.register(name, mf)
-    else:
-        mf = MultiFunction(name)
-        mf.register(func)
-        env.register(name, mf)
-
-    #env.register(name, func)
-    return List([])
-
-CORE.register("func", NebSyntax("func", interpretFunc, [def_name_arg, lambda_args_arg, lambda_body_arg], lambda_body_arg, Type(":list")))
+CORE.register("func", NebSyntax("func", None, [def_name_arg, lambda_args_arg, lambda_body_arg], lambda_body_arg, Type(":list")))
 
 def interpretBlock(symbol, args, env, ns):
     new_env = Environment(env)
@@ -263,8 +214,9 @@ quote_arg = Arg("arg", TypeEnum.ANY)
 CORE.register("quote", NebSyntax("quote", interpretQuote, [quote_arg]))
 
 def interpretEval(symbol, args, env, ns):
-    ev = evaluate(args[0], env, ns)  # TODO why do i have to evaluate twice?
-    return evaluate(ev, env, ns)
+    #ev = evaluate(args[0], env, ns)  # TODO why do i have to evaluate twice?
+    #return evaluate(ev, env, ns)
+    return evaluate(args[0], env, ns)
 
 eval_arg = Arg("arg", TypeEnum.ANY)
 CORE.register("eval", NebSyntax("eval", interpretEval, [eval_arg]))