Reverted generation

.travis.yml

@@ -1,21 +1,25 @@
 language: go
 
 sudo: required
-dist: trusty
 
 os:
- - linux
+- linux
 
 go:
- - "1.9"
- - "1.10"
- - "1.11"
- - master
+- "1.9"
+- "1.10"
+- "1.11"
+- master
 
 addons:
- apt:
-  sources:
-   - sourceline: 'deb http://ppa.launchpad.net/jonathonf/antlr4/ubuntu trusty main'
-  packages:
-   - oracle-java8-set-default
-   - antlr4
+  apt:
+    packages:
+    - oracle-java8-set-default
+
+before_install:
+- shopt -s expand_aliases
+- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+- sudo curl -O https://www.antlr.org/download/antlr-4.7.1-complete.jar
+- export CLASSPATH=".:/usr/local/lib/antlr-4.7.1-complete.jar:$CLASSPATH"
+- alias antlr4='java -jar /usr/local/lib/antlr-4.7.1-complete.jar'
+- alias grun='java org.antlr.v4.gui.TestRig'

Makefile

@@ -6,7 +6,6 @@ VERSION ?= $(shell git describe --tags --always --dirty)
 DIR_BIN = ./bin
 DIR_PKG = ./pkg
 DIR_CMD = ./cmd
-DIR_PKG_PARSER = ${PWD}/pkg/parser
 
 default: build
 
@@ -24,13 +23,7 @@ test:
 	go test ${DIR_PKG}/...
 
 generate:
-	antlr4 -Xexact-output-dir \
-	 -o ${DIR_PKG_PARSER}/fql \
-	 -package fql \
-	 -visitor \
-	 -Dlanguage=Go \
-	 ${DIR_PKG_PARSER}/antlr/FqlLexer.g4 \
-	 ${DIR_PKG_PARSER}/antlr/FqlParser.g4
+	go generate ${DIR_PKG}/...
 
 doc:
 	godoc -http=:6060 -index

pkg/parser/fql/fql_lexer.go

@@ -1,4 +1,4 @@
-// Code generated from /Users/timofei.voronov/Work/src/github.com/MontFerret/ferret/pkg/parser/antlr/FqlLexer.g4 by ANTLR 4.7.1. DO NOT EDIT.
+// Code generated from antlr/FqlLexer.g4 by ANTLR 4.7.1. DO NOT EDIT.
 
 package fql
 

pkg/parser/fql/fql_parser.go

@@ -1,4 +1,4 @@
-// Code generated from /Users/timofei.voronov/Work/src/github.com/MontFerret/ferret/pkg/parser/antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
+// Code generated from antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
 
 package fql // FqlParser
 import (

pkg/parser/fql/fqlparser_base_listener.go

@@ -1,4 +1,4 @@
-// Code generated from /Users/timofei.voronov/Work/src/github.com/MontFerret/ferret/pkg/parser/antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
+// Code generated from antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
 
 package fql // FqlParser
 import "github.com/antlr/antlr4/runtime/Go/antlr"

pkg/parser/fql/fqlparser_base_visitor.go

@@ -1,4 +1,4 @@
-// Code generated from /Users/timofei.voronov/Work/src/github.com/MontFerret/ferret/pkg/parser/antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
+// Code generated from antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
 
 package fql // FqlParser
 import "github.com/antlr/antlr4/runtime/Go/antlr"

pkg/parser/fql/fqlparser_listener.go

@@ -1,4 +1,4 @@
-// Code generated from /Users/timofei.voronov/Work/src/github.com/MontFerret/ferret/pkg/parser/antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
+// Code generated from antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
 
 package fql // FqlParser
 import "github.com/antlr/antlr4/runtime/Go/antlr"

pkg/parser/fql/fqlparser_visitor.go

@@ -1,4 +1,4 @@
-// Code generated from /Users/timofei.voronov/Work/src/github.com/MontFerret/ferret/pkg/parser/antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
+// Code generated from antlr/FqlParser.g4 by ANTLR 4.7.1. DO NOT EDIT.
 
 package fql // FqlParser
 import "github.com/antlr/antlr4/runtime/Go/antlr"

pkg/parser/parser.go

@@ -1,3 +1,4 @@
+//go:generate antlr4 -Xexact-output-dir -o fql -package fql -visitor -Dlanguage=Go antlr/FqlLexer.g4 antlr/FqlParser.g4
 package parser
 
 import (