[pypy-svn] r16319 - in pypy/dist/pypy: interpreter/astcompiler interpreter/stablecompiler lib/_stablecompiler module/recparser/compiler
ac at codespeak.net
ac at codespeak.net
Tue Aug 23 19:18:31 CEST 2005
Author: ac
Date: Tue Aug 23 19:18:31 2005
New Revision: 16319
Modified:
pypy/dist/pypy/interpreter/astcompiler/pycodegen.py
pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py
pypy/dist/pypy/lib/_stablecompiler/pycodegen.py
pypy/dist/pypy/module/recparser/compiler/pycodegen.py
Log:
Adjust errormessages to match what test_exceptions regressiontest expects.
Modified: pypy/dist/pypy/interpreter/astcompiler/pycodegen.py
==============================================================================
--- pypy/dist/pypy/interpreter/astcompiler/pycodegen.py (original)
+++ pypy/dist/pypy/interpreter/astcompiler/pycodegen.py Tue Aug 23 19:18:31 2005
@@ -502,8 +502,7 @@
def visitContinue(self, node):
if not self.setups:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
kind, block = self.setups.top()
if kind == LOOP:
self.set_lineno(node)
@@ -519,13 +518,12 @@
if kind == LOOP:
break
if kind != LOOP:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
self.emit('CONTINUE_LOOP', loop_block)
self.nextBlock()
elif kind == END_FINALLY:
- msg = "'continue' not supported inside 'finally' clause (%s, %d)"
- raise SyntaxError, msg % (node.filename, node.lineno)
+ msg = "'continue' not supported inside 'finally' clause" # " (%s, %d)"
+ raise SyntaxError, msg # % (node.filename, node.lineno)
def visitTest(self, node, jump):
end = self.newBlock()
Modified: pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py (original)
+++ pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py Tue Aug 23 19:18:31 2005
@@ -506,8 +506,7 @@
def visitContinue(self, node):
if not self.setups:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
kind, block = self.setups.top()
if kind == LOOP:
self.set_lineno(node)
@@ -523,13 +522,12 @@
if kind == LOOP:
break
if kind != LOOP:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
self.emit('CONTINUE_LOOP', loop_block)
self.nextBlock()
elif kind == END_FINALLY:
- msg = "'continue' not supported inside 'finally' clause (%s, %d)"
- raise SyntaxError, msg % (node.filename, node.lineno)
+ msg = "'continue' not supported inside 'finally' clause" # " (%s, %d)"
+ raise SyntaxError, msg # % (node.filename, node.lineno)
def visitTest(self, node, jump):
end = self.newBlock()
Modified: pypy/dist/pypy/lib/_stablecompiler/pycodegen.py
==============================================================================
--- pypy/dist/pypy/lib/_stablecompiler/pycodegen.py (original)
+++ pypy/dist/pypy/lib/_stablecompiler/pycodegen.py Tue Aug 23 19:18:31 2005
@@ -507,8 +507,7 @@
def visitContinue(self, node):
if not self.setups:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
kind, block = self.setups.top()
if kind == LOOP:
self.set_lineno(node)
@@ -524,13 +523,12 @@
if kind == LOOP:
break
if kind != LOOP:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
self.emit('CONTINUE_LOOP', loop_block)
self.nextBlock()
elif kind == END_FINALLY:
- msg = "'continue' not supported inside 'finally' clause (%s, %d)"
- raise SyntaxError, msg % (node.filename, node.lineno)
+ msg = "'continue' not supported inside 'finally' clause" # " (%s, %d)"
+ raise SyntaxError, msg # % (node.filename, node.lineno)
def visitTest(self, node, jump):
end = self.newBlock()
Modified: pypy/dist/pypy/module/recparser/compiler/pycodegen.py
==============================================================================
--- pypy/dist/pypy/module/recparser/compiler/pycodegen.py (original)
+++ pypy/dist/pypy/module/recparser/compiler/pycodegen.py Tue Aug 23 19:18:31 2005
@@ -503,8 +503,7 @@
def visitContinue(self, node):
if not self.setups:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
kind, block = self.setups.top()
if kind == LOOP:
self.set_lineno(node)
@@ -520,13 +519,12 @@
if kind == LOOP:
break
if kind != LOOP:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
+ raise SyntaxError, "'continue' not properly in loop" # (%s, %d)" % (node.filename, node.lineno)
self.emit('CONTINUE_LOOP', loop_block)
self.nextBlock()
elif kind == END_FINALLY:
- msg = "'continue' not supported inside 'finally' clause (%s, %d)"
- raise SyntaxError, msg % (node.filename, node.lineno)
+ msg = "'continue' not supported inside 'finally' clause" # " (%s, %d)"
+ raise SyntaxError, msg # % (node.filename, node.lineno)
def visitTest(self, node, jump):
end = self.newBlock()
More information about the Pypy-commit
mailing list