From 73b3ddac92d2ce99e5115eba7813aa8e6c9e105f Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Wed, 13 Jun 2012 12:59:00 +0000
Subject: define general purpose chr and int blocks instead of special purpose chr(keyboard) and int(keyboard) blocks

---
(limited to 'plugins/turtle_blocks_extras')

diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
index 48ecd6e..cae6abb 100644
--- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py
+++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
@@ -368,6 +368,7 @@ stored in keyboard block)'))
 block as ASCII'))
         self.tw.lc.def_prim('keyboard', 0, lambda self: self.tw.lc.keyboard)
 
+        '''
         palette.add_block('keyboard_chr',
                           style='box-style',
                           label='chr(%s)' % (_('keyboard')),
@@ -390,6 +391,7 @@ block as character'))
 block as number'))
         self.tw.lc.def_prim('keyboard_num', 0,
                             lambda self: primitive_dictionary['keyboardnum']())
+        '''
 
         primitive_dictionary['readpixel'] = self._prim_readpixel
         palette.add_block('readpixel',
@@ -515,6 +517,22 @@ bottom of the screen'))
         self.tw.lc.def_prim('print', 1,
             lambda self, x: primitive_dictionary['print'](x, False))
 
+        palette.add_block('chr',
+                          style='number-style-1arg',
+                          label='chr',
+                          prim_name='chr',
+                          help_string=_('Python chr operator'))
+        self.tw.lc.def_prim('chr', 1,
+                             lambda self, x: chr(x))
+
+        palette.add_block('int',
+                          style='number-style-1arg',
+                          label='int',
+                          prim_name='int',
+                          help_string=_('Python int operator'))
+        self.tw.lc.def_prim('int', 1,
+                             lambda self, x: int(x))
+
         primitive_dictionary['myfunction'] = self._prim_myfunction
         palette.add_block('myfunc1arg',
                           style='number-style-var-arg',
@@ -1116,12 +1134,14 @@ bullets'))
         self.tw.lc.heap.append(val)
         self.tw.lc.update_label_value('pop', val)
 
+    '''
     def _prim_keyboard_num(self):
         """ Return a number when a number is typed. """
         if self.tw.lc.keyboard < 48 or self.tw.lc.keyboard > 57:
             return -1
         else:
             return self.tw.lc.keyboard - 48
+    '''
 
     def _prim_readpixel(self):
         """ Read r, g, b, a from the canvas and push b, g, r to the stack """
--
cgit v0.9.1