[Jython-checkins] SF.net SVN: jython:[5026] branches/asm

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

Revision: 5026
          http://jython.svn.sourceforge.net/jython/?rev=5026&view=rev
Author:   fwierzbicki
Date:     2008-07-31 13:10:57 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Switch to Antlr 3.1b2.

Modified Paths:
--------------
    branches/asm/build.xml
    branches/asm/grammar/Python.g

Added Paths:
-----------
    branches/asm/extlibs/antlr-3.1b2.jar
    branches/asm/extlibs/antlr-runtime-3.1b2.jar
    branches/asm/extlibs/stringtemplate-3.2.jar

Removed Paths:
-------------
    branches/asm/extlibs/antlr-3.1b1.jar
    branches/asm/extlibs/antlr-runtime-3.1b1.jar
    branches/asm/extlibs/stringtemplate-3.1b1.jar

Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml	2008-07-30 23:00:32 UTC (rev 5025)
+++ branches/asm/build.xml	2008-07-31 13:10:57 UTC (rev 5026)
@@ -156,8 +156,8 @@
             <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.1b1.jar" />
-            <pathelement path="${extlibs.dir}/stringtemplate-3.1b1.jar" />
+            <pathelement path="${extlibs.dir}/antlr-3.1b2.jar" />
+            <pathelement path="${extlibs.dir}/stringtemplate-3.2.jar" />
         </path>
 
         <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
@@ -501,7 +501,7 @@
     <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded">
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
         <jarjar destfile="${output.dir}/jarjar.jar">
-            <zipfileset src="extlibs/antlr-runtime-3.1b1.jar"/>
+            <zipfileset src="extlibs/antlr-runtime-3.1b2.jar"/>
             <zipfileset src="extlibs/asm-3.1.jar"/>
             <zipfileset src="extlibs/asm-commons-3.1.jar"/>
             <zipfileset src="extlibs/asm-util-3.1.jar"/>


Property changes on: branches/asm/extlibs/antlr-3.1b2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: branches/asm/extlibs/antlr-runtime-3.1b2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: branches/asm/extlibs/stringtemplate-3.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g	2008-07-30 23:00:32 UTC (rev 5025)
+++ branches/asm/grammar/Python.g	2008-07-31 13:10:57 UTC (rev 5026)
@@ -1044,11 +1044,14 @@
                    if ($a1.gen) {
                        throwGenExpNotSoleArg($a1.tree);
                    }
+                   //FIXME: not working in 3.1b2
+                   /*
                    for (int i=0;i<$a2.size();i++) {
                        if (((argument_return)$a2.get(i)).gen) {
                            throwGenExpNotSoleArg(((argument_return)$a2.get(i)).tree);
                        }
                    }
+                   */
                }
              }
        -> ^(Args argument+) ^(StarArgs $starargs)? ^(KWArgs $kwargs)?


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