From 688ffa154530589b462d2c9d6be6eb61da2f2851 Mon Sep 17 00:00:00 2001 From: mryouse Date: Fri, 1 Jul 2022 02:59:39 +0000 Subject: Revert "initial commit of multi-type support (only list of strings for now)" This reverts commit bf8900200c25d383c883501446a8048ad8966d94. --- neb/std/core.py | 2 +- neb/std/types.py | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'neb/std') diff --git a/neb/std/core.py b/neb/std/core.py index 750594e..1c3c4b4 100644 --- a/neb/std/core.py +++ b/neb/std/core.py @@ -47,7 +47,7 @@ CORE.register("redef", Builtin("redef", interpretRedef, [def_name_arg, def_val_a def interpretLambda(symbol, args, env, ns): new_args = args return_type = Type(":any") - if isinstance(args[0], Type) or isinstance(args[0], MultiType): + if isinstance(args[0], Type): return_type = args[0] new_args = args[1:] diff --git a/neb/std/types.py b/neb/std/types.py index 80288fa..3517384 100644 --- a/neb/std/types.py +++ b/neb/std/types.py @@ -91,16 +91,6 @@ def interpretIsLiteral(symbol, args, env, ns): TYPES.register("literal?", Builtin("literal?", interpretIsLiteral, [Arg("arg", TypeEnum.ANY)], return_type=Type(":bool"))) -def interpretIsListOfString(symbol, args, env, ns): - if not isinstance(args[0], List): - return Bool(False) - for arg in args[0].args: - if not isinstance(arg, String): - return Bool(False) - return Bool(True) - -TYPES.register("list-of-string?", Builtin("list-of-string?", interpretIsListOfString, [Arg("arg", TypeEnum.ANY)], return_type=Type(":bool"))) - # add types to env any_type = NebType(":any", None, interpretIsAny) literal_type = NebType(":literal", any_type, interpretIsLiteral) @@ -112,8 +102,6 @@ number_type = NebType(":number", literal_type, interpretIsNumber) int_type = NebType(":int", number_type, interpretIsInt) float_type = NebType(":float", number_type, interpretIsFloat) -#list_of_string_type = NebType(":[:string]", list_type, interpretIsListOfString) - TYPES.register(":any", any_type) TYPES.register(":literal", literal_type) TYPES.register(":string", string_type) @@ -123,4 +111,3 @@ TYPES.register(":bool", bool_type) TYPES.register(":number", number_type) TYPES.register(":int", int_type) TYPES.register(":float", float_type) -#TYPES.register(":[:string]", list_of_string_type) -- cgit v1.2.3