fixes #111

Author: PiotrDabkowski

js2py/internals/base.py

@@ -457,7 +457,7 @@ def __init__(self, body, flags, prototype=None):
                         reg = reg.replace(fix, rep)
                        # print 'Fix', fix, '->', rep, '=', reg
                 else:
-                    raise
+                    raise Exception()
                 REGEXP_DB[body, flags] = self.pat
             except:
                 #print 'Invalid pattern...', self.value, comp
@@ -594,6 +594,8 @@ def put(self, var, val, throw=False):
             if self.is_with_scope:
                 if self.own.has_property(var):
                     return self.own.put(var, val, throw=throw)
+                else:
+                    return self.prototype.put(var, val)
             # trying to put in local scope
             # we dont know yet in which scope we should place this var
             elif var in self.own:

js2py/internals/byte_trans.py

@@ -613,8 +613,8 @@ def WithStatement(self, object, body, **kwargs):
         self.emit('LABEL', beg_label)
         self.emit('LOAD_UNDEFINED')
         self.emit(body)
-        self.emit('LABEL', end_label)
         self.emit('NOP')
+        self.emit('LABEL', end_label)
 
         # with statement implementation
         self.emit('WITH', beg_label, end_label)

js2py/internals/constructors/jsconsole.py

@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+
+from js2py.internals.conversions import *
+from js2py.internals.func_utils import *
+
+
+class ConsoleMethods:
+    def log(this, args):
+        x = ' '.join(to_string(e) for e in args)
+        print(x)

js2py/internals/fill_space.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from base import Scope
 from func_utils import *
 from conversions import *
@@ -13,7 +15,6 @@
 import prototypes.jsjson as jsjson
 import prototypes.jsutils as jsutils
 
-
 from constructors import jsnumber
 from constructors import jsstring
 from constructors import jsarray
@@ -22,6 +23,8 @@
 from constructors import jsmath
 from constructors import jsobject
 from constructors import jsfunction
+from constructors import jsconsole
+
 
 def fill_proto(proto, proto_class, space):
     for i in dir(proto_class):
@@ -244,6 +247,8 @@ def new_create(args, space):
     for k,v in jsmath.CONSTANTS.items():
         set_protected(math, k, v)
 
+    console = space.NewObject()
+    fill_proto(console, jsconsole.ConsoleMethods, space)
 
 
     # set global object
@@ -264,7 +269,8 @@ def new_create(args, space):
                 'isFinite': isFinite,
                 'isNaN': isNaN,
                 'eval': easy_func(jsfunction._eval, space),
-                'log': easy_func(jsfunction.log, space),
+                'console': console,
+                'log': console.get(u'log'),
                 }
 
     builtins.update(error_constructors)

js2py/internals/opcodes.py

@@ -646,11 +646,9 @@ def eval(self, ctx):
         with_context.THIS_BINDING = ctx.THIS_BINDING
         status = ctx.space.exe.execute_fragment_under_context(with_context, self.beg_label, self.end_label)
 
-
-
         val, typ, spec = status
-        if typ!=3:
-            print typ
+
+        if typ != 3:  # exception
             ctx.stack.pop()
 
         if typ == 0:  # normal
@@ -662,7 +660,7 @@ def eval(self, ctx):
         elif typ == 2:  # jump outside
             ctx.stack.append(val)
             return spec
-        elif typ == 3:
+        elif typ == 3:  # exception
             # throw is made with empty stack as usual
             raise spec
         else: