Merge branch 'master' into master

.editorconfig

@@ -1,5 +1,8 @@
 root = true
 
+[*]
+tab_width = 4
+
 [*.{java,stg}]
 charset = utf-8
 insert_final_newline = true

.travis.yml

@@ -2,15 +2,26 @@ sudo: true
 
 language: java
 
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/Library/Caches/Homebrew
+
+stages:
+  - smoke-test
+  - main-test
+  - extended-test
+
 matrix:
   include:
     - os: linux
       compiler: clang
-      jdk: oraclejdk7
+      jdk: openjdk7
       env:
         - TARGET=cpp
         - CXX=g++-5
-        - GROUP=ALL
+        - GROUP=LEXER
+      stage: main-test
       addons:
         apt:
           sources:
@@ -20,12 +31,14 @@ matrix:
             - g++-5
             - uuid-dev
             - clang-3.7
-    - os: osx
+    - os: linux
       compiler: clang
-      osx_image: xcode8.1
+      jdk: openjdk7
       env:
         - TARGET=cpp
-        - GROUP=LEXER
+        - CXX=g++-5
+        - GROUP=PARSER
+      stage: main-test
       addons:
         apt:
           sources:
@@ -35,12 +48,14 @@ matrix:
             - g++-5
             - uuid-dev
             - clang-3.7
-    - os: osx
+    - os: linux
       compiler: clang
-      osx_image: xcode8.1
+      jdk: openjdk7
       env:
         - TARGET=cpp
-        - GROUP=PARSER
+        - CXX=g++-5
+        - GROUP=RECURSION
+      stage: main-test
       addons:
         apt:
           sources:
@@ -52,106 +67,135 @@ matrix:
             - clang-3.7
     - os: osx
       compiler: clang
-      osx_image: xcode8.1
+      osx_image: xcode9
+      env:
+        - TARGET=cpp
+        - GROUP=LEXER
+      stage: extended-test
+    - os: osx
+      compiler: clang
+      osx_image: xcode9
+      env:
+        - TARGET=cpp
+        - GROUP=PARSER
+      stage: extended-test
+    - os: osx
+      compiler: clang
+      osx_image: xcode9
       env:
         - TARGET=cpp
         - GROUP=RECURSION
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-          packages:
-            - g++-5
-            - uuid-dev
-            - clang-3.7
+      stage: extended-test
     - os: osx
       compiler: clang
-      osx_image: xcode8.1
+      osx_image: xcode9
       env:
         - TARGET=swift
         - GROUP=LEXER
+      stage: main-test
     - os: osx
       compiler: clang
-      osx_image: xcode8.1
+      osx_image: xcode9
       env:
         - TARGET=swift
         - GROUP=PARSER
+      stage: main-test
     - os: osx
       compiler: clang
-      osx_image: xcode8.1
+      osx_image: xcode9
       env:
         - TARGET=swift
         - GROUP=RECURSION
+      stage: main-test
     - os: linux
+      dist: trusty
       compiler: clang
       env:
        - TARGET=swift
        - GROUP=ALL
+      stage: extended-test
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode9
       env:
         - TARGET=dotnet
         - GROUP=LEXER
+      stage: extended-test
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode9
       env:
         - TARGET=dotnet
         - GROUP=PARSER
+      stage: extended-test
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode9
       env:
         - TARGET=dotnet
         - GROUP=RECURSION
+      stage: extended-test
+    - os: linux
+      jdk: openjdk7
+      env: TARGET=java
+      stage: extended-test
     - os: linux
-      jdk: oraclejdk7
+      jdk: openjdk8
       env: TARGET=java
+      stage: extended-test
     - os: linux
       jdk: oraclejdk8
       env: TARGET=java
+      stage: smoke-test
     - os: linux
-      jdk: oraclejdk7
+      jdk: openjdk7
       env: TARGET=csharp
+      stage: extended-test
     - os: linux
       jdk: oraclejdk8
       dist: trusty
       env:
         - TARGET=dotnet
         - GROUP=LEXER
+      stage: main-test
     - os: linux
-      jdk: oraclejdk8
+      jdk: openjdk8
       dist: trusty
       env:
         - TARGET=dotnet
         - GROUP=PARSER
+      stage: main-test
     - os: linux
       jdk: oraclejdk8
       dist: trusty
       env:
         - TARGET=dotnet
         - GROUP=RECURSION
+      stage: main-test
     - os: linux
-      jdk: oraclejdk7
+      jdk: openjdk7
       env: TARGET=python2
+      stage: extended-test
     - os: linux
