Fix unary and pow

Author: alehander92

CHANGELOG.md

@@ -0,0 +1,9 @@
+0.2.22  
+    
+    17.03.2016
+
+    Fixes:
+
+        * Fix unary op handling
+        * Convert ** to `math:pow`
+

README.md

@@ -7,7 +7,7 @@ A restricted Python to idiomatic JavaScript / Ruby / Go / C# translator
 
 [Pseudo](https://github.com/alehander42/pseudo) is a framework for high level code generation: it is used by this compiler to translate a subset of Python to all Pseudo-supported languages
 
-**If you are using Python3.5 and you experience problems with an already installed version of pseudo-python, please upgrade it to `0.2.20` (`pip3 install pseudo-python --upgrade`)**
+**If you are using Python3.5 and you experience problems with an already installed version of pseudo-python, please upgrade it to `0.2.22` (`pip3 install pseudo-python --upgrade`)**
 
 
 

VERSION

@@ -1 +1 @@
-0.2.20
+0.2.22

pseudo_python/api_translator.py

@@ -102,7 +102,9 @@ def len_expander(type, message, args):
 
         'sin':      StandardCall('math', 'sin'),
         'cos':      StandardCall('math', 'cos'),
-        'tan':      StandardCall('math', 'tan')
+        'tan':      StandardCall('math', 'tan'),
+        'pow':      lambda left, right, pseudo_type: Node('binary_op',
+                        op='**', left=left, right=right, pseudo_type=pseudo_type)
     },
 
     're': {

pseudo_python/ast_translator.py

@@ -729,13 +729,22 @@ def _translate_binop(self, op, left, right, location):
         left_node, right_node = self._translate_node(left), self._translate_node(right)
         binop_type = TYPED_API['operators'][op](left_node['pseudo_type'], right_node['pseudo_type'])[-1]
         if binop_type == 'Float' or binop_type == 'Int':
-            return {
-                'type': 'binary_op',
-                'op': op,
-                'left': left_node,
-                'right': right_node,
-                'pseudo_type': binop_type
-            }
+            if op == '**': # math:pow(left, right)
+                return {
+                    'type': 'standard_call',
+                    'namespace': 'math',
+                    'args': [left_node, right_node],
+                    'pseudo_type': binop_type,
+                    'function': 'pow'
+                }
+            else:
+                return {
+                    'type': 'binary_op',
+                    'op': op,
+                    'left': left_node,
+                    'right': right_node,
+                    'pseudo_type': binop_type
+                }
         else:
             if left_node['pseudo_type'] == 'String' and op == '%':
                 if left_node['type'] != 'string':
@@ -814,20 +823,20 @@ def _translate_unaryop(self, operand, op, location):
         value = operand
         if isinstance(op, ast.USub):
             value_node = self._translate_node(value)
-            if value_node.pseudo_type != 'Int' and value_node.pseudo_type != 'Float':
+            if value_node['pseudo_type'] != 'Int' and value_node['pseudo_type'] != 'Float':
                 raise type_check_error('- expects Int or Float',
                     location, self.lines[location[0]],
-                    wrong_type=value_node.pseudo_type)
+                    wrong_type=value_node['pseudo_type'])
             return {
                 'type': 'unary_op',
                 'op': '-',
                 'value': value_node,
-                'pseudo_type': value_node.pseudo_type
+                'pseudo_type': value_node['pseudo_type']
             }
         elif isinstance(op, ast.Not):
             value_node = self._testable(self._translate_node(value))
-            if value_node.type == 'standard_method_call' and value_node.message == 'present?':
-                value_node.message = 'empty?'
+            if value_node['type'] == 'standard_method_call' and value_node['message'] == 'present?':
+                value_node['message'] = 'empty?'
                 return value_node
             else:
                 return {

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='pseudo-python',
-    version='0.2.20',
+    version='0.2.22',
     description='a python3 to pseudo compiler',
     author='Alexander Ivanov',
     author_email='alehander42@gmail.com',