rapydscript-ng 0.8.2 → 0.8.4

package/src/lib/traceback.pyj

@@ -78,10 +78,17 @@ def _decode_source_map(smap):
                     prev_src_line = src_line
                     src_col = prev_src_col + fields[3]
                     prev_src_col = src_col
-                    src_file = sources[src_idx] if src_idx >= 0 and src_idx < sources.length else ''
+                    src_file = (
+                        sources[src_idx]
+                        if src_idx >= 0 and src_idx < sources.length
+                        else ''
+                    )
                     if source_root and src_file:
                         src_file = source_root + src_file
-                    line_entries.push({'gen_col': gen_col, 'src_file': src_file, 'src_line': src_line, 'src_col': src_col})
+                    line_entries.push({
+                        'gen_col': gen_col, 'src_file': src_file,
+                        'src_line': src_line, 'src_col': src_col
+                    })
                 elif fields.length >= 1:
                     prev_col += fields[0]
         decoded.push(line_entries)
@@ -106,21 +113,37 @@ def _parse_stack_frame(line):
     # Chrome/Node: "    at functionName (file:line:col)"
     m = /^\s*at\s+(.*?)\s+\((.+):(\d+):(\d+)\)/.exec(line)
     if m:
-        return {'func': m[1] or None, 'file': m[2], 'line': parseInt(m[3], 10) - 1, 'col': parseInt(m[4], 10) - 1}
+        return {
+            'func': m[1] or None,
+            'file': m[2],
+            'line': parseInt(m[3], 10) - 1,
+            'col': parseInt(m[4], 10) - 1,
+        }
     # Chrome/Node: "    at file:line:col"
     m = /^\s*at (.+):(\d+):(\d+)$/.exec(line)
     if m:
-        return {'func': None, 'file': m[1], 'line': parseInt(m[2], 10) - 1, 'col': parseInt(m[3], 10) - 1}
+        return {
+            'func': None,
+            'file': m[1],
+            'line': parseInt(m[2], 10) - 1,
+            'col': parseInt(m[3], 10) - 1,
+        }
     # Firefox: "functionName@file:line:col"
     m = /^(.*?)@(.+):(\d+):(\d+)$/.exec(line)
     if m:
-        return {'func': m[1] or None, 'file': m[2], 'line': parseInt(m[3], 10) - 1, 'col': parseInt(m[4], 10) - 1}
+        return {
+            'func': m[1] or None,
+            'file': m[2],
+            'line': parseInt(m[3], 10) - 1,
+            'col': parseInt(m[4], 10) - 1,
+        }
     return None
 
 
 def _get_decoded_map():
     if _traceback_state['decoded'] is None and _traceback_state['source_map']:
-        _traceback_state['decoded'] = _decode_source_map(_traceback_state['source_map'])
+        _traceback_state['decoded'] = _decode_source_map(
+            _traceback_state['source_map'])
     return _traceback_state['decoded']
 
 
@@ -131,7 +154,8 @@ def _get_internal_traceback(err):
     for i, line in enumerate(lines):
         if i > 0:
             line = line.trim()
-            if line.startsWith('at new ' + err.name) or line.startsWith(err.name + '@'):
+            if (line.startsWith('at new ' + err.name) or
+                    line.startsWith(err.name + '@')):
                 # this is the constructor for a RapydScript Exception
                 start_line_idx = i + 1
                 break
@@ -140,7 +164,10 @@ def _get_internal_traceback(err):
         for i, xline in enumerate(lines):
             if i > 0:
                 line = xline.trim()
-                if v"line.startsWith('at ') || line.includes('@') || /:\d+:\d+$/.test(line)":
+                if (
+                    v"line.startsWith('at ') || line.includes('@')" or
+                    v"/:\d+:\d+$/.test(line)"
+                ):
                     start_line_idx = i
                     break
     frame_lines = lines[start_line_idx:]
@@ -153,7 +180,11 @@ def _get_internal_traceback(err):
             if frame:
                 mapping = _find_mapping(decoded, frame.line, frame.col)
                 if mapping:
-                    loc = '  File "' + mapping.src_file + '", line ' + (mapping.src_line + 1) + ', col ' + (mapping.src_col + 1)
+                    loc = (
+                        '  File "' + mapping.src_file + '", line ' +
+                        (mapping.src_line + 1) + ', col ' +
+                        (mapping.src_col + 1)
+                    )
                     if frame.func:
                         loc += ', in ' + frame.func
                     mapped_lines.push(loc)
