svgui/pyjs/pyjs.py
changeset 1746 45d6f5fba016
parent 1744 69dfdb26f600
child 1749 d73b64672238
equal deleted inserted replaced
1745:f9d32913bad4 1746:45d6f5fba016
   541             except ValueError:
   541             except ValueError:
   542                 # Must be a function call ...
   542                 # Must be a function call ...
   543                 return ("pyjs_kwargs_function_call("+call_name+", "
   543                 return ("pyjs_kwargs_function_call("+call_name+", "
   544                                   + star_arg_name
   544                                   + star_arg_name
   545                                   + ", ["+fn_args+"]"
   545                                   + ", ["+fn_args+"]"
   546                                   + ")" )
   546                                   + ")")
   547             else:
   547             else:
   548                 return ("pyjs_kwargs_method_call("+call_this+", '"+method_name+"', "
   548                 return ("pyjs_kwargs_method_call("+call_this+", '"+method_name+"', "
   549                                   + star_arg_name
   549                                   + star_arg_name
   550                                   + ", ["+fn_args+"]"
   550                                   + ", ["+fn_args+"]"
   551                                   + ")")
   551                                   + ")")
   586             l = []
   586             l = []
   587             if isinstance(expr, ast.Tuple):
   587             if isinstance(expr, ast.Tuple):
   588                 for x in expr.nodes:
   588                 for x in expr.nodes:
   589                     l.append("(%(err)s.__name__ == %(expr)s.__name__)" % dict (err=errName, expr=self.expr(x, current_klass)))
   589                     l.append("(%(err)s.__name__ == %(expr)s.__name__)" % dict (err=errName, expr=self.expr(x, current_klass)))
   590             else:
   590             else:
   591                 l = [ " (%(err)s.__name__ == %(expr)s.__name__) " % dict (err=errName, expr=self.expr(expr, current_klass)) ]
   591                 l = [" (%(err)s.__name__ == %(expr)s.__name__) " % dict (err=errName, expr=self.expr(expr, current_klass))]
   592             print >> self.output, "   if(%s) {" % '||\n\t\t'.join(l)
   592             print >> self.output, "   if(%s) {" % '||\n\t\t'.join(l)
   593         for stmt in node.handlers[0][2]:
   593         for stmt in node.handlers[0][2]:
   594             self._stmt(stmt, current_klass)
   594             self._stmt(stmt, current_klass)
   595         if expr:
   595         if expr:
   596             #print >> self.output, "} else { throw(%s); } " % errName
   596             #print >> self.output, "} else { throw(%s); } " % errName
   668         elif v.name in self.top_level_classes:
   668         elif v.name in self.top_level_classes:
   669             return UU+self.modpfx() + "__" + v.name + ".prototype.__class__"
   669             return UU+self.modpfx() + "__" + v.name + ".prototype.__class__"
   670         elif v.name in self.module_imports() and return_none_for_module:
   670         elif v.name in self.module_imports() and return_none_for_module:
   671             return None
   671             return None
   672         elif v.name in PYJSLIB_BUILTIN_CLASSES:
   672         elif v.name in PYJSLIB_BUILTIN_CLASSES:
   673             return "pyjslib." + pyjs_builtin_remap( v.name )
   673             return "pyjslib." + pyjs_builtin_remap(v.name)
   674         elif current_klass:
   674         elif current_klass:
   675             if v.name not in local_var_names and \
   675             if v.name not in local_var_names and \
   676                v.name not in self.top_level_vars and \
   676                v.name not in self.top_level_vars and \
   677                v.name not in PYJS_GLOBAL_VARS and \
   677                v.name not in PYJS_GLOBAL_VARS and \
   678                v.name not in self.top_level_functions:
   678                v.name not in self.top_level_functions: