[Jython-checkins] jython (merge 2.5 -> default): Merge 2.5.
frank.wierzbicki
jython-checkins at python.org
Fri Mar 30 21:17:23 CEST 2012
http://hg.python.org/jython/rev/cdc523f2b883
changeset: 6509:cdc523f2b883
parent: 6507:aab8ce176bdc
parent: 6508:581d909657b9
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Fri Mar 30 09:41:13 2012 -0700
summary:
Merge 2.5.
files:
grammar/Python.g | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/grammar/Python.g b/grammar/Python.g
--- a/grammar/Python.g
+++ b/grammar/Python.g
@@ -200,7 +200,7 @@
@Override
public void displayRecognitionError(String[] tokenNames, RecognitionException e) {
- // Do nothing. We record errors instead of printing them.
+ //Do nothing. We will handle error display elsewhere.
}
}
@@ -282,6 +282,11 @@
}
}
}
+ @Override
+ public void displayRecognitionError(String[] tokenNames, RecognitionException e) {
+ //Do nothing. We will handle error display elsewhere.
+ }
+
}
//START OF PARSER RULES
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list