@@ -177,7 +208,8 @@ def format_exception(exc, limit):
         js_lines.push(e)
         js_lines = v"['Traceback (most recent call last):'].concat(js_lines)"
         if rs_lines.length > 0:
-            js_lines = js_lines.concat(['', 'Mapped Traceback (RapydScript):']).concat(rs_lines)
+            js_lines = js_lines.concat(
+                ['', 'Mapped Traceback (RapydScript):']).concat(rs_lines)
         return [l + '\n' for l in js_lines]
     return [exc.toString()]
 

package/src/lib/uuid.pyj

@@ -29,7 +29,8 @@ def uuid4_bytes():
 
 def as_str():
     h = this.hex
-    return h[:8] + '-' + h[8:12] + '-' + h[12:16] + '-' + h[16:20] + '-' + h[20:]
+    return (h[:8] + '-' + h[8:12] + '-' + h[12:16] +
+            '-' + h[16:20] + '-' + h[20:])
 
 
 def uuid4():

package/src/output/classes.pyj

@@ -34,13 +34,16 @@ def print_class(output):
 
         # decorate the method
         if stmt.decorators and stmt.decorators.length:
-            decorate(stmt.decorators, output, def (): function_definition(stmt, output, strip_first, True);)
+            decorate(
+                stmt.decorators, output,
+                def (): function_definition(stmt, output, strip_first, True);)
             output.end_statement()
         else:
             function_definition(stmt, output, strip_first)
             if not is_property:
                 output.end_statement()
-                fname = self.name.name + ('.' if is_static else '.prototype.') + name
+                fname = (self.name.name +
+                         ('.' if is_static else '.prototype.') + name)
                 function_annotation(stmt, output, strip_first, fname)
 
     def define_default_method(name, body):
@@ -51,8 +54,12 @@ def print_class(output):
 
     def add_hidden_property(name, proceed):
         output.indent(), output.print('Object.defineProperty(')
-        self.name.print(output), output.print('.prototype'), output.comma(), output.print(JSON.stringify(name)), output.comma()
-        output.spaced('{value:', ''), proceed(), output.print('})'), output.end_statement()
+        self.name.print(output), output.print('.prototype')
+        output.comma(), output.print(JSON.stringify(name)), output.comma()
+        output.spaced(
+            '{value:',
+            ''
+        ), proceed(), output.print('})'), output.end_statement()
 
     # generate constructor
     def write_constructor():
@@ -64,15 +71,22 @@ def print_class(output):
 
         output.with_block(def ():
             output.indent()
-            output.spaced('if', '(this.ρσ_object_id', '===', 'undefined)', 'Object.defineProperty(this,', '"ρσ_object_id",', '{"value":++ρσ_object_counter})')
+            output.spaced(
+                'if', '(this.ρσ_object_id',
+                '===', 'undefined)',
+                'Object.defineProperty(this,',
+                '"ρσ_object_id",',
+                '{"value":++ρσ_object_counter})')
             output.end_statement()
             if self.bound.length:
                 output.indent()
-                self.name.print(output), output.print('.prototype.__bind_methods__.call(this)')
+                self.name.print(output)
+                output.print('.prototype.__bind_methods__.call(this)')
                 output.end_statement()
             output.indent()
             self.name.print(output)
-            output.print('.prototype.__init__.apply(this'), output.comma(), output.print('arguments)')
+            output.print('.prototype.__init__.apply(this')
+            output.comma(), output.print('arguments)')
             output.end_statement()
         )
 
@@ -116,15 +130,18 @@ def print_class(output):
                 if self.bases.length:
                     for v'var i = self.bases.length - 1; i >= 0; i--':
                         base = self.bases[i]
-                        output.indent(), base.print(output), output.spaced('.prototype.__bind_methods__', '&&', '')
-                        base.print(output), output.print('.prototype.__bind_methods__.call(this)')
+                        output.indent(), base.print(output)
+                        output.spaced('.prototype.__bind_methods__', '&&', '')
+                        base.print(output)
+                        output.print('.prototype.__bind_methods__.call(this)')
                         output.end_statement()
                 for bname in self.bound:
                     if seen_methods[bname] or self.dynamic_properties[bname]:
                         continue
                     seen_methods[bname] = True
                     output.indent(), output.assign('this.' + bname)
-                    self.name.print(output), output.print('.prototype.' + bname + '.bind(this)')
+                    self.name.print(output)
+                    output.print('.prototype.' + bname + '.bind(this)')
                     output.end_statement()
             )
         )
