[pypy-svn] r40153 - in pypy/dist/pypy/lang/js: . test/ecma

santagada at codespeak.net santagada at codespeak.net
Sat Mar 10 03:44:50 CET 2007


Author: santagada
Date: Sat Mar 10 03:44:48 2007
New Revision: 40153

Modified:
   pypy/dist/pypy/lang/js/interpreter.py
   pypy/dist/pypy/lang/js/jsobj.py
   pypy/dist/pypy/lang/js/test/ecma/conftest.py
Log:
last changes before reinstalling python


Modified: pypy/dist/pypy/lang/js/interpreter.py
==============================================================================
--- pypy/dist/pypy/lang/js/interpreter.py	(original)
+++ pypy/dist/pypy/lang/js/interpreter.py	Sat Mar 10 03:44:48 2007
@@ -16,10 +16,11 @@
     temp_tree = parse_bytecode(bytecode)
     return from_tree(temp_tree)
 
+import cPickle as pickle
+import os.path
+
 def load_file(filename):
     # NOT RPYTHON
-    import cPickle as pickle
-    import os.path
     base, ext = os.path.splitext(filename)
     jscname = base+".jsc"
     if os.path.isfile(jscname):

Modified: pypy/dist/pypy/lang/js/jsobj.py
==============================================================================
--- pypy/dist/pypy/lang/js/jsobj.py	(original)
+++ pypy/dist/pypy/lang/js/jsobj.py	Sat Mar 10 03:44:48 2007
@@ -303,6 +303,7 @@
             if x > self.Get('length').ToNumber() - 1:
                 currsize = len(self.array)
                 self.propdict['length'].value = W_Number(x+1)
+                print x+1
                 for i in range(x-(currsize-1)):
                     self.array.append(w_Undefined)
             self.array[x]= V

Modified: pypy/dist/pypy/lang/js/test/ecma/conftest.py
==============================================================================
--- pypy/dist/pypy/lang/js/test/ecma/conftest.py	(original)
+++ pypy/dist/pypy/lang/js/test/ecma/conftest.py	Sat Mar 10 03:44:48 2007
@@ -61,6 +61,8 @@
             raise Failed(msg="Syntax Error",excinfo=py.code.ExceptionInfo())
         except JsBaseExcept:
             raise Failed(msg="Javascript Error", excinfo=py.code.ExceptionInfo())
+        except:
+            raise Failed(excinfo=py.code.ExceptionInfo())
         testcases = self.interp.global_context.resolve_identifier('testcases')
         self.tc = self.interp.global_context.resolve_identifier('tc')
         testcount = testcases.GetValue().Get('length').GetValue().ToInt32()



More information about the Pypy-commit mailing list