Add op alias and jmp method

gte/__main__.py

@@ -25,8 +25,8 @@ subparsers = parser.add_subparsers(help='sub-commands help')
 
 parser_evolve = subparsers.add_parser('evolve', help='evolving help')
 
-parser_evolve.add_argument('--steps', '-s', type=int, metavar='N', default=1024,
-                    help="Number of steps")
+parser_evolve.add_argument('--steps', '-s', type=int, metavar='N',
+                           default=4000, help="Number of steps")
 
 parser_evolve.add_argument('--repeat-eval', type=int, metavar='N', default=5)
 
@@ -36,13 +36,13 @@ parser_evolve.add_argument('--world-width', '-x', type=int, metavar='WIDTH',
                            default=256)
 
 parser_evolve.add_argument('--turmit-count', '-T', type=int, metavar='N',
-                           default=10)
+                           default=3)
 
 parser_evolve.add_argument('--pool-size', '-p', type=int, metavar='N',
                            default=10)
 
 parser_evolve.add_argument('--prog-size', type=int, metavar='SIZE',
-                           default=10)
+                           default=5)
 
 parser_evolve.add_argument('--prog', '-P', type=str, metavar='EXPR',
                            default=None)
@@ -94,7 +94,8 @@ if 'pool_size' in args:
     if args.log_progs is not None:
         logprogs = open(args.log_progs, 'a')
         logprogs.write('%s Run args %s\n' % (datetime.datetime.now(),
-                                             args))
+                                             sys.argv))
+        logprogs.write('%s\n' % args)
         logprogs.close()
     else:
         logger.warning('No log specified (--log-progs or -L)')

gte/rpnlib.py

@@ -5,6 +5,18 @@ import random
 _op_list = collections.OrderedDict()
 _var_list = collections.OrderedDict()
 
+_op_alias = collections.OrderedDict()
+_op_alias['add'] = '+'
+_op_alias['sub'] = '-'
+_op_alias['mul'] = '*'
+_op_alias['div'] = '/'
+_op_alias['bin_and'] = '&'
+_op_alias['bin_or'] = '|'
+_op_alias['bin_xor'] = '^'
+_op_alias['lshift'] = '<<'
+_op_alias['rshift'] = '>>'
+_op_alias['pow'] = '**'
+
 _var_list['x'] = 0
 _var_list['y'] = 0
 _var_list['r'] = 0
@@ -60,7 +72,12 @@ class RpnExpr(list):
             raise TypeError('RpnSymbol expected but got %s' % type(val))
         super().__setitem__(idx, val)
 
-    def __str__(self):
+    def __str__(self, small=True):
+        if small:
+            return ' '.join([_op_alias[str(sym).lower()]
+                        if str(sym).lower() in _op_alias
+                        else str(sym)
+                        for sym in self])
         return ' '.join([str(sym) for sym in self])
 
     @classmethod
@@ -97,6 +114,9 @@ class RpnSymbol(object):
         err_type = 'Unknown'
         if optype == self.OPERATION:
             if isinstance(value, str):
+                if self.value.lower() in _op_alias.values():
+                    idx = list(_op_alias.values()).index(self.value.lower())
+                    self.value = list(_op_alias.keys())[idx]
                 if not value in _op_list:
                     err = True
                     err_type = 'operation'
@@ -145,10 +165,11 @@ class RpnSymbol(object):
             return cls(val, cls.VALUE)
         except Exception:
             pass
-        if val.lower() in _op_list.keys():
+        if val.lower() in _op_list.keys() or val.lower() in _op_alias.values():
             return cls(val, cls.OPERATION)
         elif val.lower() in _var_list.keys():
             return cls(val, cls.VARIABLE)
+            
         raise ValueError('Unrecognized symbol "%s"' % val)
             
 

gte/turmit.py

@@ -75,13 +75,16 @@ class Turmit(object):
             @param context dict : dict with variable values (see @ref rpnlib._var_list)
             @return stack head after RPN
         '''
-        for sym in self._prog:
+        self.__ip = 0
+        while self.__ip < len(self._prog):
+            sym = self._prog[self.__ip]
             if sym.optype == RpnSymbol.VALUE:
                 self._push(sym.value)
             elif sym.optype == RpnSymbol.VARIABLE:
                 self._push(context[sym.value.lower()])
             elif sym.optype == RpnSymbol.OPERATION:
                 getattr(self, sym.value.lower())()
+            self.__ip += 1
         return self.shead
 
     @property
@@ -112,7 +115,7 @@ class Turmit(object):
             @param val int : value to push
         '''
         self._cur += 1
-        if self._cur >= len(self._stack):
+        if self._cur >= len(self._stack) or abs(self._cur) > len(self._stack):
             self._cur = 0
         self._stack[self._cur] = self._cast_int(val)
 
@@ -233,3 +236,9 @@ class Turmit(object):
             @param a int : value
         '''
         pass
+    
+    @RpnOp
+    def jmp(self, a):
+        ''' @brief Increments IP
+        '''
+        self.__ip += a