@@ -135,20 +152,32 @@ def print_class(output):
         output.indent()
         output.print('Object.defineProperties')
         output.with_parens(def ():
-            self.name.print(output), output.print('.prototype'), output.comma(), output.space(), output.with_block(def ():
+            self.name.print(output), output.print('.prototype')
+            output.comma(), output.space()
+            output.with_block(def ():
                 for name in property_names:
                     prop = self.dynamic_properties[name]
-                    output.indent(), output.print(JSON.stringify(name) + ':'), output.space()
+                    output.indent()
+                    output.print(JSON.stringify(name) + ':'), output.space()
                     output.with_block(def ():
-                        output.indent(), output.print('"enumerable":'), output.space(), output.print('true'), output.comma(), output.newline()
+                        output.indent()
+                        output.print('"enumerable":'), output.space()
+                        output.print('true'), output.comma(), output.newline()
                         if prop.getter:
-                            output.indent(), output.print('"get":'), output.space()
-                            define_method(prop.getter, True), output.comma(), output.newline()
+                            output.indent()
+                            output.print('"get":'), output.space()
+                            define_method(prop.getter, True)
+                            output.comma(), output.newline()
                         output.indent(), output.print('"set":'), output.space()
                         if prop.setter:
                             define_method(prop.setter, True), output.newline()
                         else:
-                            output.spaced('function', '()', '{', '''throw new AttributeError("can't set attribute")''', '}'), output.newline()
+                            output.spaced(
+                                'function', '()', '{',
+                                '''throw new AttributeError''' +
+                                '''("can't set attribute")''',
+                                '}')
+                            output.newline()
                     )
                     output.comma(), output.newline()
             )
@@ -182,10 +211,17 @@ def print_class(output):
             defined_methods[stmt.name.name] = True
             sname = stmt.name.name
             if sname is '__init__':
-                # Copy argument handling data so that kwarg interpolation works when calling the constructor
-                for attr in ['.__argnames__', '.__handles_kwarg_interpolation__']:
-                    output.indent(), self.name.print(output), output.assign(attr)
-                    self.name.print(output), output.print('.prototype.__init__' + attr), output.end_statement()
+                # Copy argument handling data so that kwarg interpolation
+                # works when calling the constructor
+                for attr in [
+                    '.__argnames__',
+                    '.__handles_kwarg_interpolation__',
+                ]:
+                    output.indent()
+                    self.name.print(output), output.assign(attr)
+                    self.name.print(output)
+                    output.print('.prototype.__init__' + attr)
+                    output.end_statement()
             if sname is '__iter__':
                 class_def('ρσ_iterator_symbol', True)
                 self.name.print(output)
@@ -198,9 +234,14 @@ def print_class(output):
     if not defined_methods['__repr__']:
         define_default_method('__repr__', def ():
             if self.parent:
-                output.print('if('), self.parent.print(output), output.spaced('.prototype.__repr__)', 'return', self.parent)
-                output.print('.prototype.__repr__.call(this)'), output.end_statement()
-            output.indent(), output.spaced('return', '"<"', '+', '__name__', '+', '"."', '+', 'this.constructor.name', '')
+                output.print('if('), self.parent.print(output)
+                output.spaced('.prototype.__repr__)', 'return', self.parent)
+                output.print('.prototype.__repr__.call(this)')
+                output.end_statement()
+            output.indent()
+            output.spaced(
+                'return', '"<"', '+', '__name__', '+',
+                '"."', '+', 'this.constructor.name', '')
             output.spaced('+', '" #"', '+', 'this.ρσ_object_id', '+', '">"')
             output.end_statement()
         )
@@ -208,8 +249,10 @@ def print_class(output):
     if not defined_methods['__str__']:
         define_default_method('__str__', def ():
             if self.parent:
-                output.print('if('), self.parent.print(output), output.spaced('.prototype.__str__)', 'return', self.parent)
-                output.print('.prototype.__str__.call(this)'), output.end_statement()
+                output.print('if('), self.parent.print(output)
+                output.spaced('.prototype.__str__)', 'return', self.parent)
+                output.print('.prototype.__str__.call(this)')
+                output.end_statement()
             output.spaced('return', 'this.__repr__()')
             output.end_statement()
         )
@@ -234,7 +277,8 @@ def print_class(output):
         output.print(')'), output.end_statement()
 
     # Docstring
-    if self.docstrings and self.docstrings.length and output.options.keep_docstrings:
+    if (self.docstrings and self.docstrings.length
+            and output.options.keep_docstrings):
         add_hidden_property('__doc__', def ():
             output.print(JSON.stringify(create_doctring(self.docstrings)))
         )

package/src/output/codegen.pyj

@@ -3,32 +3,94 @@
 from __python__ import hash_literals
 
 from ast import (
-    AST_Array, AST_Assign, AST_BaseCall, AST_Binary, AST_BlockStatement, AST_Break,
-    AST_Class, AST_Conditional, AST_Constant, AST_Continue,
-    AST_Debugger, AST_Definitions, AST_Directive, AST_Do, AST_Dot, is_node_type,
-    AST_EmptyStatement, AST_Exit, AST_ExpressiveObject, AST_ForIn,
-    AST_ForJS, AST_Function, AST_Hole, AST_If, AST_Imports, AST_Infinity,
-    AST_Lambda, AST_ListComprehension, AST_LoopControl, AST_NaN, AST_New, AST_Node,
-    AST_Number, AST_Object, AST_ObjectKeyVal, AST_ObjectProperty, AST_PropAccess,
-    AST_RegExp, AST_Return, AST_Set, AST_Seq, AST_SimpleStatement, AST_Splice,
-    AST_Statement, AST_StatementWithBody, AST_String, AST_Sub, AST_ItemAccess,
-    AST_Symbol, AST_This, AST_Throw, AST_Toplevel, AST_Try, AST_Unary,
-    AST_UnaryPrefix, AST_Undefined, AST_Var, AST_VarDef, AST_Assert,
-    AST_Verbatim, AST_While, AST_With, AST_Yield, AST_Await, TreeWalker, AST_Existential
+    AST_Array,
+    AST_Assign,
+    AST_BaseCall,
+    AST_Binary,
+    AST_BlockStatement,
+    AST_Break,
+    AST_Class,
+    AST_Conditional,
+    AST_Constant,
+    AST_Continue,
+    AST_Debugger,
+    AST_Definitions,
+    AST_Directive,
+    AST_Do,
+    AST_Dot,
+    is_node_type,
+    AST_EmptyStatement,
+    AST_Exit,
+    AST_ExpressiveObject,
+    AST_ForIn,
+    AST_ForJS,
+    AST_Function,
+    AST_Hole,
+    AST_If,
+    AST_Imports,
+    AST_Infinity,
+    AST_Lambda,
+    AST_ListComprehension,
+    AST_LoopControl,
+    AST_NaN,
+    AST_New,
+    AST_Node,
+    AST_Number,
+    AST_Object,
+    AST_ObjectKeyVal,
+    AST_ObjectProperty,
+    AST_PropAccess,
+    AST_RegExp,
+    AST_Return,
+    AST_Set,
+    AST_Seq,
+    AST_SimpleStatement,
+    AST_Splice,
+    AST_Statement,
+    AST_StatementWithBody,
+    AST_String,
+    AST_Sub,
+    AST_ItemAccess,
+    AST_Symbol,
+    AST_This,
+    AST_Throw,
+    AST_Toplevel,
+    AST_Try,
+    AST_Unary,
+    AST_UnaryPrefix,
+    AST_Undefined,
+    AST_Var,
+    AST_VarDef,
+    AST_Assert,
+    AST_Verbatim,
+    AST_While,
+    AST_With,
+    AST_Yield,
+    AST_Await,
+    TreeWalker,
+    AST_Existential
 )
 from output.classes import print_class
 from output.comments import print_comments
 from output.exceptions import print_try
 from output.functions import print_function, print_function_call
-from output.literals import print_array, print_obj_literal, print_object, print_set, print_regexp
-from output.loops import print_do_loop, print_while_loop, print_for_loop_body, print_for_in, print_list_comprehension
+from output.literals import (
+    print_array, print_obj_literal, print_object, print_set, print_regexp
+)
+from output.loops import (
+    print_do_loop, print_while_loop, print_for_loop_body, print_for_in,
+    print_list_comprehension
+)
 from output.modules import print_top_level, print_imports
 from output.operators import (
     print_getattr, print_getitem, print_rich_getitem, print_splice_assignment,
     print_unary_prefix, print_binary_op, print_assign,
     print_conditional, print_seq, print_existential
 )
-from output.statements import print_bracketed, first_in_statement, force_statement, print_with, print_assert
+from output.statements import (
+    print_bracketed, first_in_statement, force_statement,
+    print_with, print_assert
+)
 from output.utils import make_block, make_num
 from parse import PRECEDENCE
 from utils import noop
@@ -85,7 +147,11 @@ def generate_code():
     )
     PARENS(AST_Seq, def (output):
         p = output.parent()
-        return is_node_type(p, AST_Unary) or is_node_type(p, AST_VarDef) or is_node_type(p, AST_Dot) or is_node_type(p, AST_ObjectProperty) or is_node_type(p, AST_Conditional)
+        return (
+            is_node_type(p, AST_Unary) or is_node_type(p, AST_VarDef) or
+            is_node_type(p, AST_Dot) or is_node_type(p, AST_ObjectProperty) or
+            is_node_type(p, AST_Conditional)
+        )
     )
     PARENS(AST_Binary, def (output):
         p = output.parent()
@@ -104,7 +170,9 @@ def generate_code():
             pp = PRECEDENCE[po]
             so = this.operator
             sp = PRECEDENCE[so]
-            if pp > sp or pp is sp and this is p.right and not (so is po and (so is '*' or so is '&&' or so is '||')):
+            if (pp > sp or pp is sp and this is p.right and
+                    not (so is po and (so is '*' or so is '&&' or
+                                       so is '||'))):
                 return True
     )
     PARENS(AST_PropAccess, def (output):
@@ -132,13 +200,16 @@ def generate_code():
     )
     PARENS(AST_New, def (output):
         p = output.parent()
-        if this.args.args.length is 0 and (is_node_type(p, AST_PropAccess) or is_node_type(p, AST_BaseCall) and p.expression is this):
+        if (this.args.args.length is 0 and
+                (is_node_type(p, AST_PropAccess) or
+                 is_node_type(p, AST_BaseCall) and p.expression is this)):
             # (new foo)(bar)
             return True
     )
     PARENS(AST_Number, def (output):
         p = output.parent()
-        if this.value < 0 and is_node_type(p, AST_PropAccess) and p.expression is this:
+        if (this.value < 0 and
+                is_node_type(p, AST_PropAccess) and p.expression is this):
             return True
     )
     PARENS(AST_NaN, def (output):
@@ -437,7 +508,8 @@ def generate_code():
 
     DEFPRINT(AST_Symbol, def (self, output):
         def_ = self.definition()
-        output.print_name((def_.mangled_name or def_.name) if def_ else self.name)
+        output.print_name(
+            (def_.mangled_name or def_.name) if def_ else self.name)
     )
     DEFPRINT(AST_Undefined, def (self, output):
         output.print('void 0')

package/src/output/comments.pyj

@@ -26,11 +26,18 @@ def print_comments(self, output):
         if start and not start._comments_dumped:
             start._comments_dumped = True
             comments = start.comments_before
-            # XXX: ugly fix for https://github.com/mishoo/RapydScript2/issues/112
-            #      if this node is `return` or `throw`, we cannot allow comments before
+            # XXX: ugly fix for
+            # https://github.com/mishoo/RapydScript2/issues/112
+            #      if this node is `return` or `throw`, we cannot
+            #      allow comments before
             #      the returned or thrown value.
-            if is_node_type(self, AST_Exit) and self.value and self.value.start.comments_before and self.value.start.comments_before.length > 0:
-                comments = (comments or v'[]').concat(self.value.start.comments_before)
+            if is_node_type(
+                self,
+                AST_Exit
+            ) and self.value and self.value.start.comments_before and (
+                    self.value.start.comments_before.length > 0):
+                comments = (comments or v'[]').concat(
+                    self.value.start.comments_before)
                 self.value.start.comments_before = v'[]'
 
             if c.test:

package/src/output/exceptions.pyj

@@ -9,13 +9,25 @@ 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()
+        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.assign('var ' + else_var_name)
+        output.print('false')
+        output.end_statement()
+        output.indent()
     output.print('try')
     output.space()
-    print_bracketed(self, output, False, None, None, update_output_var if else_var_name else None)
+    print_bracketed(
+        self,
+        output,
+        False,
+        None,
+        None,
+        update_output_var if else_var_name else None
+    )
     if self.bcatch:
         output.space()
         print_catch(self.bcatch, output)
@@ -37,7 +49,8 @@ def print_catch(self, output):
     output.space()
     output.with_block(def ():
         output.indent()
-        output.spaced('ρσ_last_exception', '=', 'ρσ_Exception'), output.end_statement()
+        output.spaced('ρσ_last_exception', '=', 'ρσ_Exception')
+        output.end_statement()
         output.indent()
         no_default = True
         for i, exception in enumerate(self.body):