Merge branch 'master' into patch-1

.gitignore

@@ -3,7 +3,7 @@ target/
 # ... but not code generation targets
 !tool/src/org/antlr/v4/codegen/target/
 
-# Node.js (npm and typings) cached dependencies 
+# Node.js (npm and typings) cached dependencies
 node_modules/
 typings/
 
@@ -97,3 +97,7 @@ xcuserdata
 # VSCode Java plugin temporary files
 javac-services.0.log
 javac-services.0.log.lck
+test/
+
+# Don't ignore python tests
+!runtime/Python3/test/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "runtime/PHP"]
+	path = runtime/PHP
+	url = https://github.com/antlr/antlr-php-runtime.git

.travis.yml

@@ -19,8 +19,9 @@ stages:
 matrix:
   include:
     - os: linux
+      dist: trusty
       compiler: clang
-      jdk: openjdk7
+      jdk: openjdk8
       env:
         - TARGET=cpp
         - CXX=g++-5
@@ -36,8 +37,9 @@ matrix:
             - uuid-dev
             - clang-3.7
     - os: linux
+      dist: trusty
       compiler: clang
-      jdk: openjdk7
+      jdk: openjdk8
       env:
         - TARGET=cpp
         - CXX=g++-5
@@ -53,8 +55,9 @@ matrix:
             - uuid-dev
             - clang-3.7
     - os: linux
+      dist: trusty
       compiler: clang
-      jdk: openjdk7
+      jdk: openjdk8
       env:
         - TARGET=cpp
         - CXX=g++-5
@@ -71,42 +74,42 @@ matrix:
             - clang-3.7
     - os: osx
       compiler: clang
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=cpp
         - GROUP=LEXER
       stage: extended-test
     - os: osx
       compiler: clang
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=cpp
         - GROUP=PARSER
       stage: extended-test
     - os: osx
       compiler: clang
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=cpp
         - GROUP=RECURSION
       stage: extended-test
     - os: osx
       compiler: clang
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=swift
         - GROUP=LEXER
       stage: main-test
     - os: osx
       compiler: clang
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=swift
         - GROUP=PARSER
       stage: main-test
     - os: osx
       compiler: clang
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=swift
         - GROUP=RECURSION
@@ -119,41 +122,49 @@ matrix:
        - GROUP=ALL
       stage: extended-test
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=dotnet
         - GROUP=LEXER
       stage: extended-test
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=dotnet
         - GROUP=PARSER
       stage: extended-test
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       env:
         - TARGET=dotnet
         - GROUP=RECURSION
       stage: extended-test
     - os: linux
+      dist: trusty
       jdk: openjdk7
       env: TARGET=java
       stage: extended-test
     - os: linux
       jdk: openjdk8
       env: TARGET=java
-      stage: extended-test
-    - os: linux
-      jdk: oraclejdk8
-      env: TARGET=java
       stage: smoke-test
     - os: linux
-      jdk: openjdk7
+      jdk: openjdk8
       env: TARGET=csharp
       stage: main-test
     - os: linux
-      jdk: oraclejdk8
+      jdk: openjdk8
+      env: TARGET=dart
+      stage: main-test
+    - os: linux
+      language: php
+      php:
+        - 7.2
+      jdk: openjdk8
+      env: TARGET=php
+      stage: main-test
+    - os: linux
+      jdk: openjdk8
       dist: trusty
       env:
         - TARGET=dotnet
@@ -167,31 +178,34 @@ matrix:
         - GROUP=PARSER
       stage: extended-test
     - os: linux
-      jdk: oraclejdk8
+      jdk: openjdk8
       dist: trusty
       env:
         - TARGET=dotnet
         - GROUP=RECURSION
       stage: extended-test
     - os: linux
-      jdk: openjdk7
+      jdk: openjdk8
       env: TARGET=python2
       stage: main-test
     - os: linux
-      jdk: openjdk7
+      jdk: openjdk8
       env: TARGET=python3
       addons:
         apt:
           sources:
             - deadsnakes # source required so it finds the package definition below
           packages:
-            - python3.6
+            - python3.7
       stage: main-test
     - os: linux
       dist: trusty
       jdk: openjdk8
       env: TARGET=javascript
       stage: main-test
+      before_install:
+        - nvm install 14 # otherwise it runs by default on node 8
+        - f="./.travis/before-install-linux-javascript.sh"; ! [ -x "$f" ] || "$f"
     - os: linux
       dist: trusty
       jdk: openjdk8
@@ -204,7 +218,7 @@ before_install:
 script:
   - |
     cd runtime-testsuite;
