rapydscript-ng 0.8.0 → 0.8.1

package/src/output/comments.pyj

@@ -7,13 +7,13 @@ from ast import AST_Exit, is_node_type
 
 def output_comments(comments, output, nlb):
     for comm in comments:
-        if comm.type is "comment1":
-            output.print("//" + comm.value + "\n")
+        if comm.type is 'comment1':
+            output.print('//' + comm.value + '\n')
             output.indent()
-        elif comm.type is "comment2":
-            output.print("/*" + comm.value + "*/")
+        elif comm.type is 'comment2':
+            output.print('/*' + comm.value + '*/')
             if nlb:
-                output.print("\n")
+                output.print('\n')
                 output.indent()
             else:
                 output.space()
@@ -34,11 +34,11 @@ def print_comments(self, output):
                 self.value.start.comments_before = v'[]'
 
             if c.test:
-                comments = comments.filter(def(comment):
+                comments = comments.filter(def (comment):
                     return c.test(comment.value)
                 )
-            elif jstype(c) is "function":
-                comments = comments.filter(def(comment):
+            elif jstype(c) is 'function':
+                comments = comments.filter(def (comment):
                     return c(self, comment)
                 )
 

package/src/output/exceptions.pyj

@@ -7,12 +7,13 @@ from output.statements import print_bracketed
 
 def print_try(self, output):
     else_var_name = None
+
     def update_output_var(output):
         output.indent(), output.assign(else_var_name), output.print('true'), output.end_statement()
     if self.belse:
         else_var_name = output.new_try_else_counter()
         output.assign('var ' + else_var_name), output.print('false'), output.end_statement(), output.indent()
-    output.print("try")
+    output.print('try')
     output.space()
     print_bracketed(self, output, False, None, None, update_output_var if else_var_name else None)
     if self.bcatch:
@@ -28,35 +29,33 @@ def print_try(self, output):
 
 
 def print_catch(self, output):
-    output.print("catch")
+    output.print('catch')
     output.space()
-    output.with_parens(def():
-        output.print("ρσ_Exception")
+    output.with_parens(def ():
+        output.print('ρσ_Exception')
     )
     output.space()
-    output.with_block(def():
+    output.with_block(def ():
         output.indent()
         output.spaced('ρσ_last_exception', '=', 'ρσ_Exception'), output.end_statement()
         output.indent()
         no_default = True
         for i, exception in enumerate(self.body):
             if i:
-                output.print("else ")
-
+                output.print('else ')
             if exception.errors.length:
-                output.print("if")
+                output.print('if')
                 output.space()
-                output.with_parens(def():
+                output.with_parens(def ():
                     for i, err in enumerate(exception.errors):
                         if i:
                             output.newline()
                             output.indent()
-                            output.print("||")
+                            output.print('||')
                             output.space()
-
-                        output.print("ρσ_Exception")
+                        output.print('ρσ_Exception')
                         output.space()
-                        output.print("instanceof")
+                        output.print('instanceof')
                         output.space()
                         if err.name is 'Exception':
                             output.print('Error')
@@ -69,13 +68,13 @@ def print_catch(self, output):
             print_bracketed(exception, output, True)
             output.space()
         if no_default:
-            output.print("else")
+            output.print('else')
             output.space()
-            output.with_block(def():
+            output.with_block(def ():
                 output.indent()
-                output.print("throw")
+                output.print('throw')
                 output.space()
-                output.print("ρσ_Exception")
+                output.print('ρσ_Exception')
                 output.semicolon()
                 output.newline()
             )
@@ -84,13 +83,13 @@ def print_catch(self, output):
 
 
 def print_finally(self, output, belse, else_var_name):
-    output.print("finally")
+    output.print('finally')
     output.space()
     if else_var_name:
-        output.with_block(def():
-            output.indent(), output.print("try")
+        output.with_block(def ():
+            output.indent(), output.print('try')
             output.space()
-            output.with_block(def():
+            output.with_block(def ():
                 print_else(belse, else_var_name, output)
             )
             print_finally(self, output)

package/src/output/functions.pyj

@@ -3,14 +3,15 @@
 from __python__ import hash_literals
 
 from ast import AST_ClassCall, AST_New, has_calls, AST_Dot, AST_SymbolRef, is_node_type
-from output.stream import OutputStream
+from output.operators import print_getattr
 from output.statements import print_bracketed
+from output.stream import OutputStream
 from output.utils import create_doctring
-from output.operators import print_getattr
 
 anonfunc = 'ρσ_anonfunc'
 module_name = 'null'
 
+
 def set_module_name(x):
     nonlocal module_name
     module_name = '"' + x + '"' if x else 'null'
@@ -18,22 +19,25 @@ def set_module_name(x):
 
 # Function definition {{{
 
+
 def decorate(decorators, output, func):
     pos = 0
+
     def wrap():
         nonlocal pos
         if pos < decorators.length:
             decorators[pos].expression.print(output)
             pos += 1
-            output.with_parens(def():
+            output.with_parens(def ():
                 wrap()
             )
         else:
             func()
     wrap()
 
+
 def function_args(argnames, output, strip_first):
-    output.with_parens(def():
+    output.with_parens(def ():
         if argnames and argnames.args.length and (argnames.is_simple_func is True or argnames.is_simple_func is undefined):
             for i, arg in enumerate((argnames.args.slice(1) if strip_first else argnames.args)):
                 if i:
@@ -42,6 +46,7 @@ def function_args(argnames, output, strip_first):
     )
     output.space()
 
+
 def function_preamble(node, output, offset):
     a = node.argnames
     if not a or a.is_simple_func:
@@ -54,7 +59,7 @@ def function_preamble(node, output, offset):
         i = c - offset
         if i >= 0:
             output.indent()
-            output.print("var")
+            output.print('var')
             output.space()
             output.assign(arg)
             if Object.prototype.hasOwnProperty.call(a.defaults, arg.name):
@@ -83,7 +88,7 @@ def function_preamble(node, output, offset):
             for dname in Object.keys(a.defaults):
                 output.indent()
                 output.spaced('if', '(Object.prototype.hasOwnProperty.call(' + kw + ',', '"' + dname + '"))')
-                output.with_block(def():
+                output.with_block(def ():
                     output.indent()
                     output.spaced(dname, '=', kw + '.' + dname)
                     output.end_statement()
@@ -106,6 +111,7 @@ def function_preamble(node, output, offset):
         output.print('.pop()')
         output.end_statement()
 
+
 def has_annotations(self):
     if self.return_annotation:
         return True
@@ -114,13 +120,14 @@ def has_annotations(self):
             return True
     return False
 
+
 def function_annotation(self, output, strip_first, name):
     fname = name or (self.name.name if self.name else anonfunc)
     props = Object.create(None)
 
     # Create __annotations__
     if has_annotations(self):
-        props.__annotations__ = def():
+        props.__annotations__ = def ():
             output.print('{')
             if self.argnames and self.argnames.args.length:
                 for i, arg in enumerate(self.argnames.args):
@@ -139,7 +146,7 @@ def function_annotation(self, output, strip_first, name):
     defaults = self.argnames.defaults
     dkeys = Object.keys(self.argnames.defaults)
     if dkeys.length:
-        props.__defaults__ = def():
+        props.__defaults__ = def ():
             output.print('{')
             for i, k in enumerate(dkeys):
                 output.print(k + ':'), defaults[k].print(output)
@@ -149,12 +156,12 @@ def function_annotation(self, output, strip_first, name):
 
     # Create __handles_kwarg_interpolation__
     if not self.argnames.is_simple_func:
-        props.__handles_kwarg_interpolation__ = def():
+        props.__handles_kwarg_interpolation__ = def ():
             output.print('true')
 
     # Create __argnames__
     if self.argnames.args.length > (1 if strip_first else 0):
-        props.__argnames__ = def():
+        props.__argnames__ = def ():
             output.print('[')
             for i, arg in enumerate(self.argnames.args):
                 if strip_first and i is 0:
@@ -166,10 +173,10 @@ def function_annotation(self, output, strip_first, name):
 
     # Create __doc__
     if output.options.keep_docstrings and self.docstrings and self.docstrings.length:
-        props.__doc__ = def():
+        props.__doc__ = def ():
             output.print(JSON.stringify(create_doctring(self.docstrings)))
 
-    props.__module__ = def():
+    props.__module__ = def ():
         output.print(module_name)
 
     names = Object.keys(props)
@@ -178,7 +185,7 @@ def function_annotation(self, output, strip_first, name):
     # can happen if the function definition is inside a loop, for example.
     output.spaced('if', '(!' + fname + '.' + names[0] + ')', 'Object.defineProperties(' + fname)
     output.comma()
-    output.with_block(def():
+    output.with_block(def ():
         for v'var i = 0; i < names.length; i++':
             name = names[i]
             output.indent(), output.spaced(name, ':', '{value:', ''), props[name](), output.print('}')
@@ -197,14 +204,14 @@ def function_definition(self, output, strip_first, as_expression):
         output.spaced('(function()', '{'), output.newline()
         output.indent(), output.spaced('var', anonfunc, '='), output.space()
     if self.is_async:
-        output.print("async"), output.space()
-    output.print("function"), output.space()
+        output.print('async'), output.space()
+    output.print('function'), output.space()
     if self.name:
         self.name.print(output)
 
     if self.is_generator:
         output.print('()'), output.space()
-        output.with_block(def():
+        output.with_block(def ():
             output.indent()
             output.print('function* js_generator')
             function_args(self.argnames, output, strip_first)
@@ -230,15 +237,16 @@ def function_definition(self, output, strip_first, as_expression):
         function_annotation(self, output, strip_first, anonfunc)
         output.indent(), output.spaced('return', anonfunc), output.end_statement()
         output.set_indentation(orig_indent)
-        output.indent(), output.print("})()")
+        output.indent(), output.print('})()')
+
 
 def print_function(output):
     self = this
     if self.decorators and self.decorators.length:
-        output.print("var")
+        output.print('var')
         output.space()
         output.assign(self.name.name)
-        decorate(self.decorators, output, def():function_definition(self, output, False, True);)
+        decorate(self.decorators, output, def (): function_definition(self, output, False, True);)
         output.end_statement()
     else:
         function_definition(self, output, False)
@@ -249,12 +257,14 @@ def print_function(output):
 
 # Function call {{{
 
+
 def find_this(expression):
     if is_node_type(expression, AST_Dot):
         return expression.expression
     if not is_node_type(expression, AST_SymbolRef):
         return expression
 
+
 def print_this(expression, output):
     obj = find_this(expression)
     if obj:
@@ -262,6 +272,7 @@ def print_this(expression, output):
     else:
         output.print('this')
 
+
 def print_function_call(self, output):
     is_prototype_call = False
 
@@ -271,15 +282,15 @@ def print_function_call(self, output):
             # class methods are called through the prototype unless static
             if self.static:
                 self.class.print(output)
-                output.print(".")
+                output.print('.')
                 output.print(self.method)
             else:
                 is_prototype_call = True
                 self.class.print(output)
-                output.print(".prototype.")
+                output.print('.prototype.')
                 output.print(self.method)
                 if not no_call:
-                    output.print(".call")
+                    output.print('.call')
         else:
             if not is_repeatable:
                 output.print('ρσ_expr_temp')
@@ -341,7 +352,7 @@ def print_function_call(self, output):
                 output.print('[')
                 while i < pargs.length and not pargs[i].is_array:
                     pargs[i].value.print(output)
-                    if i + 1 < pargs.length and not pargs[i+1].is_array:
+                    if i + 1 < pargs.length and not pargs[i + 1].is_array:
                         output.print(',')
                         output.space()
                     i += 1
@@ -358,14 +369,14 @@ def print_function_call(self, output):
     if is_new and not self.args.args.length and not has_kwargs and not self.args.starargs:
         output.print('new'), output.space()
         print_function_name()
-        return # new A is the same as new A() in javascript
+        return  # new A is the same as new A() in javascript
 
     if not has_kwargs and not self.args.starargs:
         # A simple function call, do nothing special
         if is_new:
             output.print('new'), output.space()
         print_function_name()
-        output.with_parens(def():
+        output.with_parens(def ():
             for i, a in enumerate(self.args.args):
                 if i:
                     output.comma()
@@ -412,4 +423,4 @@ def print_function_call(self, output):
     output.print(')')
     if not is_repeatable:
         output.print(')')
-# }}}
+        # }}}

package/src/output/literals.pyj

@@ -4,8 +4,9 @@ from __python__ import hash_literals
 
 from ast import AST_Binary, is_node_type
 
+
 def print_array(self, output):
-    output.with_square(def():
+    output.with_square(def ():
         a = self.elements
         len_ = a.length
         if len_ > 0:
@@ -20,9 +21,9 @@ def print_array(self, output):
 
 
 def print_obj_literal(self, output):
-    output.with_parens(def():
+    output.with_parens(def ():
         output.print('function()')
-        output.with_block(def():
+        output.with_block(def ():
             output.indent()
             if self.is_pydict:
                 output.spaced.apply(output, 'var ρσ_d = ρσ_dict()'.split(' '))
@@ -33,14 +34,14 @@ def print_obj_literal(self, output):
                 output.indent()
                 if self.is_pydict:
                     output.print('ρσ_d.set')
-                    output.with_parens(def():
+                    output.with_parens(def ():
                         prop.key.print(output)
                         output.print(','), output.space()
                         prop.value.print(output)
                     )
                 else:
                     output.print('ρσ_d')
-                    output.with_square(def():prop.key.print(output);)
+                    output.with_square(def (): prop.key.print(output);)
                     output.space(), output.print('='), output.space()
                     prop.value.print(output)
                 output.end_statement()
@@ -51,6 +52,7 @@ def print_obj_literal(self, output):
     )
     output.print('.call(this)')
 
+
 def print_object(self, output):
     if self.is_pydict:
         if self.properties.length > 0:
@@ -61,22 +63,23 @@ def print_object(self, output):
         if self.properties.length > 0:
             print_obj_literal(self, output)
         else:
-            output.print("Object.create(null)" if self.is_jshash else '{}')
+            output.print('Object.create(null)' if self.is_jshash else '{}')
+
 
 def print_set(self, output):
     if self.items.length is 0:
         output.print('ρσ_set()')
         return
-    output.with_parens(def():
+    output.with_parens(def ():
         output.print('function()')
-        output.with_block(def():
+        output.with_block(def ():
             output.indent()
             output.spaced.apply(output, 'var s = ρσ_set()'.split(' '))
             output.end_statement()
             for item in self.items:
                 output.indent()
                 output.print('s.jsset.add')
-                output.with_parens(def():item.value.print(output);)
+                output.with_parens(def (): item.value.print(output);)
                 output.end_statement()
             output.indent()
             output.spaced('return', 's')
@@ -85,6 +88,7 @@ def print_set(self, output):
     )
     output.print('()')
 
+
 def print_regexp(self, output):
     str_ = self.value.toString()
     if output.options.ascii_only:
@@ -92,4 +96,4 @@ def print_regexp(self, output):
     output.print(str_)
     p = output.parent()
     if is_node_type(p, AST_Binary) and /^in/.test(p.operator) and p.left is self:
-        output.print(" ")
+        output.print(' ')