Merge branch 'master' into master

Author: parrt

.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/
 
@@ -98,3 +98,6 @@ xcuserdata
 javac-services.0.log
 javac-services.0.log.lck
 test/
+
+# Don't ignore python tests
+!runtime/Python3/test/

.travis.yml

@@ -152,6 +152,10 @@ matrix:
       jdk: openjdk8
       env: TARGET=csharp
       stage: main-test
+    - os: linux
+      jdk: openjdk8
+      env: TARGET=dart
+      stage: main-test
     - os: linux
       language: php
       php:
@@ -199,6 +203,9 @@ matrix:
       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
@@ -211,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-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-javascript.sh

@@ -2,7 +2,6 @@
 
 set -euo pipefail
 
-sudo apt-get update -qq
-curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
-sudo apt-get install -qq nodejs
-node --version
+# use v14 and check
+echo node version: $(node --version)
+

.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=javascript.* test
+cd ../runtime/JavaScript
+npm install
+npm link
+cd ../../runtime-testsuite
+mvn -q -Dparallel=methods -DthreadCount=1 -Dtest=javascript.* test

README.md

@@ -23,6 +23,7 @@ ANTLR project lead and supreme dictator for life
 * [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
 

appveyor.yml

@@ -8,14 +8,15 @@ 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-php-php="C:\tools\php\php.exe" -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

contributors.txt

@@ -1,5 +1,9 @@
 ANTLR Project Contributors Certification of Origin and Rights
 
+NOTE: This tool is mature and Terence is mostly occupied elsewhere. We
+can't accept any changes that could have widespread effects on thousands
+of existing projects. Sorry!
+
 All contributors to ANTLR v4 must formally agree to abide by this
 certificate of origin by signing on the bottom with their github
 userid, full name, email address (you can obscure your e-mail, but it
@@ -204,6 +208,7 @@ YYYY/MM/DD, github id, Full name, email
 2018/07/03, jgoppert, James Goppert, [email protected]
 2018/07/27, Maksim Novikov, [email protected]
 2018/08/03, ENDOH takanao, [email protected]
+2018/10/08, xsIceman, Andreas Skaar, [email protected]
 2018/10/18, edirgarcia, Edir García Lazo, [email protected]
 2018/07/31, Lucas Henrqiue, [email protected]
 2018/08/03, ENDOH takanao, [email protected]
@@ -214,6 +219,7 @@ YYYY/MM/DD, github id, Full name, email
 2018/11/29, hannemann-tamas, Ralf Hannemann-Tamas, [email protected]
 2018/12/20, WalterCouto, Walter Couto, [email protected]
 2018/12/23, youkaichao, Kaichao You, [email protected]
+2019/01/02, wkhemir, Wail Khemir, [email protected]
 2019/01/16, kuegi, Markus Zancolo, [email protected]
 2019/02/06, ralucado, Cristina Raluca Vijulie, ralucris.v[at]gmail[dot]com
 2019/02/23, gedimitr, Gerasimos Dimitriadis, [email protected]
@@ -237,8 +243,33 @@ YYYY/MM/DD, github id, Full name, email
 2019/11/11, foxeverl, Liu Xinfeng, liuxf1986[at]gmail[dot]com
 2019/11/17, felixn, Felix Nieuwenhuizhen, [email protected]
 2019/11/18, mlilback, Mark Lilback, [email protected]
+2020/01/19, lingyv-li, Lingyu Li, [email protected]
 2020/02/02, carocad, Camilo Roca, [email protected]
 2020/02/10, julibert, Julián Bermúdez Ortega, [email protected]
 2020/02/21, StochasticTinkr, Daniel Pitts, [email protected]
 2020/03/17, XsongyangX, Song Yang, [email protected]
+2020/04/07, deniskyashif, Denis Kyashif, [email protected]
 2020/04/08, lwehmeier, Leon Wehmeier, [email protected]
+2020/04/10, agrabski, Adam Grabski, [email protected]
+2020/04/23, martinvw, Martin van Wingerden, [email protected]
+2020/04/30, TristonianJones, Tristan Swadell, [email protected]
+2020/05/06, iammosespaulr, Moses Paul R, [email protected]
+2020/05/10, gomerser, Erik Gomersbach, [email protected]
+2020/05/22, keywan-ghadami-oxid, Keywan Ghadami, [email protected]
+2020/05/25, graknol, Sindre van der Linden, [email protected]
+2020/05/31, d-markey, David Markey, [email protected]
+2020/06/02, cohomology, Kilian Kilger, kkilger AT gmail.com
+2020/06/04, IohannRabeson, Iohann Rabeson, [email protected]
+2020/06/04, sigmasoldi3r, Pablo Blanco, [email protected]
+2020/07/01, sha-N, Shan M Mathews, [email protected]
+2020/08/22, stevenjohnstone, Steven Johnstone, [email protected]
+2020/09/06, ArthurSonzogni, Sonzogni Arthur, [email protected]
+2020/09/10, Khailian, Arunav Sanyal, [email protected]
+2020/09/12, Clcanny, Charles Ruan, [email protected]
+2020/09/15, rmcgregor1990, Robert McGregor, [email protected]
+2020/09/16, trenki2, Markus Trenkwalder, trenki2[at]gmx[dot]net
+2020/10/08, Marti2203, Martin Mirchev, [email protected]
+2020/10/16, adarshbhat, Adarsh Bhat, [email protected]
+2020/10/20, adamwojs, Adam Wójs, adam[at]wojs.pl
+2020/10/24, cliid, Jiwu Jang, [email protected]
+2020/11/05, MichelHartmann, Michel Hartmann, [email protected]

doc/cpp-target.md

@@ -65,7 +65,7 @@ int main(int argc, const char* argv[]) {
 
   tree::ParseTree *tree = parser.key();
   TreeShapeListener listener;
-  tree::ParseTreeWalker::DEFAULT->walk(&listener, tree);
+  tree::ParseTreeWalker::DEFAULT.walk(&listener, tree);
 
   return 0;
 }