Bump. Update templates for diagnostics.

_scripts/bumpbase.sh

@@ -3,9 +3,9 @@
 version_framework="net7.0"
 version_base="4.5.0"
 version_tree="5.2.0"
-version_antlr4buildtasks="12.0"
+version_antlr4buildtasks="12.20"
 version_stringtemplate="4.2.0"
-version_antlrruntime="4.11.1"
+version_antlrruntime="4.13.0"
 
 files=`find . -name '*.csproj'`
 subset=`grep -l -e Antlr4.Runtime.Standard $files`

_scripts/publish.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-version=0.21.0
+version=0.21.1
 cd src
 exes=`find . -name 'tr*.exe' | grep -v publish`
 for i in $exes

src/tragl/readme.md

@@ -19,4 +19,4 @@ This tool is part of Trash, Transformations for Antlr Shell.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/tragl/tragl.csproj

@@ -21,7 +21,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/tragl</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/tranalyze/readme.md

@@ -65,4 +65,4 @@ _Output_
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/tranalyze/tranalyze.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/tranalyze</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trcaret/readme.md

@@ -18,4 +18,4 @@ Reads a tree from stdin and prints lines and caret marks.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trcaret/trcaret.csproj

@@ -21,7 +21,7 @@ This program is part of the Trash toolkit.
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trcaret</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trcombine/readme.md

@@ -103,4 +103,4 @@ The original grammars are left unchanged.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trcombine/trcombine.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trcombine</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trconvert/readme.md

@@ -93,4 +93,4 @@ _Output_
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trconvert/trconvert.csproj

@@ -20,7 +20,7 @@ syntax. This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trconvert</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trcover/readme.md

@@ -24,4 +24,4 @@ a grammar.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trcover/trcover.csproj

@@ -20,7 +20,7 @@ for the entire grammar. This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trcover</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trdelabel/readme.md

@@ -20,4 +20,4 @@ Remove all labels from an Antlr4 grammar.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trdelabel/trdelabel.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdelabel</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trdelete/readme.md

@@ -24,4 +24,4 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trdelete/trdelete.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdelete</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trdeltree/readme.md

@@ -65,4 +65,4 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trdeltree/trdeltree.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdeltree</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trdot/readme.md

@@ -63,4 +63,4 @@ The output will be:
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trdot/trdot.csproj

@@ -20,7 +20,7 @@ This program is part of the Trash toolkit.
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdot</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trenum/readme.md

@@ -8,4 +8,4 @@
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trenum/trenum.csproj

@@ -20,7 +20,7 @@ This program is part of the Trash toolkit.
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>0.21.1</Version>
+    <Version>0.21.2</Version>
     <RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trull</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>

src/trfirst/readme.md

@@ -24,4 +24,4 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trfirst/trfirst.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trfirst</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trfold/readme.md

@@ -26,4 +26,4 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trfold/trfold.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trfold</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trfoldlit/readme.md

@@ -65,4 +65,4 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trfoldlit/trfoldlit.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trfoldlit</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trformat/readme.md

@@ -18,4 +18,4 @@ Format of grammar using machine learning.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trformat/trformat.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>0.21.1</Version>
+		<Version>0.21.2</Version>
 		<RepositoryUrl>https://github.com/kaby76/Domemtech.Trash/tree/main/src/trformat</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trgen/Command.cs

@@ -492,7 +492,7 @@ private void ModifyWithGrammarParse(Config config)
             }
         }
 
-        public static string version = "0.21.1";
+        public static string version = "0.21.2";
 
         // For maven-generated code.
         public List<string> failed_modules = new List<string>();

src/trgen/readme.md

@@ -23,4 +23,4 @@ create a parser for the Arithmetic.g4 grammar.
 
 ## Current version
 
-0.21.1 Fixes to trgen for Cpp target. Update run.sh in templates.
+0.21.2 Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.

src/trgen/templates/Antlr4cs/st.test.sh

@@ -1,5 +1,8 @@
 # Generated from trgen <version>
 
+# comment for local dotnet tools.
+global=1
+
 # People often specify a test file directory, but sometimes no
 # tests are provided. Git won't check in an empty directory.
 # Test if the test file directory does not exist, or it is just
@@ -24,7 +27,12 @@ files2=`find ../<example_files_unix> -type f | grep -v '.errors$' | grep -v '.tr
 files=()
 for f in $files2
 do
-    triconv -f utf-8 $f > /dev/null 2>&1
+    if [ "$global" == "" ]
+    then
+        dotnet triconv -- -f utf-8 $f > /dev/null 2>&1
+    else
+        triconv -f utf-8 $f > /dev/null 2>&1
+    fi
     if [ "$?" = "0" ]
     then
         files+=( $f )
@@ -37,7 +45,12 @@ done
 rm -f parse.txt
 for f in ${files[*]}
 do
-    trwdog ./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> -q -tee -tree $f >> parse.txt 2>&1
+    if [ "$global" == "" ]
+    then
+        dotnet trwdog -- ./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> -q -tee -tree $f >> parse.txt 2>&1
+    else
+        trwdog ./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> -q -tee -tree $f >> parse.txt 2>&1
+    fi
     xxx="$?"
     if [ "$xxx" -ne 0 ]
     then
@@ -46,8 +59,13 @@ do
 done
 <else>
 # Group parsing.
-echo "${files[*]}" | trwdog ./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> -q -x -tee -tree > parse.txt 2>&1
-status=$?
+if [ "$global" == "" ]
+then
+    echo "${files[*]}" | dotnet trwdog -- ./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> -q -x -tee -tree > parse.txt 2>&1
+else
+    echo "${files[*]}" | trwdog ./bin/Debug/net7.0/<if(os_win)>Test.exe<else>Test<endif> -q -x -tee -tree > parse.txt 2>&1
+fi
+status="$?"
 <endif>
 
 # trwdog returns 255 if it cannot spawn the process. This could happen