[Jython-checkins] SF.net SVN: jython:[6049] trunk/jython

[<fwi...@us...>]

Revision: 6049
          http://jython.svn.sourceforge.net/jython/?rev=6049&view=rev
Author:   fwierzbicki
Date:     2009-03-01 20:42:46 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
Update to antlr 3.1.2.  This required deleting mismatch() override in Python.g
and PythonPartial.g.

Modified Paths:
--------------
    trunk/jython/build.xml
    trunk/jython/grammar/Python.g
    trunk/jython/grammar/PythonPartial.g

Added Paths:
-----------
    trunk/jython/extlibs/antlr-3.1.2.jar
    trunk/jython/extlibs/antlr-runtime-3.1.2.jar

Removed Paths:
-------------
    trunk/jython/extlibs/antlr-3.1.1-runtime.jar
    trunk/jython/extlibs/antlr-3.1.1.jar

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-02-24 22:39:22 UTC (rev 6048)
+++ trunk/jython/build.xml	2009-03-01 20:42:46 UTC (rev 6049)
@@ -151,7 +151,7 @@
             <pathelement path="${extlibs.dir}/mysql-connector-java-5.1.6.jar" />
             <pathelement path="${extlibs.dir}/postgresql-8.3-603.jdbc4.jar" />
             <pathelement path="${extlibs.dir}/antlr-2.7.7.jar" />
-            <pathelement path="${extlibs.dir}/antlr-3.1.1.jar" />
+            <pathelement path="${extlibs.dir}/antlr-3.1.2.jar" />
             <pathelement path="${extlibs.dir}/stringtemplate-3.2.jar" />
 
             <pathelement path="${extlibs.dir}/asm-3.1.jar" />
@@ -539,7 +539,7 @@
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
         <jarjar destfile="${dist.dir}/${jython.deploy.jar}">
             <zipfileset src="${dist.dir}/${jython.dev.jar}"/>
-            <zipfileset src="extlibs/antlr-3.1.1-runtime.jar"/>
+            <zipfileset src="extlibs/antlr-3.1.2-runtime.jar"/>
             <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
             <zipfileset src="extlibs/asm-3.1.jar"/>
             <zipfileset src="extlibs/asm-commons-3.1.jar"/>

Deleted: trunk/jython/extlibs/antlr-3.1.1-runtime.jar
===================================================================
(Binary files differ)

Deleted: trunk/jython/extlibs/antlr-3.1.1.jar
===================================================================
(Binary files differ)

Added: trunk/jython/extlibs/antlr-3.1.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/antlr-3.1.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jython/extlibs/antlr-runtime-3.1.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/antlr-runtime-3.1.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2009-02-24 22:39:22 UTC (rev 6048)
+++ trunk/jython/grammar/Python.g	2009-03-01 20:42:46 UTC (rev 6049)
@@ -170,12 +170,6 @@
         actions.setErrorHandler(eh);
     }
 
-    protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException {
-        if (errorHandler.mismatch(this, input, ttype, follow)) {
-            super.mismatch(input, ttype, follow);
-        }
-    }
-
     protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow)
         throws RecognitionException {
 

Modified: trunk/jython/grammar/PythonPartial.g
===================================================================
--- trunk/jython/grammar/PythonPartial.g	2009-02-24 22:39:22 UTC (rev 6048)
+++ trunk/jython/grammar/PythonPartial.g	2009-03-01 20:42:46 UTC (rev 6049)
@@ -75,12 +75,6 @@
 @members {
     private ErrorHandler errorHandler = new FailFastHandler();
 
-    protected void mismatch(IntStream input, int ttype, BitSet follow) throws RecognitionException {
-        if (errorHandler.mismatch(this, input, ttype, follow)) {
-            super.mismatch(input, ttype, follow);
-        }
-    }
-
     protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow)
         throws RecognitionException {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.