remove a ton of unused methods from tabasics

1 files changed, 3 insertions, 235 deletions

diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index 9522af0..3fd3c9c 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -97,15 +97,11 @@ object.  Note  that the icons should be the same size (55x55) as
 the others. (This is the default icon size for Sugar toolbars.)
 '''
 
-from time import time, sleep
-from math import sqrt
-from random import uniform
-
+from time import time
 from gettext import gettext as _
 
 from tapalette import (make_palette, define_logo_function)
-from talogo import (primitive_dictionary, logoerror)
-from tautils import (convert, chr_to_ord, round_int)
+from talogo import primitive_dictionary
 from taconstants import (Color, CONSTANTS)
 from taprimitive import (ArgSlot, ConstantArg, or_, Primitive)
 from tatype import (TYPE_BOOL, TYPE_BOX, TYPE_CHAR, TYPE_COLOR, TYPE_FLOAT,
@@ -114,13 +110,6 @@ from tatype import (TYPE_BOOL, TYPE_BOX, TYPE_CHAR, TYPE_COLOR, TYPE_FLOAT,
 from taturtle import Turtle
 
 
-def _num_type(x):
-    ''' Is x a number type? '''
-    if isinstance(x, (int, float)):
-        return True
-    return False
-
-
 def _millisecond():
     ''' Current time in milliseconds '''
     return time() * 1000
@@ -267,7 +256,6 @@ degrees)'))
                 call_afterwards=self.after_move))
         define_logo_function('tasetxy', 'to tasetxy :x :y\nsetxy :x :y\nend\n')
 
-        primitive_dictionary['set'] = self._prim_set
         palette.add_block('seth',
                           style='basic-style-1arg',
                           label=_('set heading'),
@@ -842,7 +830,6 @@ number of seconds'))
             Primitive(self.tw.lc.prim_wait, arg_descs=[ArgSlot(TYPE_NUMBER)]),
             True)
 
-        primitive_dictionary['forever'] = self._prim_forever
         palette.add_block('forever',
                           style='clamp-style',
                           label=_('forever'),
@@ -857,7 +844,6 @@ number of seconds'))
                     ArgSlot(TYPE_OBJECT, call_arg=False)]),
             True)
 
-        primitive_dictionary['repeat'] = self._prim_repeat
         palette.add_block('repeat',
                           style='clamp-style-1arg',
                           label=_('repeat'),
@@ -1138,15 +1124,7 @@ variable'))
                           label=_('clear all'),
                           help_string=_('move all blocks to trash'))
 
-    # Block primitives
-
-    def _prim_clear(self):
-        self.tw.lc.prim_clear()
-        self.tw.turtles.reset_turtles()
-
-    def _prim_and(self, x, y):
-        ''' Logical and '''
-        return x & y
+    # Callbacks to update labels after executing a block
 
     def after_arc(self, *ignored_args):
         if self.tw.lc.update_values:
@@ -1161,26 +1139,6 @@ variable'))
             self.tw.lc.update_label_value(
                 'heading',
                 self.tw.turtles.get_active_turtle().get_heading())
-
-    def _prim_box(self, x):
-        ''' Retrieve value from named box '''
-        if isinstance(convert(x, float, False), float):
-            if int(float(x)) == x:
-                x = int(x)
-        try:
-            return self.tw.lc.boxes['box3' + str(x)]
-        except KeyError:
-            raise logoerror("#emptybox")
-
-    def _prim_forever(self, blklist):
-        ''' Do list forever '''
-        while True:
-            self.tw.lc.icall(self.tw.lc.evline, blklist[:])
-            yield True
-            if self.tw.lc.procstop:
-                break
-        self.tw.lc.ireturn()
-        yield True
     
     def after_move(self, *ignored_args, **ignored_kwargs):
         ''' Update labels after moving the turtle '''
@@ -1194,210 +1152,20 @@ variable'))
                 self.tw.turtles.get_active_turtle().get_xy()[1] /
                 self.tw.coord_scale)
 
-    def _prim_or(self, x, y):
-        ''' Logical or '''
-        return x | y
-
-    def _prim_repeat(self, num, blklist):
-        ''' Repeat list num times. '''
-        if not _num_type(num):
-            raise logoerror("#notanumber")
-        num = self.tw.lc.int(num)
-        for i in range(num):
-            self.tw.lc.icall(self.tw.lc.evline, blklist[:])
-            yield True
-            if self.tw.lc.procstop:
-                break
-        self.tw.lc.ireturn()
-        yield True
-
     def after_right(self, *ignored_args):
         if self.tw.lc.update_values:
             self.tw.lc.update_label_value(
                 'heading',
                 self.tw.turtles.get_active_turtle().get_heading())
 
-    def _prim_set(self, name, cmd, value=None):
-        ''' Set a value and update the associated value blocks '''
-        if value is not None:
-            cmd(value)
-            if self.tw.lc.update_values:
-                self.tw.lc.update_label_value(name, value)
-
     def after_set(self, name, value=None):
         ''' Update the associated value blocks '''
         if value is not None:
             if self.tw.lc.update_values:
                 self.tw.lc.update_label_value(name, value)
 
-    def _prim_setbox(self, name, x, val):
-        ''' Define value of named box '''
-        if x is not None:
-            if isinstance(convert(x, float, False), float):
-                if int(float(x)) == x:
-                    x = int(x)
-            self.tw.lc.boxes[name + str(x)] = val
-            if self.tw.lc.update_values:
-                self.tw.lc.update_label_value('box', val, label=x)
-        else:
-            self.tw.lc.boxes[name] = val
-            if self.tw.lc.update_values:
-                self.tw.lc.update_label_value(name, val)
-
-    def _prim_stack(self, x):
-        ''' Process a named stack '''
-        if isinstance(convert(x, float, False), float):
-            if int(float(x)) == x:
-                x = int(x)
-        if 'stack3' + str(x) not in self.tw.lc.stacks or \
-                self.tw.lc.stacks['stack3' + str(x)] is None:
-            raise logoerror("#nostack")
-        self.tw.lc.icall(self.tw.lc.evline,
-                         self.tw.lc.stacks['stack3' + str(x)][:])
-        yield True
-        self.tw.lc.procstop = False
-        self.tw.lc.ireturn()
-        yield True
-
-    def _prim_stack1(self):
-        ''' Process Stack 1 '''
-        if self.tw.lc.stacks['stack1'] is None:
-            raise logoerror("#nostack")
-        self.tw.lc.icall(self.tw.lc.evline,
-                         self.tw.lc.stacks['stack1'][:])
-        yield True
-        self.tw.lc.procstop = False
-        self.tw.lc.ireturn()
-        yield True
-
-    def _prim_stack2(self):
-        ''' Process Stack 2 '''
-        if self.tw.lc.stacks['stack2'] is None:
-            raise logoerror("#nostack")
-        self.tw.lc.icall(self.tw.lc.evline, self.tw.lc.stacks['stack2'][:])
-        yield True
-        self.tw.lc.procstop = False
-        self.tw.lc.ireturn()
-        yield True
-
-    # Math primitives
-
-    def _prim_careful_divide(self, x, y):
-        ''' Raise error on divide by zero '''
-        if isinstance(x, list) and _num_type(y):
-            z = []
-            for i in range(len(x)):
-                try:
-                    z.append(x[i] / y)
-                except ZeroDivisionError:
-                    raise logoerror("#zerodivide")
-            return z
-        try:
-            return x / y
-        except ZeroDivisionError:
-            raise logoerror("#zerodivide")
-        except TypeError:
-            try:
-                return self._string_to_num(x) / self._string_to_num(y)
-            except ZeroDivisionError:
-                raise logoerror("#zerodivide")
-            except ValueError:
-                raise logoerror("#syntaxerror")
-            except TypeError:
-                raise logoerror("#notanumber")
-
-    def _prim_plus(self, x, y):
-        ''' Add numbers, concat strings '''
-        if isinstance(x, Color):
-            x = int(x)
-        if isinstance(y, Color):
-            y = int(y)
-        if _num_type(x) and _num_type(y):
-            return(x + y)
-        elif isinstance(x, list) and isinstance(y, list):
-            z = []
-            for i in range(len(x)):
-                z.append(x[i] + y[i])
-            return(z)
-        else:
-            if _num_type(x):
-                xx = str(round_int(x))
-            else:
-                xx = str(x)
-            if _num_type(y):
-                yy = str(round_int(y))
-            else:
-                yy = str(y)
-            return(xx + yy)
-
-    def _prim_minus(self, x, y):
-        ''' Numerical subtraction '''
-        if _num_type(x) and _num_type(y):
-            return(x - y)
-        elif isinstance(x, list) and isinstance(y, list):
-            z = []
-            for i in range(len(x)):
-                z.append(x[i] - y[i])
-            return(z)
-        try:
-            return self._string_to_num(x) - self._string_to_num(y)
-        except TypeError:
-            raise logoerror("#notanumber")
-
-    def _prim_product(self, x, y):
-        ''' Numerical multiplication '''
-        if _num_type(x) and _num_type(y):
-            return(x * y)
-        elif isinstance(x, list) and _num_type(y):
-            z = []
-            for i in range(len(x)):
-                z.append(x[i] * y)
-            return(z)
-        elif isinstance(y, list) and _num_type(x):
-            z = []
-            for i in range(len(y)):
-                z.append(y[i] * x)
-            return(z)
-        try:
-            return self._string_to_num(x) * self._string_to_num(y)
-        except TypeError:
-            raise logoerror("#notanumber")
-
-    def _prim_mod(self, x, y):
-        ''' Numerical mod '''
-        if _num_type(x) and _num_type(y):
-            return(x % y)
-        try:
-            return self._string_to_num(x) % self._string_to_num(y)
-        except TypeError:
-            raise logoerror("#notanumber")
-        except ValueError:
-            raise logoerror("#syntaxerror")
-
     # Utilities
 
-    def _string_to_num(self, x):
-        ''' Try to convert a string to a number '''
-        if isinstance(x, (int, float)):
-            return(x)
-        try:
-            return int(ord(x))
-        except TypeError:
-            pass
-        if isinstance(x, list):
-            raise logoerror("#syntaxerror")
-        if isinstance(x, Color):
-            return int(x)
-        xx = convert(x.replace(self.tw.decimal_point, '.'), float)
-        if isinstance(xx, float):
-            return xx
-        else:
-            xx, xflag = chr_to_ord(x)
-            if xflag:
-                return xx
-            else:
-                raise logoerror("#syntaxerror")
-
     def _make_constant(self, palette, block_name, label, constant_key):
         ''' Factory for constant blocks '''
         constant = CONSTANTS[constant_key]