githubch
diff --git a/‎CHANGES.txt‎
Lines changed: 2 additions & 0 deletions b/‎CHANGES.txt‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎gradle/version.properties‎
Lines changed: 1 addition & 1 deletion b/‎gradle/version.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sql-parser/.gitignore‎
Lines changed: 1 addition & 4 deletions b/‎sql-parser/.gitignore‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎sql-parser/build.gradle‎
Lines changed: 25 additions & 30 deletions b/‎sql-parser/build.gradle‎
Lines changed: 25 additions & 30 deletions
@@ -5,6 +5,8 @@ Changes for Crate
 Unreleased
 ==========
 
+ - Upgraded the parser from ANTLR3 to ANTLR4.
+
  - Fixed an issue that causes an error to be thrown if nested method
    calls are used in ``HAVING`` clause.
    e.g.: `having sum(power(power(id, id), id)) > 1`
 
@@ -1,6 +1,6 @@
 # crate and components deps
 guava=18.0
-antlr=3.5.2
+antlr=4.5.3
 jodatime=2.9.5
 commonscli=1.3.1
 commonsmath=3.6.1
 
@@ -1,5 +1,2 @@
 /build/
-*.tokens
-/src/main/java/io/crate/sql/parser/StatementLexer.java
-/src/main/java/io/crate/sql/parser/StatementParser.java
-/src/main/java/io/crate/sql/parser/StatementBuilder.java
+src/main/java/io/crate/sql/parser/antlr/
@@ -2,46 +2,43 @@ apply from: "$rootDir/gradle/javaModule.gradle"
 
 archivesBaseName = 'crate-sql-parser'
 
+ext.antlr = [
+        source : "src/main/antlr",
+        output : "src/main/java/io/crate/sql/parser/antlr/v4",
+        package: 'io.crate.sql.parser.antlr.v4'
+]
+
 configurations {
-    antlr3
+    antlr4
 }
 
 dependencies {
+    antlr4 "org.antlr:antlr4:${versions.antlr}"
+    compile "org.antlr:antlr4-runtime:${versions.antlr}"
+
     compile "com.google.code.findbugs:jsr305:${versions.jsr305}"
     compile "joda-time:joda-time:${versions.jodatime}"
     compile "com.google.guava:guava:${versions.guava}"
-    compile "org.antlr:antlr-runtime:${versions.antlr}"
 
-    antlr3 "org.antlr:antlr:${versions.antlr}"
     testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
     testCompile "junit:junit:${versions.junit}"
 }
 
-task generateWithANTLR3(type: Exec) {
-    String outputPath = 'src/main/java/io/crate/sql/parser';
-    ext.parserOutputFiles = files(
-            'src/main/java/io/crate/sql/parser/StatementLexer.java',
-            'src/main/java/io/crate/sql/parser/StatementParser.java',
-            'src/main/java/io/crate/sql/parser/StatementBuilder.java',
-            'src/main/java/io/crate/sql/parser/Statement.tokens',
-            'src/main/java/io/crate/sql/parser/StatementBuilder.tokens'
-    )
-    ext.parserInputFiles = files(
-            'src/main/java/io/crate/sql/parser/Statement.g',
-            'src/main/java/io/crate/sql/parser/StatementBuilder.g'
-    )
+task antlrOutputDir << {
+    mkdir(antlr.output)
+}
 
-    inputs.files(ext.parserInputFiles)
-    outputs.files(ext.parserOutputFiles)
+task generateGrammarSource(dependsOn: antlrOutputDir, type: JavaExec) {
+    inputs.dir file(antlr.source)
+    outputs.dir file(antlr.output)
 
-    commandLine = ['java', '-cp', configurations.antlr3.getAsPath(), 'org.antlr.Tool', '-o', outputPath] + ext.parserInputFiles
-}
+    def grammars = fileTree(antlr.source).include('**/*.g4')
 
-tasks.withType(JavaCompile) {
-    it.dependsOn generateWithANTLR3
+    main = 'org.antlr.v4.Tool'
+    classpath = configurations.antlr4
+    args = ["-o", "${antlr.output}", "-visitor", "-package", antlr.package, grammars.files].flatten()
 }
 
-
 test {
     // show standard out and standard error of the test JVM(s) on the console
     testLogging.showStandardStreams = true
@@ -56,12 +53,10 @@ test {
     }
 }
 
+tasks.withType(JavaCompile) {
+    it.dependsOn generateGrammarSource
+}
+
 clean {
-    doLast {
-        generateWithANTLR3.ext.parserOutputFiles.each {
-            it.delete()
-        }
-        file('Statement.tokens').delete()
-        file('StatementBuilder.tokens').delete()
-    }
+    delete antlr.output
 }