From ac001ef2808f1209bba815a861c228b3321a71a3 Mon Sep 17 00:00:00 2001 From: mryouse Date: Fri, 17 Jun 2022 03:40:17 +0000 Subject: refactor: simplify Arg signature --- interpreter.py | 142 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'interpreter.py') diff --git a/interpreter.py b/interpreter.py index 171fbb1..1911c05 100644 --- a/interpreter.py +++ b/interpreter.py @@ -16,10 +16,12 @@ import math @dataclass class Arg: - name: str - type_: TypeEnum - optional: bool - lazy: bool + + def __init__(self, name, type_, *, optional=False, lazy=False): + self.name = name + self.type_ = type_ + self.optional = optional + self.lazy = lazy def __str__(self): opt = "?" if self.optional else "" @@ -111,7 +113,7 @@ class UserFunction(Function): for param in params: if isinstance(param, Symbol): newparams.append(param) - args.append(Arg(param.name, TypeEnum.ANY, False, False)) + args.append(Arg(param.name, TypeEnum.ANY)) prev_type = False elif isinstance(param, Type) and not prev_type and not first: args[-1].type_ = TypeEnum.__getattr__(param.name[1:].upper()) @@ -227,7 +229,7 @@ def interpretOr(symbol, args, env, ns): return Bool(False) #GLOBALS.register("or", Builtin(interpretOr, 2)) -or_arg = Arg("arg", TypeEnum.BOOL, False, True) +or_arg = Arg("arg", TypeEnum.BOOL, lazy=True) GLOBALS.register("or", Builtin(interpretOr, [or_arg, or_arg], or_arg)) def interpretAnd(symbol, args, env, ns): @@ -250,13 +252,13 @@ def interpretEq(symbol, args, env, ns): else: return Bool(False) -eq_arg = Arg("value", TypeEnum.LITERAL, False, False) +eq_arg = Arg("value", TypeEnum.LITERAL) GLOBALS.register("eq?", Builtin(interpretEq, [eq_arg, eq_arg])) def interpretGreaterThan(symbol, args, env, ns): return Bool(args[0].value > args[1].value) -compare_arg = Arg("num", TypeEnum.NUMBER, False, False) +compare_arg = Arg("num", TypeEnum.NUMBER) GLOBALS.register(">", Builtin(interpretGreaterThan, [compare_arg, compare_arg])) def interpretGreaterThanEqual(symbol, args, env, ns): @@ -283,7 +285,7 @@ def interpretAddition(symbol, args, env, ns): else: return Int(res) -term_arg = Arg("term", TypeEnum.NUMBER, False, False) +term_arg = Arg("term", TypeEnum.NUMBER) GLOBALS.register("+", Builtin(interpretAddition, [term_arg], term_arg)) def interpretSubtraction(symbol, args, env, ns): @@ -309,7 +311,7 @@ def interpretMultiplication(symbol, args, env, ns): else: return Int(res) -factor_arg = Arg("factor", TypeEnum.NUMBER, False, False) +factor_arg = Arg("factor", TypeEnum.NUMBER) GLOBALS.register("*", Builtin(interpretMultiplication, [factor_arg, factor_arg], factor_arg)) def interpretDivision(symbol, args, env, ns): @@ -324,7 +326,7 @@ GLOBALS.register("/", Builtin(interpretDivision, [factor_arg, factor_arg])) def interpretNot(symbol, args, env, ns): return Bool(not args[0].value) -not_arg = Arg("not", TypeEnum.BOOL, False, False) +not_arg = Arg("not", TypeEnum.BOOL) GLOBALS.register("not", Builtin(interpretNot, [not_arg])) def interpretIf(symbol, args, env, ns): @@ -335,16 +337,16 @@ def interpretIf(symbol, args, env, ns): return evaluate(args[2], env, ns) return List([]) -cond = Arg("cond", TypeEnum.BOOL, False, False) -t_branch = Arg("t-branch", TypeEnum.ANY, False, True) -f_branch = Arg("f-branch", TypeEnum.ANY, True, True) +cond = Arg("cond", TypeEnum.BOOL) +t_branch = Arg("t-branch", TypeEnum.ANY, lazy=True) +f_branch = Arg("f-branch", TypeEnum.ANY, optional=True, lazy=True) GLOBALS.register("if", Builtin(interpretIf, [cond, t_branch, f_branch])) def interpretPrint(symbol, args, env, ns): print(args[0].value) return List([]) # print returns nothing -GLOBALS.register("print", Builtin(interpretPrint, [Arg("arg", TypeEnum.STRING, False, False)])) +GLOBALS.register("print", Builtin(interpretPrint, [Arg("arg", TypeEnum.STRING)])) def interpretDef(symbol, args, env, ns): @@ -358,8 +360,8 @@ def interpretDef(symbol, args, env, ns): return List([]) -def_name_arg = Arg("name", TypeEnum.ANY, False, True) -def_val_arg = Arg("value", TypeEnum.ANY, False, False) +def_name_arg = Arg("name", TypeEnum.ANY, lazy=True) +def_val_arg = Arg("value", TypeEnum.ANY) GLOBALS.register("def", Builtin(interpretDef, [def_name_arg, def_val_arg])) def interpretRedef(symbol, args, env, ns): @@ -381,8 +383,8 @@ def interpretLambda(symbol, args, env, ns): func = UserFunction("", [], args[1:]) return func -lambda_args_arg = Arg("args", TypeEnum.ANY, False, True) -lambda_body_arg = Arg("body", TypeEnum.ANY, False, True) +lambda_args_arg = Arg("args", TypeEnum.ANY, lazy=True) +lambda_body_arg = Arg("body", TypeEnum.ANY, lazy=True) GLOBALS.register("lambda", Builtin(interpretLambda, [lambda_args_arg, lambda_body_arg], lambda_body_arg)) def interpretToString(symbol, args, env, ns): @@ -394,7 +396,7 @@ def interpretToString(symbol, args, env, ns): else: return String(f"{item}") -GLOBALS.register("->string", Builtin(interpretToString, [Arg("arg", TypeEnum.ANY, False, False)])) +GLOBALS.register("->string", Builtin(interpretToString, [Arg("arg", TypeEnum.ANY)])) def interpretConcat(symbol, args, env, ns): # concat str1 str2...strN @@ -403,7 +405,7 @@ def interpretConcat(symbol, args, env, ns): out += arg.value return String(out) -string_arg = Arg("arg", TypeEnum.STRING, False, False) +string_arg = Arg("arg", TypeEnum.STRING) GLOBALS.register("concat", Builtin(interpretConcat, [string_arg, string_arg], string_arg)) def interpretForCount(symbol, args, env, ns): @@ -418,8 +420,8 @@ def interpretForCount(symbol, args, env, ns): return List([]) return ret -for_count_arg = Arg("count", TypeEnum.INT, False, False) -for_body_arg = Arg("body", TypeEnum.ANY, False, True) +for_count_arg = Arg("count", TypeEnum.INT) +for_body_arg = Arg("body", TypeEnum.ANY, lazy=True) GLOBALS.register("for-count", Builtin(interpretForCount, [for_count_arg, for_body_arg], for_body_arg)) def interpretForEach(symbol, args, env, ns): @@ -434,7 +436,7 @@ def interpretForEach(symbol, args, env, ns): return List([]) return ret -for_each_arg = Arg("list", TypeEnum.LIST, False, False) +for_each_arg = Arg("list", TypeEnum.LIST) GLOBALS.register("for-each", Builtin(interpretForEach, [for_each_arg, for_body_arg], for_body_arg)) def interpretPipe(symbol, args, env, ns): @@ -498,13 +500,13 @@ def interpretReadLines(symbol, args, env, ns): out = List([String(d) for d in data], True) # all lines are strings return out -GLOBALS.register("read-lines", Builtin(interpretReadLines, [Arg("filename", TypeEnum.STRING, False, False)])) +GLOBALS.register("read-lines", Builtin(interpretReadLines, [Arg("filename", TypeEnum.STRING)])) # - strip whitespace from string def interpretStrip(symbol, args, env, ns): return String(args[0].value.strip()) -GLOBALS.register("strip", Builtin(interpretStrip, [Arg("filename", TypeEnum.STRING, False, False)])) +GLOBALS.register("strip", Builtin(interpretStrip, [Arg("filename", TypeEnum.STRING)])) # - string->int and string->float def interpretStringToInt(symbol, args, env, ns): @@ -514,7 +516,7 @@ def interpretStringToInt(symbol, args, env, ns): except: raise InterpretPanic(symbol, "can't convert to an :int", args[0]) -GLOBALS.register("string->int", Builtin(interpretStringToInt, [Arg("arg", TypeEnum.STRING, False, False)])) +GLOBALS.register("string->int", Builtin(interpretStringToInt, [Arg("arg", TypeEnum.STRING)])) # - split a string by a given field def interpretSplit(symbol, args, env, ns): @@ -525,13 +527,13 @@ def interpretSplit(symbol, args, env, ns): ret = target.value.split(splitter.value) return List([String(r) for r in ret], True) -GLOBALS.register("split", Builtin(interpretSplit, [Arg("target", TypeEnum.STRING, False, False)], Arg("splitter", TypeEnum.STRING, True, False))) +GLOBALS.register("split", Builtin(interpretSplit, [Arg("target", TypeEnum.STRING)], Arg("splitter", TypeEnum.STRING, optional=True))) # - get the length of a list def interpretListLength(symbol, args, env, ns): return Int(len(args[0].args)) -GLOBALS.register("list-length", Builtin(interpretListLength, [Arg("arg", TypeEnum.LIST, False, False)])) +GLOBALS.register("list-length", Builtin(interpretListLength, [Arg("arg", TypeEnum.LIST)])) # - first/rest of list def interpretFirst(symbol, args, env, ns): @@ -539,13 +541,13 @@ def interpretFirst(symbol, args, env, ns): raise InterpretPanic(symbol, "list is empty") return evaluate(args[0].args[0], env, ns) -GLOBALS.register("first", Builtin(interpretFirst, [Arg("arg", TypeEnum.LIST, False, False)])) +GLOBALS.register("first", Builtin(interpretFirst, [Arg("arg", TypeEnum.LIST, )])) def interpretRest(symbol, args, env, ns): # TODO do we know it's not evaluated? return List(args[0].args[1:], True) # we don't evaluate the remainder of the list -GLOBALS.register("rest", Builtin(interpretRest, [Arg("arg", TypeEnum.LIST, False, False)])) +GLOBALS.register("rest", Builtin(interpretRest, [Arg("arg", TypeEnum.LIST)])) # - iterate over list # - map @@ -563,7 +565,7 @@ def interpretMap(symbol, args, env, ns): out.append(ev) return List(out, True) -GLOBALS.register("map", Builtin(interpretMap, [Arg("func", TypeEnum.ANY, False, False), Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("map", Builtin(interpretMap, [Arg("func", TypeEnum.ANY), Arg("list", TypeEnum.LIST)])) def interpretZip(symbol, args, env, ns): z1 = args[0] @@ -577,20 +579,20 @@ def interpretZip(symbol, args, env, ns): out.append(List([f, s], True)) return List(out, True) -zip_arg = Arg("list", TypeEnum.LIST, False, False) +zip_arg = Arg("list", TypeEnum.LIST) GLOBALS.register("zip", Builtin(interpretZip, [zip_arg, zip_arg])) def interpretList(symbol, args, env, ns): return List(args, True) -GLOBALS.register("list", Builtin(interpretList, [], Arg("item", TypeEnum.ANY, False, False))) +GLOBALS.register("list", Builtin(interpretList, [], Arg("item", TypeEnum.ANY))) def interpretListReverse(symbol, args, env, ns): new_args = args[0].args[:] # make a copy of the args new_args.reverse() return List(new_args, True) -GLOBALS.register("list-reverse", Builtin(interpretListReverse, [Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("list-reverse", Builtin(interpretListReverse, [Arg("list", TypeEnum.LIST)])) def interpretApply(symbol, args, env, ns): # TODO: to support lambdas, we can't assume the func is defined @@ -600,37 +602,37 @@ def interpretApply(symbol, args, env, ns): new_lst = List([func] + args[1].args) return evaluate(new_lst, env, ns) -GLOBALS.register("apply", Builtin(interpretApply, [Arg("func", TypeEnum.ANY, False, True), Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("apply", Builtin(interpretApply, [Arg("func", TypeEnum.ANY, lazy=True), Arg("list", TypeEnum.LIST)])) def interpretGlob(symbol, args, env, ns): items = glob(args[0].value) return List([String(item) for item in items], True) -GLOBALS.register("glob", Builtin(interpretGlob, [Arg("regex", TypeEnum.STRING, False, False)])) +GLOBALS.register("glob", Builtin(interpretGlob, [Arg("regex", TypeEnum.STRING)])) def interpretShell(symbol, args, env, ns): # TODO either fail or throw exception (?) on error ret = subprocess.run(shlex.split(args[0].value), capture_output=True) return List([String(r) for r in ret.stdout.decode("utf-8").split("\n")], True) -GLOBALS.register("$", Builtin(interpretShell, [Arg("command", TypeEnum.STRING, False, False)])) +GLOBALS.register("$", Builtin(interpretShell, [Arg("command", TypeEnum.STRING)])) def interpretEmpty(symbol, args, env, ns): return Bool(len(args[0].args) == 0) -GLOBALS.register("empty?", Builtin(interpretEmpty, [Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("empty?", Builtin(interpretEmpty, [Arg("list", TypeEnum.LIST)])) def interpretShuf(symbol, args, env, ns): items = args[0].args[:] random.shuffle(items) return List(items, True) -GLOBALS.register("shuf", Builtin(interpretShuf, [Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("shuf", Builtin(interpretShuf, [Arg("list", TypeEnum.LIST)])) def interpretIsList(symbol, args, env, ns): return Bool(isinstance(args[0], List)) -GLOBALS.register("list?", Builtin(interpretIsList, [Arg("arg", TypeEnum.ANY, False, False)])) +GLOBALS.register("list?", Builtin(interpretIsList, [Arg("arg", TypeEnum.ANY)])) def interpretBlock(symbol, args, env, ns): ret = List([]) @@ -638,7 +640,7 @@ def interpretBlock(symbol, args, env, ns): ret = evaluate(arg, env, ns) return ret -block_arg = Arg("expr", TypeEnum.ANY, False, True) +block_arg = Arg("expr", TypeEnum.ANY, lazy=True) GLOBALS.register("block", Builtin(interpretBlock, [block_arg], block_arg)) def interpretExit(symbol, args, env, ns): @@ -646,7 +648,7 @@ def interpretExit(symbol, args, env, ns): sys.exit(status) return List([]) -exit_arg = Arg("status", TypeEnum.INT, True, False) +exit_arg = Arg("status", TypeEnum.INT, optional=True) GLOBALS.register("exit", Builtin(interpretExit, [exit_arg])) def interpretUnlink(symbol, args, env, ns): @@ -656,7 +658,7 @@ def interpretUnlink(symbol, args, env, ns): target_path.unlink() return List([]) -GLOBALS.register("unlink", Builtin(interpretUnlink, [Arg("filename", TypeEnum.STRING, False, False)])) +GLOBALS.register("unlink", Builtin(interpretUnlink, [Arg("filename", TypeEnum.STRING)])) def interpretArgv(symbol, args, env, ns): out = [] @@ -674,8 +676,8 @@ def interpretIn(symbol, args, env, ns): return Bool(True) return Bool(False) -in_target_arg = Arg("target", TypeEnum.LITERAL, False, False) -in_list_arg = Arg("list", TypeEnum.LIST, False, False) +in_target_arg = Arg("target", TypeEnum.LITERAL) +in_list_arg = Arg("list", TypeEnum.LIST) GLOBALS.register("in?", Builtin(interpretIn, [in_target_arg, in_list_arg])) def interpretLast(symbol, args, env, ns): @@ -683,15 +685,15 @@ def interpretLast(symbol, args, env, ns): raise InterpretPanic("List is empty") return evaluate(args[0].args[-1], env, ns) -GLOBALS.register("last", Builtin(interpretLast, [Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("last", Builtin(interpretLast, [Arg("list", TypeEnum.LIST)])) def interpretJoin(symbol, args, env, ns): lst = args[0] target = args[1] return String(target.value.join([a.value for a in lst.args])) -join_list_arg = Arg("list", TypeEnum.LIST, False, False) -join_string_arg = Arg("joiner", TypeEnum.STRING, False, False) +join_list_arg = Arg("list", TypeEnum.LIST) +join_string_arg = Arg("joiner", TypeEnum.STRING) GLOBALS.register("join", Builtin(interpretJoin, [join_list_arg, join_string_arg])) def interpretWithWrite(symbol, args, env, ns): @@ -705,7 +707,7 @@ def interpretWithWrite(symbol, args, env, ns): ret = evaluate(arg, new_env, ns) return ret -GLOBALS.register("with-write", Builtin(interpretWithWrite, [Arg("filename", TypeEnum.STRING, False, False)], Arg("exprs", TypeEnum.ANY, False, True))) +GLOBALS.register("with-write", Builtin(interpretWithWrite, [Arg("filename", TypeEnum.STRING)], Arg("exprs", TypeEnum.ANY, lazy=True))) def interpretWrite(symbol, args, env, ns): # write :string :filehandle @@ -714,7 +716,7 @@ def interpretWrite(symbol, args, env, ns): handle.args[0].write(line.value) # TODO wrong! how do we evaluate a handle? return Literal([]) -GLOBALS.register("write", Builtin(interpretWrite, [Arg("string", TypeEnum.STRING, False, False), Arg("filename", TypeEnum.LIST, False, False)])) +GLOBALS.register("write", Builtin(interpretWrite, [Arg("string", TypeEnum.STRING), Arg("filename", TypeEnum.LIST)])) def interpretNewline(symbol, args, env, ns): return String("\n") @@ -724,19 +726,19 @@ GLOBALS.register("newline", Builtin(interpretNewline, [])) def interpretExists(symbol, args, env, ns): return Bool(Path(args[0].value).resolve().exists()) -GLOBALS.register("exists?", Builtin(interpretExists, [Arg("filename", TypeEnum.STRING, False, False)])) +GLOBALS.register("exists?", Builtin(interpretExists, [Arg("filename", TypeEnum.STRING)])) def interpretFirstChar(symbol, args, env, ns): if len(args[0].value) == 0: raise InterpretPanic(symbol, ":string is empty", ev) return String(args[0].value[0]) -GLOBALS.register("first-char", Builtin(interpretFirstChar, [Arg("string", TypeEnum.STRING, False, False)])) +GLOBALS.register("first-char", Builtin(interpretFirstChar, [Arg("string", TypeEnum.STRING)])) def interpretRestChar(symbol, args, env, ns): return String(args[0].value[1:]) -GLOBALS.register("rest-char", Builtin(interpretRestChar, [Arg("string", TypeEnum.STRING, False, False)])) +GLOBALS.register("rest-char", Builtin(interpretRestChar, [Arg("string", TypeEnum.STRING)])) def interpretSlice(symbol, args, env, ns): lst = args[0] @@ -747,9 +749,9 @@ def interpretSlice(symbol, args, env, ns): diff = idx.value - 1 + length.value return List(lst.args[idx.value - 1:diff]) -slice_list_arg = Arg("list", TypeEnum.LIST, False, False) -slice_idx_arg = Arg("idx", TypeEnum.INT, False, False) -slice_length_arg = Arg("length", TypeEnum.INT, True, False) +slice_list_arg = Arg("list", TypeEnum.LIST) +slice_idx_arg = Arg("idx", TypeEnum.INT) +slice_length_arg = Arg("length", TypeEnum.INT, optional=True) GLOBALS.register("slice", Builtin(interpretSlice, [slice_list_arg, slice_idx_arg, slice_length_arg])) def interpretClear(symbol, args, env, ns): @@ -762,7 +764,7 @@ def interpretReadLine(symbol, args, env, ns): ret = input(args[0].value) return String(ret) -GLOBALS.register("read-line", Builtin(interpretReadLine, [Arg("prompt", TypeEnum.STRING, False, False)])) +GLOBALS.register("read-line", Builtin(interpretReadLine, [Arg("prompt", TypeEnum.STRING)])) def interpretReadChar(symbol, args, env, ns): import termios, tty @@ -785,7 +787,7 @@ def interpretAppend(symbol, args, env, ns): items = lst.args[:] return List(items + [val], True) -GLOBALS.register("append", Builtin(interpretAppend, [Arg("list", TypeEnum.LIST, False, False), Arg("item", TypeEnum.ANY, False, False)])) +GLOBALS.register("append", Builtin(interpretAppend, [Arg("list", TypeEnum.LIST), Arg("item", TypeEnum.ANY)])) # TODO: this is actually for records/structs/whatever they're called def interpretRemove(symbol, args, env, ns): @@ -797,7 +799,7 @@ def interpretRemove(symbol, args, env, ns): out.append(arg) return List(out, True) -GLOBALS.register("remove", Builtin(interpretRemove, [Arg("list", TypeEnum.LIST, False, False), Arg("key", TypeEnum.ANY, False, False)])) +GLOBALS.register("remove", Builtin(interpretRemove, [Arg("list", TypeEnum.LIST), Arg("key", TypeEnum.ANY)])) def interpretWhile(symbol, args, env, ns): cond = args[0] @@ -812,7 +814,7 @@ def interpretWhile(symbol, args, env, ns): ret = evaluate(arg, env, ns) return ret -GLOBALS.register("while", Builtin(interpretWhile, [Arg("cond", TypeEnum.BOOL, False, True)], Arg("expr", TypeEnum.ANY, False, True))) +GLOBALS.register("while", Builtin(interpretWhile, [Arg("cond", TypeEnum.BOOL, lazy=True)], Arg("expr", TypeEnum.ANY, lazy=True))) def interpretUse(symbol, args, env, ns): target_file_name = args[0].value @@ -824,14 +826,14 @@ def interpretUse(symbol, args, env, ns): interpret(parse(lex(data))) return List([]) -GLOBALS.register("use", Builtin(interpretUse, [Arg("filename", TypeEnum.STRING, False, False)])) +GLOBALS.register("use", Builtin(interpretUse, [Arg("filename", TypeEnum.STRING)])) def interpretAssert(symbol, args, env, ns): if args[0].value != True: raise InterpretPanic(symbol, "assertion failed") return List([]) -GLOBALS.register("assert", Builtin(interpretAssert, [Arg("cond", TypeEnum.BOOL, False, False)])) +GLOBALS.register("assert", Builtin(interpretAssert, [Arg("cond", TypeEnum.BOOL)])) def interpretHowTo(symbol, args, env, ns): if not isinstance(args[0], Symbol): @@ -840,7 +842,7 @@ def interpretHowTo(symbol, args, env, ns): print(sym.describe(args[0].name)) return List([]) -GLOBALS.register("howto", Builtin(interpretHowTo, [Arg("symbol", TypeEnum.ANY, False, True)])) +GLOBALS.register("howto", Builtin(interpretHowTo, [Arg("symbol", TypeEnum.ANY, lazy=True)])) def interpretSymbols(symbol, args, env, ns): keys = list(env.environment.keys()) @@ -868,21 +870,19 @@ def interpretUseAs(symbol, args, env, ns): return List([]) # TODO takes a symbol as its second, that may be wrong -GLOBALS.register("use-as", Builtin(interpretUseAs, [Arg("filename", TypeEnum.STRING, False, False), Arg("namespace", TypeEnum.ANY, False, True)])) +GLOBALS.register("use-as", Builtin(interpretUseAs, [Arg("filename", TypeEnum.STRING), Arg("namespace", TypeEnum.ANY, lazy=True)])) def interpretFloor(symbol, args, env, ns): return Int(math.floor(args[0].value)) -GLOBALS.register("floor", Builtin(interpretFloor, [Arg("floor", TypeEnum.NUMBER, False, False)])) +GLOBALS.register("floor", Builtin(interpretFloor, [Arg("floor", TypeEnum.NUMBER)])) def interpretFilter(symbol, args, env, ns): # TODO: to support lambdas, we can't assume the func is defined func = args[0] if not isinstance(func, Function): raise InterpretPanic(symbol, "requires a :func as its first argument", func) - lst = evaluate(args[1], env, ns) - if not isinstance(lst, List): - raise InterpretPanic(symbol, "requires a :list as its second argument", lst) + lst = args[1] out = [] for arg in lst.args: ev = func.call(List([func, arg]), env, ns) @@ -892,9 +892,9 @@ def interpretFilter(symbol, args, env, ns): out.append(arg) return List(out, True) -GLOBALS.register("filter", Builtin(interpretFilter, [Arg("func", TypeEnum.ANY, False, False), Arg("list", TypeEnum.LIST, False, False)])) +GLOBALS.register("filter", Builtin(interpretFilter, [Arg("func", TypeEnum.ANY), Arg("list", TypeEnum.LIST)])) def interpretTypeOf(symbol, args, env, ns): return Type(f"{args[0].type_}") -GLOBALS.register("typeof", Builtin(interpretTypeOf, [Arg("candidate", TypeEnum.ANY, False, False)])) +GLOBALS.register("typeof", Builtin(interpretTypeOf, [Arg("candidate", TypeEnum.ANY)])) -- cgit v1.2.3