-      jdk: oraclejdk7
+      jdk: openjdk7
       env: TARGET=python3
       addons:
         apt:
           sources:
             - deadsnakes # source required so it finds the package definition below
           packages:
             - python3.5
+      stage: main-test
     - os: linux
-      jdk: oraclejdk7
+      dist: trusty
+      jdk: openjdk8
       env: TARGET=javascript
+      stage: main-test
     - os: linux
-      jdk: oraclejdk7
+      dist: trusty
+      jdk: openjdk8
       env: TARGET=go
+      stage: main-test
 
 before_install:
-  - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh
+  - f="./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh"; ! [ -x "$f" ] || "$f"
 
 script:
-  - cd runtime-testsuite; ../.travis/run-tests-$TARGET.sh
-
+  - cd runtime-testsuite; travis_wait 40 ../.travis/run-tests-$TARGET.sh

.travis/before-install-linux-swift.sh

@@ -1,14 +1,12 @@
 set -euo pipefail
 
-# make sure we use trusty repositories (travis by default uses precise)
-curl https://repogen.simplylinux.ch/txt/trusty/sources_c4aa56bd26c0f54f391d8fae3e687ef5f6e97c26.txt | sudo tee /etc/apt/sources.list
-
 # install dependencies
 # some packages below will be update, swift assumes newer versions
 # of, for example, sqlite3 and libicu, without the update some
 # tools will not work
 sudo apt-get update
-sudo apt-get install clang libicu-dev libxml2 sqlite3
+sudo apt-get install clang-3.6 libxml2
+sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
 
 # This would fix a know linker issue mentioned in:
 # https://bugs.swift.org/browse/SR-2299

.travis/before-install-osx-dotnet.sh

@@ -4,9 +4,7 @@ set -euo pipefail
 
 thisdir=$(dirname "$0")
 
-# pre-requisites for dotnet core
-brew update
-brew install openssl
+# OpenSSL setup for dotnet core
 mkdir -p /usr/local/lib
 ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/
 ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
@@ -19,9 +17,3 @@ sudo installer -pkg /tmp/dotnet-dev-osx-x64.1.0.4.pkg -target /
 
 # make the link
 ln -s /usr/local/share/dotnet/dotnet /usr/local/bin/
-
-# Work around apparent rvm bug that is in Travis's Xcode image.
-# https://github.com/direnv/direnv/issues/210
-# https://github.com/travis-ci/travis-ci/issues/6307
-shell_session_update() { :; }
-

.travis/run-tests-swift.sh

@@ -4,7 +4,7 @@
 # here since environment variables doesn't pass
 # across scripts
 if [ $TRAVIS_OS_NAME == "linux" ]; then
-  export SWIFT_VERSION=swift-3.1.1
+  export SWIFT_VERSION=swift-4.0
   export SWIFT_HOME=$(pwd)/swift/$SWIFT_VERSION-RELEASE-ubuntu14.04/usr/bin/
   export PATH=$SWIFT_HOME:$PATH
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: '4.6-SNAPSHOT+AppVeyor.{build}'
+version: '4.7.1-SNAPSHOT+AppVeyor.{build}'
 os: Windows Server 2012
 build_script:
   - mvn -DskipTests install -q --batch-mode 

contributors.txt

@@ -151,7 +151,19 @@ YYYY/MM/DD, github id, Full name, email
 2017/06/11, erikbra, Erik A. Brandstadmoen, erik@brandstadmoen.net
 2017/06/10, jm-mikkelsen, Jan Martin Mikkelsen, janm@transactionware.com
 2017/06/25, alimg, Alim Gökkaya, alim.gokkaya@gmail.com
+2017/06/28, jBugman, Sergey Parshukov, codedby@bugman.me
+2017/07/09, neatnerd, Mike Arshinskiy, neatnerd@users.noreply.github.com
 2017/07/11, dhalperi, Daniel Halperin, daniel@halper.in
+2017/07/17, vaibhavaingankar09, Vaibhav Vaingankar, vbhvvaingankar9@gmail.com
+2017/07/23, venkatperi, Venkat Peri, venkatperi@gmail.com
 2017/07/27, shirou, WAKAYAMA Shirou, shirou.faw@gmail.com
 2017/07/09, neatnerd, Mike Arshinskiy, neatnerd@users.noreply.github.com
+2017/07/27, matthauck, Matt Hauck, matthauck@gmail.com
+2017/07/27, shirou, WAKAYAMA Shirou, shirou.faw@gmail.com
+2017/08/20, tiagomazzutti, Tiago Mazzutti, tiagomzt@gmail.com
 2017/08/20, milanaleksic, Milan Aleksic, milanaleksic@gmail.com
