Add support for filter and map, fix #3

alehander92 · alehander92 · commit f2a45d517785 · 2016-03-14T17:01:27.000+02:00
diff --git a/README.md b/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.16` (`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.18` (`pip3 install pseudo-python --upgrade`)**
 
 
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.16
+0.2.18
diff --git a/pseudo_python/api_translator.py b/pseudo_python/api_translator.py
@@ -134,7 +134,9 @@ def len_expander(type, message, args):
             2:      StandardMethodCall('List', 'insert_at')
         },
         'remove':   StandardMethodCall('List', 'remove'),
-        'extend':   StandardMethodCall('List', 'push_many')
+        'extend':   StandardMethodCall('List', 'push_many'),
+        'map':      StandardMethodCall('List', 'map'),
+        'filter':   StandardMethodCall('List', 'filter')
     },
 
     'Dictionary': {
diff --git a/pseudo_python/ast_translator.py b/pseudo_python/ast_translator.py
@@ -34,6 +34,8 @@
 
 BUILTIN_FUNCTIONS = {'print', 'input', 'str', 'int', 'len', 'any', 'all', 'sum'}
 
+FORBIDDEN_TOP_LEVEL_FUNCTIONS = {'map', 'filter'}
+
 ITERABLE_TYPES = {'String', 'List', 'Dictionary', 'Set', 'Array'}
 
 TESTABLE_TYPE = 'Boolean'
@@ -353,7 +355,62 @@ def _translate_call(self, func, args, keywords, starargs=None, kwargs=None, loca
                 args.append(arg)
 
 
-        if isinstance(func, ast.Name) and func.id in BUILTIN_FUNCTIONS:
+
+        if isinstance(func, ast.Name) and func.id in FORBIDDEN_TOP_LEVEL_FUNCTIONS:
+            raise translation_error('%s  supported only as list(%s)' % (func.id, func.id),
+                location, self.lines[location[0]])
+        elif isinstance(func, ast.Name) and func.id == 'list':
+            if len(args) != 1 or not isinstance(args[0], ast.Call) or not isinstance(args[0].func, ast.Name) or args[0].func.id not in FORBIDDEN_TOP_LEVEL_FUNCTIONS:
+                raise translation_error('list currently not supported',
+                    location, self.lines[location[0]],
+                    suggestions='list is currently only supported for list(filter)')
+            if len(args[0].args) != 2:
+                raise type_check_error('%s expects 2 arg, received %d args' % (args[0].func.id, len(args[0].args)),
+                    location, self.lines[location[0]])
+            receiver_node = self._translate_node(args[0].args[1])
+            if self._general_type(receiver_node['pseudo_type']) != 'List':
+                raise type_check_error('#%s currently works only' % args[0].func.id,
+                    location, self.lines[location[0]],
+                    wrong_type=receiver_node['pseudo_type'])
+
+
+            if isinstance(args[0].args[0], ast.Lambda):
+                if len(args[0].args[0].args.args) != 1:
+                    raise translation_error('lambda expected 1 arg, received %d' % len(args[0].args[0].args.args),
+                        location, self.lines[location[0]])
+
+                arg_nodes = [self._translate_functional_lambda(args[0].args[0], receiver_node['pseudo_type'][1])]
+            else:
+                arg_nodes = [self._translate_node(args[0].args.args[0], in_call=True)]
+
+            if args[0].func.id == 'map':
+                return_type = ['List', arg_nodes[0]['pseudo_type'][-1]]
+            else:
+                if arg_nodes[0]['pseudo_type'][-1] != 'Boolean':
+                    l = {'type': 'local', 'name': args[0].args[0].args.args[0].arg, 'pseudo_type': arg_nodes['pseudo_type'][-1]}
+                    arg_nodes[0] = {
+                        'type': 'anonymous_function',
+                        'pseudo_type': ['Function', arg_nodes['pseudo_type'][-1], 'Boolean'],
+                        'return_type': 'Boolean',
+                        'params': [l],
+                        'block': [self._testable({
+                            'type': 'call',
+                            'function': arg_nodes[0],
+                            'args': [l],
+                            'pseudo_type': arg_nodes[0]['pseudo_type'][-1]
+                        })]
+                    }
+        
+                return_type = ['List', 'Boolean']
+            return {
+                'type': 'standard_method_call',
+                'receiver': receiver_node,
+                'message': args[0].func.id,
+                'args': arg_nodes,
+                'pseudo_type': return_type
+            }
+
+        elif isinstance(func, ast.Name) and func.id in BUILTIN_FUNCTIONS:
             if func.id in ['any', 'all', 'sum']:
                 if len(args) != 1:
                     raise translation_error('%s expected 1 arg, not %d' % (func.id, len(args)),
@@ -527,13 +584,8 @@ def _translate_builtin_call(self, namespace, function, args, location):
                 'pseudo-python doesn\'t support %s %s' % (namespace, function),
                 location, self.lines[location[0]],
                 suggestions='pseudo-python supports those %s functions\n  %s' % (
-                    namespace, '\n'.join(
-                        '  %s %s -> %s' % (
-                            name,
-                            ' '.join(serialize_type(arg) for arg in t[:-1]),
-                            serialize_type(t[-1]))
-                        for name, t in TYPED_API['_%s' % namespace].items()).strip()))
-
+                    namespace,
+                    prepare_table(TYPED_API[namespace], ORIGINAL_METHODS.get(namespace)).strip()))
 
 
         if not isinstance(api, dict):
@@ -1405,6 +1457,30 @@ def _translate_nameconstant(self, value, location):
         elif value is None:
             return {'type': 'null', 'pseudo_type': 'Void'}
 
+    def _translate_functional_lambda(self, l, arg_type):
+
+        params = [{'type': 'local', 'name': l.args.args[0].arg, 'pseudo_type': arg_type}]
+        self.type_env = self.type_env.child_env({l.args.args[0].arg: arg_type})
+        old_f, self.function_name = self.function_name, 'lambda'
+        node = self._translate_node(l.body)
+        nodes = [{
+            'type': 'implicit_return',
+            'pseudo_type': node['pseudo_type'],
+            'value': node
+        }]
+        self.function_name = old_f
+        self.type_env = self.type_env.parent
+        return {
+            'type': 'anonymous_function',
+            'params': params,
+            'block': nodes,
+            'pseudo_type': ['Function', arg_type, node['pseudo_type']],
+            'return_type': node['pseudo_type']
+        }
+
+    def _translate_lambda(self, body, args, location):
+        raise
+
     def _translate_listcomp(self, generators, elt, location):
         if isinstance(generators[0].target, ast.Name):
             sketchup, env = self._translate_iter(generators[0].target, generators[0].iter)
@@ -1427,7 +1503,7 @@ def _translate_listcomp(self, generators, elt, location):
                     'args': [{
                         'type': 'anonymous_function',
                         'params': [sketchup['iterators']['iterator']],
-                        'pseudo_type': ['Function', sketchup['iterators']['iterator']['pseudo_type'], 
+                        'pseudo_type': ['Function', sketchup['iterators']['iterator']['pseudo_type'],
                                         elt['pseudo_type']],
                         'return_type': elt['pseudo_type'],
                         'block': [{
diff --git a/pseudo_python/builtin_typed_api.py b/pseudo_python/builtin_typed_api.py
@@ -160,7 +160,6 @@ def xor_(l, r):
     # methods
     'global': {
         'exit':  ['Int', 'Void'],
-        'wat':   ['Int'],
         'to_string': ['Any', 'String']
     },
 
@@ -211,7 +210,9 @@ def xor_(l, r):
         'push_many':  [['List', '@t'], 'Void'],
         'remove':     ['@t', 'Void'],
         'length':     ['Int'],
-        'join':       [['List', 'String'], 'String']
+        'join':       [['List', 'String'], 'String'],
+        'map':        [['Function', '@t', '@y'], ['List', '@y']],
+        'filter':     [['Function', '@t', 'Boolean'], ['List', '@t']]
     },
 
     'Dictionary': {
@@ -293,7 +294,8 @@ def xor_(l, r):
         'push_many':  'extend(other)',
         'remove':     'remove',
         'length':     'len',
-        'map':        'list comprehension / map'
+        'map':        'list comprehension / map',
+        'filter':     'list comprehension / filter'
     },
 
     'Dictionary': {
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='pseudo-python',
-    version='0.2.16',
+    version='0.2.18',
     description='a python3 to pseudo compiler',
     author='Alexander Ivanov',
     author_email='alehander42@gmail.com',

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ A restricted Python to idiomatic JavaScript / Ruby / Go / C# translator`
`7`	`7`
`8`	`8`	`[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`
`9`	`9`
`10`		-If you are using Python3.5 and you experience problems with an already installed version of pseudo-python, please upgrade it to `0.2.16` (`pip3 install pseudo-python --upgrade`)
	`10`	+If you are using Python3.5 and you experience problems with an already installed version of pseudo-python, please upgrade it to `0.2.18` (`pip3 install pseudo-python --upgrade`)
`11`	`11`
`12`	`12`
`13`	`13`