Return-Path: 
 <cassandra-commits-return-482-apmail-incubator-cassandra-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org
Received: (qmail 5380 invoked from network); 3 Apr 2009 21:28:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 3 Apr 2009 21:28:02 -0000
Received: (qmail 2147 invoked by uid 500); 3 Apr 2009 21:28:02 -0000
Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org
Received: (qmail 2138 invoked by uid 500); 3 Apr 2009 21:28:02 -0000
Mailing-List: contact cassandra-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cassandra-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cassandra-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cassandra-commits@incubator.apache.org>
List-Id: <cassandra-commits.incubator.apache.org>
Reply-To: cassandra-dev@incubator.apache.org
Delivered-To: mailing list cassandra-commits@incubator.apache.org
Received: (qmail 2128 invoked by uid 99); 3 Apr 2009 21:28:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2009 21:28:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2009 21:28:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 37F5C2388A46; Fri,  3 Apr 2009 21:27:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r761805 - in /incubator/cassandra/trunk: build.xml
 lib/antlr-2.7.7.jar lib/antlr-3.0.1.jar lib/antlr-runtime-3.0.1.jar
 src/org/apache/cassandra/cql/compiler/common/CqlCompiler.java
Date: Fri, 03 Apr 2009 21:27:41 -0000
To: cassandra-commits@incubator.apache.org
From: jbellis@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090403212741.37F5C2388A46@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbellis
Date: Fri Apr  3 21:27:40 2009
New Revision: 761805

URL: http://svn.apache.org/viewvc?rev=761805&view=rev
Log:
upgrade to latest antlr; expunge 2.x.  patch by Per Mellqvist, reviewed by jbellis.  see #46

Removed:
    incubator/cassandra/trunk/lib/antlr-2.7.7.jar
    incubator/cassandra/trunk/lib/antlr-3.0.1.jar
    incubator/cassandra/trunk/lib/antlr-runtime-3.0.1.jar
Modified:
    incubator/cassandra/trunk/build.xml
    incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/common/CqlCompiler.java

Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=761805&r1=761804&r2=761805&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Fri Apr  3 21:27:40 2009
@@ -58,10 +58,12 @@
     <target name="gen-cli-grammar" depends="check-gen-cli-grammar" unless="cliUpToDate">
       <echo>Building Grammar ${build.src}/org/apache/cassandra/cli/Cli.g  ....</echo>
       <java classname="org.antlr.Tool"
-            classpath="${build.lib}/antlr-3.0.1.jar:${build.lib}/stringtemplate-3.0.jar:${build.lib}/antlr-2.7.7.jar"
+            classpath="${build.lib}/antlr-3.1.3.jar"
             fork="true">
          <arg value="${build.src}/org/apache/cassandra/cli/Cli.g" />
-      </java>
+         <arg value="-o" />
+         <arg value="${build.src}/org/apache/cassandra/cli/" />
+      </java> 
     </target>
 
     <!--
@@ -76,10 +78,12 @@
     <target name="gen-cql-grammar" depends="check-gen-cql-grammar" unless="cqlUpToDate">
       <echo>Building Grammar ${build.src}/org/apache/cassandra/cql/compiler/parse/Cql.g  ....</echo>
       <java classname="org.antlr.Tool"
-            classpath="${build.lib}/antlr-3.0.1.jar:${build.lib}/stringtemplate-3.0.jar:${build.lib}/antlr-2.7.7.jar"
+            classpath="${build.lib}/antlr-3.1.3.jar"
             fork="true">
          <arg value="${build.src}/org/apache/cassandra/cql/compiler/parse/Cql.g" />
-      </java>
+         <arg value="-o" />
+         <arg value="${build.src}/org/apache/cassandra/cql/compiler/parse/" />
+      </java> 
     </target>
 
     <!--

Modified: incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/common/CqlCompiler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/common/CqlCompiler.java?rev=761805&r1=761804&r2=761805&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/common/CqlCompiler.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/common/CqlCompiler.java Fri Apr  3 21:27:40 2009
@@ -85,7 +85,7 @@
             throw new MismatchedTokenException(ttype, input);
         }
 
-        public void recoverFromMismatchedSet(IntStream input,
+        public Object recoverFromMismatchedSet(IntStream input,
                                              RecognitionException re,
                                              BitSet follow) throws RecognitionException
         {