diff options
author | Marion <marion.zepf@gmail.com> | 2013-08-29 13:32:28 (GMT) |
---|---|---|
committer | Marion <marion.zepf@gmail.com> | 2013-08-29 13:32:28 (GMT) |
commit | af7287d911f2ab7b8fc0ee16ff19bd722de3ebf4 (patch) | |
tree | 7986cdb6dec9ec43ab938c03e7df69b82b202c4d /TurtleArt/taprimitive.py | |
parent | a0e0b5a769f95e995e04c58f270cfa953b34f901 (diff) |
add TypeDisjunction to the or_ function
Diffstat (limited to 'TurtleArt/taprimitive.py')
-rw-r--r-- | TurtleArt/taprimitive.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/TurtleArt/taprimitive.py b/TurtleArt/taprimitive.py index b7bca61..1d49d21 100644 --- a/TurtleArt/taprimitive.py +++ b/TurtleArt/taprimitive.py @@ -29,7 +29,8 @@ from talogo import (LogoCode, logoerror) from taturtle import (Turtle, Turtles) from tatype import (convert, get_call_ast, get_converter, get_type, is_bound_instancemethod, is_instancemethod, - is_staticmethod, TATypeError, TypeDisjunction, TYPE_OBJECT) + is_staticmethod, TATypeError, Type, TypeDisjunction, + TYPE_OBJECT) from tautils import debug_output from tawindow import (global_objects, TurtleArtWindow) @@ -1168,6 +1169,8 @@ def or_(*disjuncts): return ArgListDisjunction(disjuncts) elif isinstance(disjuncts[0], ArgSlot): return ArgSlotDisjunction(disjuncts) + elif isinstance(disjuncts[0], Type): + return TypeDisjunction(disjuncts) else: return tuple(disjuncts) |