1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Last set of change to get regression tests to pass

Browse Source 
Remove the only test in the syntax module.  It ends up that the
transformer must handle this error case.

In the transformer, check for a list compression in com_assign_list()
by looking for a list_for node where a comma is expected.

In pycodegen.compile() re-raise the SyntaxError rather than catching
it and exiting
This commit is contained in:
Jeremy Hylton 2001-09-17 19:33:48 +00:00
parent c299fc16f2
commit 2e4cc7e0d8
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/compiler/pycodegen.py
View File

@ -49,7 +49,7 @@ def compile(filename, display=0):
try: try:
mod.compile(display) mod.compile(display)
except SyntaxError, err: except SyntaxError, err:
print "SyntaxError:", err raise
else: else:
f = open(filename + "c", "wb") f = open(filename + "c", "wb")
mod.dump(f) mod.dump(f)

9
Lib/compiler/syntax.py
View File

@ -39,7 +39,8 @@ class SyntaxErrorChecker:
def visitAssign(self, node): def visitAssign(self, node):
# the transformer module handles many of these # the transformer module handles many of these
for target in node.nodes: for target in node.nodes:
if isinstance(target, ast.AssList): pass
if target.lineno is None: ## if isinstance(target, ast.AssList):
target.lineno = node.lineno ## if target.lineno is None:
self.error(target, "can't assign to list comprehension") ## target.lineno = node.lineno
## self.error(target, "can't assign to list comprehension")

4
Lib/compiler/transformer.py
View File

@ -943,6 +943,10 @@ class Transformer:
def com_assign_list(self, node, assigning): def com_assign_list(self, node, assigning):
assigns = [] assigns = []
for i in range(1, len(node), 2): for i in range(1, len(node), 2):
if i + 1 < len(node):
if node[i + 1][0] == symbol.list_for:
raise SyntaxError, "can't assign to list comprehension"
assert node[i + 1][0] == token.COMMA, node[i + 1]
assigns.append(self.com_assign(node[i], assigning)) assigns.append(self.com_assign(node[i], assigning))
return AssList(assigns) return AssList(assigns)

2
Tools/compiler/compiler/pycodegen.py
View File

@ -49,7 +49,7 @@ def compile(filename, display=0):
try: try:
mod.compile(display) mod.compile(display)
except SyntaxError, err: except SyntaxError, err:
print "SyntaxError:", err raise
else: else:
f = open(filename + "c", "wb") f = open(filename + "c", "wb")
mod.dump(f) mod.dump(f)

9
Tools/compiler/compiler/syntax.py
View File

@ -39,7 +39,8 @@ class SyntaxErrorChecker:
def visitAssign(self, node): def visitAssign(self, node):
# the transformer module handles many of these # the transformer module handles many of these
for target in node.nodes: for target in node.nodes:
if isinstance(target, ast.AssList): pass
if target.lineno is None: ## if isinstance(target, ast.AssList):
target.lineno = node.lineno ## if target.lineno is None:
self.error(target, "can't assign to list comprehension") ## target.lineno = node.lineno
## self.error(target, "can't assign to list comprehension")

4
Tools/compiler/compiler/transformer.py
View File

@ -943,6 +943,10 @@ class Transformer:
def com_assign_list(self, node, assigning): def com_assign_list(self, node, assigning):
assigns = [] assigns = []
for i in range(1, len(node), 2): for i in range(1, len(node), 2):
if i + 1 < len(node):
if node[i + 1][0] == symbol.list_for:
raise SyntaxError, "can't assign to list comprehension"
assert node[i + 1][0] == token.COMMA, node[i + 1]
assigns.append(self.com_assign(node[i], assigning)) assigns.append(self.com_assign(node[i], assigning))
return AssList(assigns) return AssList(assigns)