-    travis_wait 40 ../.travis/run-tests-$TARGET.sh;
-    rc=$?;
-    cat target/surefire-reports/*.dumpstream || true;
+    travis_wait 40 ../.travis/run-tests-$TARGET.sh
+    rc=$?
+    cat target/surefire-reports/*.dumpstream || true
     exit $rc

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

@@ -3,6 +3,6 @@
 set -euo pipefail
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+echo "deb http://download.mono-project.com/repo/debian xenial main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
 sudo apt-get update -qq
-echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.1 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
 sudo apt-get install -qq mono-complete

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

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+wget https://storage.googleapis.com/dart-archive/channels/stable/release/2.8.4/linux_packages/dart_2.8.4-1_amd64.deb
+sudo dpkg -i ./dart_2.8.4-1_amd64.deb
+sudo rm ./dart_2.8.4-1_amd64.deb
+sudo apt-get install -f

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

@@ -6,5 +6,5 @@ set -euo pipefail
 sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
 sudo apt-get update
-sudo apt-get install dotnet-dev-1.0.4
+sudo apt-get --allow-unauthenticated install dotnet-dev-1.0.4
 

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

@@ -2,7 +2,5 @@
 
 set -euo pipefail
 
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-sudo apt-get update -qq
 eval "$(sudo gimme 1.7.3)"
 ( go version ; go env ) || true

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

@@ -2,8 +2,6 @@
 
 set -euo pipefail
 
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-sudo apt-get update -qq
-curl -sL https://deb.nodesource.com/setup_0.12 | sudo -E bash -
-sudo apt-get install -qq nodejs
-node --version
+# use v14 and check
+echo node version: $(node --version)
+

.travis/before-install-linux-cpp.sh → .travis/before-install-linux-php.sh

@@ -4,3 +4,7 @@ set -euo pipefail
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 sudo apt-get update -qq
+
+php -v
+
+mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V

.travis/run-tests-dart.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+set -euo pipefail
+mvn -q -Dparallel=classes -DthreadCount=4 -Dtest=dart.* test

.travis/run-tests-javascript.sh

@@ -2,4 +2,8 @@
 
 set -euo pipefail
 
-mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=node.* test
+cd ../runtime/JavaScript
+npm install
+npm link
+cd ../../runtime-testsuite
+mvn -q -Dparallel=methods -DthreadCount=1 -Dtest=javascript.* test

.travis/run-tests-php.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+
+php_path=$(which php)
+
+composer install -d ../runtime/PHP
+
+mvn -q -DPHP_PATH="${php_path}" -Dparallel=methods -DthreadCount=4 -Dtest=php.* test

.travis/run-tests-python2.sh

@@ -2,8 +2,10 @@
 
 set -euo pipefail
 
+python --version
+
 mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test
 
 cd ../runtime/Python2/tests
 
-python run.py
+python run.py

.travis/run-tests-python3.sh

@@ -2,8 +2,10 @@
 
 set -euo pipefail
 
+python3 --version
+
 mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test
 
 cd ../runtime/Python3/test
 
-python3.6 run.py
+python3 run.py

.travis/run-tests-swift.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 # here since environment variables doesn't pass
 # across scripts
 if [ $TRAVIS_OS_NAME == "linux" ]; then
-  export SWIFT_VERSION=swift-4.2.1
+  export SWIFT_VERSION=swift-5.0.1
   export SWIFT_HOME=$(pwd)/swift/$SWIFT_VERSION-RELEASE-ubuntu16.04/usr/bin/
   export PATH=$SWIFT_HOME:$PATH
 

README.md

@@ -22,6 +22,8 @@ ANTLR project lead and supreme dictator for life
 * [Janyou](https://github.com/janyou) (Swift target)
 * [Ewan Mellor](https://github.com/ewanmellor), [Hanzhou Shi](https://github.com/hanjoes) (Swift target merging)
 * [Ben Hamilton](https://github.com/bhamiltoncx) (Full Unicode support in serialized ATN and all languages' runtimes for code points > U+FFFF)
+* [Marcos Passos](https://github.com/marcospassos) (PHP target)
+* [Lingyu Li](https://github.com/lingyv-li) (Dart target)
 
 ## Useful information
 

antlr4-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.antlr</groupId>
     <artifactId>antlr4-master</artifactId>
-    <version>4.7.3-SNAPSHOT</version>
+    <version>4.8-2-SNAPSHOT</version>
   </parent>
   <artifactId>antlr4-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -120,7 +120,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.6.0</version>
         <configuration>
           <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>

appveyor.yml

@@ -4,14 +4,19 @@ cache:
   - '%USERPROFILE%\.nuget\packages -> **\project.json'
 image: Visual Studio 2017  
 build: off
+install:
+  - git submodule update --init --recursive
+  - cinst -y php --params "/InstallDir:C:\tools\php"
+  - cinst -y composer
+  - cinst -y dart-sdk --version=2.8.4
 build_script:
   - mvn -DskipTests install --batch-mode
   - msbuild /target:restore /target:rebuild /property:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:detailed runtime/CSharp/runtime/CSharp/Antlr4.dotnet.sln
   - msbuild ./runtime-testsuite/target/classes/CSharp/runtime/CSharp/Antlr4.vs2013.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:detailed
 after_build: 
   - msbuild /target:pack /property:Configuration=Release /verbosity:detailed runtime/CSharp/runtime/CSharp/Antlr4.dotnet.sln
 test_script:
-  - mvn install -Dantlr-python2-python="C:\Python27\python.exe" -Dantlr-python3-python="C:\Python35\python.exe" -Dantlr-javascript-nodejs="C:\Program Files (x86)\nodejs\node.exe" --batch-mode
+  - mvn install -Dantlr-php-php="C:\tools\php\php.exe" -Dantlr-dart-dart="C:\tools\dart-sdk\bin\dart.exe" -Dantlr-dart-pub="C:\tools\dart-sdk\bin\pub.bat" -Dantlr-dart-dart2native="C:\tools\dart-sdk\bin\dart2native.bat" -Dantlr-python2-python="C:\Python27\python.exe" -Dantlr-python3-python="C:\Python35\python.exe" --batch-mode
 artifacts:
 - path: 'runtime\**\*.nupkg'  
   name: NuGet