antlr · teverett · Jul 8, 2023 · Jun 19, 2023 · Jun 19, 2023 · Jun 20, 2023
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,64 +3,64 @@
   "isRoot": true,
   "tools": {
     "trcaret": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trcaret"
       ]
     },
     "trcover": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trcover"
       ]
     },
     "trgen": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trgen"
       ]
     },
     "triconv": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "triconv"
       ]
     },
     "trparse": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trparse"
       ]
     },
     "trtext": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trtext"
       ]
     },
     "trwdog": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trwdog"
       ]
     },
     "trxgrep": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trxgrep"
       ]
     },
     "trxml": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trxml"
       ]
     },
     "trxml2": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trxml2"
       ]
     }
   }
-}
+}
diff --git a/.config/dotnet-tools.json.save b/.config/dotnet-tools.json.save
@@ -3,64 +3,64 @@
   "isRoot": true,
   "tools": {
     "trcaret": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trcaret"
       ]
     },
     "trcover": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trcover"
       ]
     },
     "trgen": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trgen"
       ]
     },
     "triconv": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "triconv"
       ]
     },
     "trparse": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trparse"
       ]
     },
     "trtext": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trtext"
       ]
     },
     "trwdog": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trwdog"
       ]
     },
     "trxgrep": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trxgrep"
       ]
     },
     "trxml": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trxml"
       ]
     },
     "trxml2": {
-      "version": "0.20.27",
+      "version": "0.21.0",
       "commands": [
         "trxml2"
       ]
     }
   }
-}
+}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -118,7 +118,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest]
-        language: [ CSharp, Dart, Java, JavaScript, Go, Python3, TypeScript ]
+        language: [ Cpp, CSharp, Dart, Java, JavaScript, Go, Python3, TypeScript ]
     steps:
     - name: Info
       shell: bash

diff --git a/_scripts/templates/CSharp/st.makefile b/_scripts/templates/CSharp/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/CSharp/st.run.sh b/_scripts/templates/CSharp/st.run.sh
@@ -1 +1 @@
-./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> $@
+./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> "$@"
diff --git a/_scripts/templates/Cpp/st.makefile b/_scripts/templates/Cpp/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/Cpp/st.run.sh b/_scripts/templates/Cpp/st.run.sh
@@ -1 +1 @@
-./build/<if(os_win)>Release/<endif><exec_name> $@
+./build/<if(os_win)>Release/<endif><exec_name> "$@"
diff --git a/_scripts/templates/Dart/st.makefile b/_scripts/templates/Dart/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/Dart/st.run.sh b/_scripts/templates/Dart/st.run.sh
@@ -1 +1 @@
-Test.exe $@
+./Test.exe "$@"
diff --git a/_scripts/templates/Go/st.makefile b/_scripts/templates/Go/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/Go/st.run.sh b/_scripts/templates/Go/st.run.sh
@@ -1 +1 @@
-./<if(os_win)>Test.exe<else>Test<endif> $@
+./<if(os_win)>Test.exe<else>Test<endif> "$@"
diff --git a/_scripts/templates/Java/st.makefile b/_scripts/templates/Java/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-default:
+default: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/Java/st.run.sh b/_scripts/templates/Java/st.run.sh
@@ -2,4 +2,4 @@
 version=`grep "version=" build.sh | awk -F= '{print $2}'`
 JAR=`python -c "import os; from pathlib import Path; print(os.path.join(Path.home() , '.m2',  'repository', 'org', 'antlr', 'antlr4', '$version', 'antlr4-$version-complete.jar'))"`
 CLASSPATH="$JAR<if(path_sep_semi)>\;<else>:<endif>."
-java -cp "$CLASSPATH" Test $@
+java -cp "$CLASSPATH" Test "$@"
diff --git a/_scripts/templates/JavaScript/run.sh b/_scripts/templates/JavaScript/run.sh
@@ -1 +1 @@
-node Test.js $@
+node Test.js "$@"
diff --git a/_scripts/templates/JavaScript/st.makefile b/_scripts/templates/JavaScript/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/PHP/run.sh b/_scripts/templates/PHP/run.sh
@@ -1 +1 @@
-php -d memory_limit=1G Test.php $@
+php -d memory_limit=1G Test.php "$@"
diff --git a/_scripts/templates/PHP/st.makefile b/_scripts/templates/PHP/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/Python3/run.sh b/_scripts/templates/Python3/run.sh
@@ -1 +1 @@
-python3 Test.py $@
+python3 Test.py "$@"
diff --git a/_scripts/templates/Python3/st.makefile b/_scripts/templates/Python3/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/_scripts/templates/TypeScript/st.makefile b/_scripts/templates/TypeScript/st.makefile
@@ -1,7 +1,7 @@
 # Generated from trgen <version>
-build:
+build: FORCE
 	bash build.sh
-clean:
+clean: FORCE
 	bash clean.sh
 FORCE: ;
 test: FORCE

diff --git a/python/pom.xml b/python/pom.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>pythonparent</artifactId>
-	<packaging>pom</packaging>
-	<name>Python Grammars</name>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>pythonparent</artifactId>
+    <packaging>pom</packaging>
+    <name>Python Grammars</name>
 
-	 <parent>
-		<groupId>org.antlr.grammars</groupId>
-		<artifactId>grammarsv4</artifactId>
-		<version>1.0-SNAPSHOT</version>
+     <parent>
+        <groupId>org.antlr.grammars</groupId>
+        <artifactId>grammarsv4</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
-	<modules>
-		<module>python</module>
-		<module>python2</module>
-		<module>python3</module>
-		<module>python3-py</module>
-		<module>python3-ts</module>
-		<module>python3-without-actions</module>
-		<module>python3alt</module>
-		<module>tiny-python</module>
-	</modules>
+    <modules>
+        <module>python</module>
+        <module>python2</module>
+        <module>python3</module>
+        <module>tiny-python</module>
+    </modules>
 </project>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> $@
		./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> "$@"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		./build/<if(os_win)>Release/<endif><exec_name> $@
		./build/<if(os_win)>Release/<endif><exec_name> "$@"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		./<if(os_win)>Test.exe<else>Test<endif> $@
		./<if(os_win)>Test.exe<else>Test<endif> "$@"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		php -d memory_limit=1G Test.php $@
		php -d memory_limit=1G Test.php "$@"