Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt/tabasics.py
diff options
context:
space:
mode:
Diffstat (limited to 'TurtleArt/tabasics.py')
-rw-r--r--TurtleArt/tabasics.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index fe2bfa1..2943100 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -108,8 +108,9 @@ from talogo import (primitive_dictionary, logoerror)
from tautils import (convert, chr_to_ord, round_int)
from taconstants import (Color, CONSTANTS)
from taprimitive import (ArgSlot, ConstantArg, or_, Primitive)
-from tatype import (TYPE_BOOL, TYPE_CHAR, TYPE_COLOR, TYPE_FLOAT, TYPE_INT,
- TYPE_NUMBER, TYPE_NUMERIC_STRING, TYPE_OBJECT, TYPE_STRING)
+from tatype import (TYPE_BOOL, TYPE_BOX, TYPE_CHAR, TYPE_COLOR, TYPE_FLOAT,
+ TYPE_INT, TYPE_NUMBER, TYPE_NUMERIC_STRING, TYPE_OBJECT,
+ TYPE_STRING)
from taturtle import Turtle
@@ -1023,7 +1024,7 @@ buttons'))
help_string=_('Variable 1 (numeric value)'),
value_block=True)
self.tw.lc.def_prim('box1', 0,
- Primitive(self.tw.lc.prim_get_box,
+ Primitive(self.tw.lc.prim_get_box, return_type=TYPE_BOX,
arg_descs=[ConstantArg('box1')]))
palette.add_block('box2',
@@ -1035,7 +1036,7 @@ buttons'))
help_string=_('Variable 2 (numeric value)'),
value_block=True)
self.tw.lc.def_prim('box2', 0,
- Primitive(self.tw.lc.prim_get_box,
+ Primitive(self.tw.lc.prim_get_box, return_type=TYPE_BOX,
arg_descs=[ConstantArg('box2')]))
primitive_dictionary['setbox'] = Primitive(self.tw.lc.prim_set_box,
@@ -1052,8 +1053,7 @@ variable'))
self.tw.lc.def_prim('storeinbox', 2, primitive_dictionary['setbox'])
primitive_dictionary['box'] = Primitive(self.tw.lc.prim_get_box,
- return_type=or_(TYPE_OBJECT, TYPE_STRING, TYPE_NUMBER, TYPE_FLOAT,
- TYPE_INT, TYPE_NUMERIC_STRING, TYPE_CHAR, TYPE_COLOR),
+ return_type=TYPE_BOX,
arg_descs=[ArgSlot(TYPE_STRING)])
palette.add_block('box',
style='number-style-1strarg',