From: <fwi...@us...> - 2008-08-15 17:55:25
|
Revision: 5179 http://jython.svn.sourceforge.net/jython/?rev=5179&view=rev Author: fwierzbicki Date: 2008-08-15 17:55:20 +0000 (Fri, 15 Aug 2008) Log Message: ----------- small name change. Modified Paths: -------------- branches/asm/grammar/Python.g branches/asm/src/org/python/antlr/GrammarActions.java Modified: branches/asm/grammar/Python.g =================================================================== --- branches/asm/grammar/Python.g 2008-08-15 11:43:53 UTC (rev 5178) +++ branches/asm/grammar/Python.g 2008-08-15 17:55:20 UTC (rev 5179) @@ -888,11 +888,11 @@ )? )? { if ($a2 != null) { if ($a1.tree.getType() == GenFor) { - actions.throwGenExpNotSoleArg($a1.tree); + actions.errorGenExpNotSoleArg($a1.tree); } for (int i=0;i<$a2.size();i++) { if (((PythonTree)$a2.get(i)).getType() == GenFor) { - actions.throwGenExpNotSoleArg(((argument_return)$a2.get(i)).tree); + actions.errorGenExpNotSoleArg(((argument_return)$a2.get(i)).tree); } } } @@ -909,7 +909,7 @@ : t1=test[expr_contextType.Load] ( (ASSIGN t2=test[expr_contextType.Load]) -> ^(Keyword ^(Arg $t1) ^(Value $t2)?) | gen_for { if (!first) { - actions.throwGenExpNotSoleArg($gen_for.tree); + actions.errorGenExpNotSoleArg($gen_for.tree); } } -> ^(GenFor $t1 gen_for) Modified: branches/asm/src/org/python/antlr/GrammarActions.java =================================================================== --- branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-15 11:43:53 UTC (rev 5178) +++ branches/asm/src/org/python/antlr/GrammarActions.java 2008-08-15 17:55:20 UTC (rev 5179) @@ -96,7 +96,7 @@ this.errorHandler = eh; } - void throwGenExpNotSoleArg(PythonTree t) { + void errorGenExpNotSoleArg(PythonTree t) { errorHandler.error("Generator expression must be parenthesized if not sole argument", t); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |