[pypy-svn] r53312 - in pypy/branch/js-refactoring/pypy/lang/js: . test

[fijal at codespeak.net]

Author: fijal
Date: Fri Apr  4 05:40:22 2008
New Revision: 53312

Removed:
   pypy/branch/js-refactoring/pypy/lang/js/test/test_operations.py
Modified:
   pypy/branch/js-refactoring/pypy/lang/js/operations.py
   pypy/branch/js-refactoring/pypy/lang/js/test/test_astbuilder.py
   pypy/branch/js-refactoring/pypy/lang/js/test/test_parser.py
Log:
fix tests, remove irrelevant one


Modified: pypy/branch/js-refactoring/pypy/lang/js/operations.py
==============================================================================
--- pypy/branch/js-refactoring/pypy/lang/js/operations.py	(original)
+++ pypy/branch/js-refactoring/pypy/lang/js/operations.py	Fri Apr  4 05:40:22 2008
@@ -781,7 +781,7 @@
     
     def emit(self, bytecode):
         startlabel = bytecode.emit_startloop_label()
-        end = bytecode.preallocate_endloop_label()
+        end = bytecode.prealocate_endloop_label()
         self.body.emit(bytecode)
         self.condition.emit(bytecode)
         bytecode.emit('JUMP_IF_TRUE', startlabel)

Modified: pypy/branch/js-refactoring/pypy/lang/js/test/test_astbuilder.py
==============================================================================
--- pypy/branch/js-refactoring/pypy/lang/js/test/test_astbuilder.py	(original)
+++ pypy/branch/js-refactoring/pypy/lang/js/test/test_astbuilder.py	Fri Apr  4 05:40:22 2008
@@ -31,8 +31,8 @@
 def test_callcall():
     p = to_ast('x()()')
     c1 = p.body.nodes[0]
-    assert isinstance(c1, Call)
-    assert isinstance(c1.left, Call)
+    assert isinstance(c1.expr, Call)
+    assert isinstance(c1.expr.left, Call)
 
 def test_sourcename():    
     p = to_ast('x()()').body

Modified: pypy/branch/js-refactoring/pypy/lang/js/test/test_parser.py
==============================================================================
--- pypy/branch/js-refactoring/pypy/lang/js/test/test_parser.py	(original)
+++ pypy/branch/js-refactoring/pypy/lang/js/test/test_parser.py	Fri Apr  4 05:40:22 2008
@@ -438,7 +438,8 @@
                                 'LOAD_VARIABLE "stuff"',
                                 'POP',
                                 'LOAD_VARIABLE "x"',
-                                'JUMP_IF_TRUE 0'],[
+                                'JUMP_IF_TRUE 0',
+                                'LABEL 1'],[
                                 'LOAD_VARIABLE "stuff"',
                                 'POP',
                                 'LOAD_VARIABLE "x"',