diff options
| author | Marion <marion.zepf@gmail.com> | 2013-09-02 19:40:55 (GMT) |
|---|---|---|
| committer | Marion <marion.zepf@gmail.com> | 2013-09-02 19:40:55 (GMT) |
| commit | 3d8e129055cca0d37da256bc3908b600d66028f2 (patch) | |
| tree | 755f6429234dee181663dc9017033fb56c045b02 /TurtleArt/tabasics.py | |
| parent | e0f355204805d156d21e6d120d327b77dbd1ef4f (diff) | |
update Primitives for the 'less' and 'greater' blocks
Diffstat (limited to 'TurtleArt/tabasics.py')
| -rw-r--r-- | TurtleArt/tabasics.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py index c5ef5f5..afb9328 100644 --- a/TurtleArt/tabasics.py +++ b/TurtleArt/tabasics.py @@ -759,9 +759,11 @@ operators')) logo_command='greater?', help_string=_('logical greater-than operator')) self.tw.lc.def_prim('greater?', 2, - Primitive(Primitive.greater, - slot_wrappers={0: self.prim_cache["convert_for_cmp"], - 1: self.prim_cache["convert_for_cmp"]})) + Primitive(Primitive.greater, return_type=TYPE_BOOL, + arg_descs=or_([ArgSlot(TYPE_COLOR), ArgSlot(TYPE_COLOR)], + [ArgSlot(TYPE_NUMBER), ArgSlot(TYPE_NUMBER)], + [ArgSlot(TYPE_STRING), ArgSlot(TYPE_STRING)], + [ArgSlot(TYPE_OBJECT), ArgSlot(TYPE_OBJECT)]))) palette.add_block('less2', style='compare-porch-style', @@ -772,9 +774,11 @@ operators')) logo_command='less?', help_string=_('logical less-than operator')) self.tw.lc.def_prim('less?', 2, - Primitive(Primitive.less, - slot_wrappers={0: self.prim_cache["convert_for_cmp"], - 1: self.prim_cache["convert_for_cmp"]})) + Primitive(Primitive.less, return_type=TYPE_BOOL, + arg_descs=or_([ArgSlot(TYPE_COLOR), ArgSlot(TYPE_COLOR)], + [ArgSlot(TYPE_NUMBER), ArgSlot(TYPE_NUMBER)], + [ArgSlot(TYPE_STRING), ArgSlot(TYPE_STRING)], + [ArgSlot(TYPE_OBJECT), ArgSlot(TYPE_OBJECT)]))) palette.add_block('equal2', style='compare-style', |