+2017/08/29, Eddy Reyes, eddy@mindsight.io
+2017/09/09, brauliobz, Bráulio Bezerra, brauliobezerra@gmail.com
+2017/09/11, sachinjain024, Sachin Jain, sachinjain024@gmail.com
+2017/10/06, bramp, Andrew Brampton, brampton@gmail.com
+2017/10/15, simkimsia, Sim Kim Sia, kimcity@gmail.com

doc/getting-started.md

@@ -6,7 +6,7 @@ Hi and welcome to the version 4 release of ANTLR! It's named after the fearless
 
 ANTLR is really two things: a tool that translates your grammar to a parser/lexer in Java (or other target language) and the runtime needed by the generated parsers/lexers. Even if you are using the ANTLR Intellij plug-in or ANTLRWorks to run the ANTLR tool, the generated code will still need the runtime library. 
 
-The first thing you should do is probably download and install a development tool plug-in. Even if you only use such tools for editing, they are great. Then, follow the instructions below to get the runtime environment available to your system to run generated parsers/lexers.  In what follows, I talk about antlr-4.5.3-complete.jar, which has the tool and the runtime and any other support libraries (e.g., ANTLR v4 is written in v3).
+The first thing you should do is probably download and install a development tool plug-in. Even if you only use such tools for editing, they are great. Then, follow the instructions below to get the runtime environment available to your system to run generated parsers/lexers.  In what follows, I talk about antlr-4.7-complete.jar, which has the tool and the runtime and any other support libraries (e.g., ANTLR v4 is written in v3).
 
 If you are going to integrate ANTLR into your existing build system using mvn, ant, or want to get ANTLR into your IDE such as eclipse or intellij, see Integrating ANTLR into Development Systems.
 
@@ -16,16 +16,18 @@ If you are going to integrate ANTLR into your existing build system using mvn, a
 1. Download
 ```
 $ cd /usr/local/lib
-$ curl -O http://www.antlr.org/download/antlr-4.5.3-complete.jar
+$ curl -O http://www.antlr.org/download/antlr-4.7-complete.jar
 ```
 Or just download in browser from website:
     [http://www.antlr.org/download.html](http://www.antlr.org/download.html)
 and put it somewhere rational like `/usr/local/lib`.
+
 2. Add `antlr-4.5.3-complete.jar` to your `CLASSPATH`:
 ```
 $ export CLASSPATH=".:/usr/local/lib/antlr-4.5.3-complete.jar:$CLASSPATH"
 ```
 It's also a good idea to put this in your `.bash_profile` or whatever your startup script is.
+
 3. Create aliases for the ANTLR Tool, and `TestRig`.
 ```
 $ alias antlr4='java -Xmx500M -cp "/usr/local/lib/antlr-4.5.3-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
@@ -39,11 +41,11 @@ $ alias grun='java org.antlr.v4.gui.TestRig'
 0. Install Java (version 1.6 or higher)
 1. Download antlr-4.5.3-complete.jar (or whatever version) from [http://www.antlr.org/download/](http://www.antlr.org/download/)
 Save to your directory for 3rd party Java libraries, say `C:\Javalib`
-2. Add `antlr-4.5-complete.jar` to CLASSPATH, either:
+2. Add `antlr-4.5.3-complete.jar` to CLASSPATH, either:
   * Permanently: Using System Properties dialog > Environment variables > Create or append to `CLASSPATH` variable
   * Temporarily, at command line:
 ```
-SET CLASSPATH=.;C:\Javalib\antlr-4.5.3-complete.jar;%CLASSPATH%
+SET CLASSPATH=.;C:\Javalib\antlr-4.7-complete.jar;%CLASSPATH%
 ```
 3. Create short convenient commands for the ANTLR Tool, and TestRig, using batch files or doskey commands:
   * Batch files (in directory in system PATH) antlr4.bat and grun.bat
@@ -65,7 +67,7 @@ Either launch org.antlr.v4.Tool directly:
 
 ```
 $ java org.antlr.v4.Tool
-ANTLR Parser Generator Version 4.5.3
+ANTLR Parser Generator Version 4.7
 -o ___ specify output directory where all output is generated
 -lib ___ specify location of .tokens files
 ...
@@ -74,8 +76,8 @@ ANTLR Parser Generator Version 4.5.3
 or use -jar option on java:
 
 ```
-$ java -jar /usr/local/lib/antlr-4.5.3-complete.jar
-ANTLR Parser Generator Version 4.5.3
+$ java -jar /usr/local/lib/antlr-4.7-complete.jar
+ANTLR Parser Generator Version 4.7
 -o ___ specify output directory where all output is generated
 -lib ___ specify location of .tokens files
 ...