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
{
