From 863a2317576d32c07d534ea8c13cd19f264c8611 Mon Sep 17 00:00:00 2001 From: Ken Domino Date: Sun, 20 Aug 2023 06:58:23 -0400 Subject: [PATCH] Bump. Update templates for diagnostics. --- _scripts/bumpbase.sh | 4 +- _scripts/publish.sh | 2 +- src/tragl/readme.md | 2 +- src/tragl/tragl.csproj | 2 +- src/tranalyze/readme.md | 2 +- src/tranalyze/tranalyze.csproj | 2 +- src/trcaret/readme.md | 2 +- src/trcaret/trcaret.csproj | 2 +- src/trcombine/readme.md | 2 +- src/trcombine/trcombine.csproj | 2 +- src/trconvert/readme.md | 2 +- src/trconvert/trconvert.csproj | 2 +- src/trcover/readme.md | 2 +- src/trcover/trcover.csproj | 2 +- src/trdelabel/readme.md | 2 +- src/trdelabel/trdelabel.csproj | 2 +- src/trdelete/readme.md | 2 +- src/trdelete/trdelete.csproj | 2 +- src/trdeltree/readme.md | 2 +- src/trdeltree/trdeltree.csproj | 2 +- src/trdot/readme.md | 2 +- src/trdot/trdot.csproj | 2 +- src/trenum/readme.md | 2 +- src/trenum/trenum.csproj | 2 +- src/trfirst/readme.md | 2 +- src/trfirst/trfirst.csproj | 2 +- src/trfold/readme.md | 2 +- src/trfold/trfold.csproj | 2 +- src/trfoldlit/readme.md | 2 +- src/trfoldlit/trfoldlit.csproj | 2 +- src/trformat/readme.md | 2 +- src/trformat/trformat.csproj | 2 +- src/trgen/Command.cs | 2 +- src/trgen/readme.md | 2 +- src/trgen/templates/Antlr4cs/st.test.sh | 26 +++++- .../templates/CSharp/st.ErrorListener.cs | 76 +++++++++++++++- src/trgen/templates/CSharp/st.Test.cs | 11 ++- src/trgen/templates/CSharp/st.test.sh | 24 +++++- src/trgen/templates/Cpp/st.test.sh | 26 +++++- src/trgen/templates/Dart/st.test.sh | 24 +++++- src/trgen/templates/Go/st.test.sh | 26 +++++- .../Java/st.MyDiagnosticErrorListener.java | 86 +++++++++++++++++++ src/trgen/templates/Java/st.Test.java | 11 ++- src/trgen/templates/Java/st.test.sh | 24 +++++- src/trgen/templates/JavaScript/st.test.sh | 24 +++++- src/trgen/templates/Python3/st.test.sh | 24 +++++- src/trgen/templates/TypeScript/st.test.sh | 24 +++++- src/trgen/trgen.csproj | 2 +- src/trgen2/Command.cs | 2 +- src/trgen2/readme.md | 2 +- src/trgen2/trgen2.csproj | 2 +- src/trgroup/readme.md | 2 +- src/triconv/readme.md | 2 +- src/triconv/triconv.csproj | 2 +- src/trinsert/readme.md | 2 +- src/trinsert/trinsert.csproj | 2 +- src/tritext/readme.md | 2 +- src/tritext/tritext.csproj | 2 +- src/trjson/readme.md | 2 +- src/trjson/trjson.csproj | 2 +- src/trkleene/readme.md | 2 +- src/trkleene/trkleene.csproj | 2 +- src/trmove/readme.md | 2 +- src/trmove/trmove.csproj | 2 +- src/trparse/readme.md | 2 +- src/trparse/trparse.csproj | 2 +- src/trperf/readme.md | 2 +- src/trperf/trperf.csproj | 2 +- src/trpiggy/readme.md | 2 +- src/trpiggy/trpiggy.csproj | 2 +- src/trprint/readme.md | 2 +- src/trprint/trprint.csproj | 2 +- src/trquery/readme.md | 2 +- src/trquery/trquery.csproj | 2 +- src/trrename/readme.md | 2 +- src/trrename/trrename.csproj | 2 +- src/trreplace/readme.md | 2 +- src/trreplace/trreplace.csproj | 2 +- src/trrr/readme.md | 2 +- src/trrr/trrr.csproj | 2 +- src/trrup/readme.md | 2 +- src/trrup/trrup.csproj | 2 +- src/trsem/readme.md | 2 +- src/trsem/trsem.csproj | 2 +- src/trsort/readme.md | 2 +- src/trsort/trsort.csproj | 2 +- src/trsplit/readme.md | 2 +- src/trsplit/trsplit.csproj | 2 +- src/trsponge/readme.md | 2 +- src/trsponge/trsponge.csproj | 2 +- src/trst/readme.md | 2 +- src/trst/trst.csproj | 2 +- src/trstrip/readme.md | 2 +- src/trstrip/trstrip.csproj | 2 +- src/trtext/readme.md | 2 +- src/trtext/trtext.csproj | 2 +- src/trthompson/readme.md | 2 +- src/trthompson/trthompson.csproj | 2 +- src/trtokens/readme.md | 2 +- src/trtokens/trtokens.csproj | 2 +- src/trtree/readme.md | 2 +- src/trtree/trtree.csproj | 2 +- src/trull/readme.md | 2 +- src/trull/trull.csproj | 2 +- src/trunfold/readme.md | 2 +- src/trunfold/trunfold.csproj | 2 +- src/trungroup/readme.md | 2 +- src/trungroup/trungroup.csproj | 2 +- src/trwdog/readme.md | 2 +- src/trwdog/trwdog.csproj | 2 +- src/trxgrep/readme.md | 2 +- src/trxgrep/trxgrep.csproj | 2 +- src/trxml/readme.md | 2 +- src/trxml/trxml.csproj | 2 +- src/trxml2/readme.md | 2 +- src/trxml2/trxml2.csproj | 2 +- 116 files changed, 477 insertions(+), 137 deletions(-) create mode 100644 src/trgen/templates/Java/st.MyDiagnosticErrorListener.java diff --git a/_scripts/bumpbase.sh b/_scripts/bumpbase.sh index 10231799f..ea5ad2e62 100644 --- a/_scripts/bumpbase.sh +++ b/_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` diff --git a/_scripts/publish.sh b/_scripts/publish.sh index 6320c6ca0..03cea8dff 100644 --- a/_scripts/publish.sh +++ b/_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 diff --git a/src/tragl/readme.md b/src/tragl/readme.md index fba4668c1..710ef0bd6 100644 --- a/src/tragl/readme.md +++ b/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. diff --git a/src/tragl/tragl.csproj b/src/tragl/tragl.csproj index eca6354a2..cdbf44512 100644 --- a/src/tragl/tragl.csproj +++ b/src/tragl/tragl.csproj @@ -21,7 +21,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/tragl git diff --git a/src/tranalyze/readme.md b/src/tranalyze/readme.md index 8400a7d16..abd9b9f86 100644 --- a/src/tranalyze/readme.md +++ b/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. diff --git a/src/tranalyze/tranalyze.csproj b/src/tranalyze/tranalyze.csproj index 2f987c739..5f2dbff6c 100644 --- a/src/tranalyze/tranalyze.csproj +++ b/src/tranalyze/tranalyze.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/tranalyze git diff --git a/src/trcaret/readme.md b/src/trcaret/readme.md index 9553ebc62..fb1f020b7 100644 --- a/src/trcaret/readme.md +++ b/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. diff --git a/src/trcaret/trcaret.csproj b/src/trcaret/trcaret.csproj index 34e263ded..6102e8c17 100644 --- a/src/trcaret/trcaret.csproj +++ b/src/trcaret/trcaret.csproj @@ -21,7 +21,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trcaret git diff --git a/src/trcombine/readme.md b/src/trcombine/readme.md index c274b1df1..dc71d45d9 100644 --- a/src/trcombine/readme.md +++ b/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. diff --git a/src/trcombine/trcombine.csproj b/src/trcombine/trcombine.csproj index 6d7a29488..aa6b407c0 100644 --- a/src/trcombine/trcombine.csproj +++ b/src/trcombine/trcombine.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trcombine git diff --git a/src/trconvert/readme.md b/src/trconvert/readme.md index df3f7bc36..3358b0e4c 100644 --- a/src/trconvert/readme.md +++ b/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. diff --git a/src/trconvert/trconvert.csproj b/src/trconvert/trconvert.csproj index c3a8ce3c5..2d7fb34ea 100644 --- a/src/trconvert/trconvert.csproj +++ b/src/trconvert/trconvert.csproj @@ -20,7 +20,7 @@ syntax. This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trconvert git diff --git a/src/trcover/readme.md b/src/trcover/readme.md index c260e7f3d..22c8623c0 100644 --- a/src/trcover/readme.md +++ b/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. diff --git a/src/trcover/trcover.csproj b/src/trcover/trcover.csproj index f58ab4ad6..1a4f361b7 100644 --- a/src/trcover/trcover.csproj +++ b/src/trcover/trcover.csproj @@ -20,7 +20,7 @@ for the entire grammar. This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trcover git diff --git a/src/trdelabel/readme.md b/src/trdelabel/readme.md index e9fe934b1..0a6630068 100644 --- a/src/trdelabel/readme.md +++ b/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. diff --git a/src/trdelabel/trdelabel.csproj b/src/trdelabel/trdelabel.csproj index acce60e1f..29cd564b9 100644 --- a/src/trdelabel/trdelabel.csproj +++ b/src/trdelabel/trdelabel.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdelabel git diff --git a/src/trdelete/readme.md b/src/trdelete/readme.md index f458f8712..3ba04e889 100644 --- a/src/trdelete/readme.md +++ b/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. diff --git a/src/trdelete/trdelete.csproj b/src/trdelete/trdelete.csproj index 4e16529cb..c7a098a6e 100644 --- a/src/trdelete/trdelete.csproj +++ b/src/trdelete/trdelete.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdelete git diff --git a/src/trdeltree/readme.md b/src/trdeltree/readme.md index f80e9338a..4d3808909 100644 --- a/src/trdeltree/readme.md +++ b/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. diff --git a/src/trdeltree/trdeltree.csproj b/src/trdeltree/trdeltree.csproj index 2fdeade40..4e296f405 100644 --- a/src/trdeltree/trdeltree.csproj +++ b/src/trdeltree/trdeltree.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdeltree git diff --git a/src/trdot/readme.md b/src/trdot/readme.md index 904778137..c199ed512 100644 --- a/src/trdot/readme.md +++ b/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. diff --git a/src/trdot/trdot.csproj b/src/trdot/trdot.csproj index e819c2994..c6c8705ef 100644 --- a/src/trdot/trdot.csproj +++ b/src/trdot/trdot.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trdot git diff --git a/src/trenum/readme.md b/src/trenum/readme.md index feb8cc49c..bd4d3c21a 100644 --- a/src/trenum/readme.md +++ b/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. diff --git a/src/trenum/trenum.csproj b/src/trenum/trenum.csproj index cbbd67abf..619c9091b 100644 --- a/src/trenum/trenum.csproj +++ b/src/trenum/trenum.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trull git diff --git a/src/trfirst/readme.md b/src/trfirst/readme.md index ff91b9e9a..9220630ad 100644 --- a/src/trfirst/readme.md +++ b/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. diff --git a/src/trfirst/trfirst.csproj b/src/trfirst/trfirst.csproj index ffb3998cc..b9e831b59 100644 --- a/src/trfirst/trfirst.csproj +++ b/src/trfirst/trfirst.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trfirst git diff --git a/src/trfold/readme.md b/src/trfold/readme.md index a27fab8d4..a2cf0d85f 100644 --- a/src/trfold/readme.md +++ b/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. diff --git a/src/trfold/trfold.csproj b/src/trfold/trfold.csproj index b2352787a..fea376f0d 100644 --- a/src/trfold/trfold.csproj +++ b/src/trfold/trfold.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trfold git diff --git a/src/trfoldlit/readme.md b/src/trfoldlit/readme.md index 26949faee..dfbc473d8 100644 --- a/src/trfoldlit/readme.md +++ b/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. diff --git a/src/trfoldlit/trfoldlit.csproj b/src/trfoldlit/trfoldlit.csproj index 037d6abb7..08ac1f905 100644 --- a/src/trfoldlit/trfoldlit.csproj +++ b/src/trfoldlit/trfoldlit.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trfoldlit git diff --git a/src/trformat/readme.md b/src/trformat/readme.md index 720f4ed2f..6760e7f25 100644 --- a/src/trformat/readme.md +++ b/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. diff --git a/src/trformat/trformat.csproj b/src/trformat/trformat.csproj index c5d9c88f6..218f9c0d1 100644 --- a/src/trformat/trformat.csproj +++ b/src/trformat/trformat.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trformat git diff --git a/src/trgen/Command.cs b/src/trgen/Command.cs index 3a6014fa7..bde69b223 100644 --- a/src/trgen/Command.cs +++ b/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 failed_modules = new List(); diff --git a/src/trgen/readme.md b/src/trgen/readme.md index 6044d9ba6..a50edc35c 100644 --- a/src/trgen/readme.md +++ b/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. diff --git a/src/trgen/templates/Antlr4cs/st.test.sh b/src/trgen/templates/Antlr4cs/st.test.sh index 24f47bd28..72fd994fc 100644 --- a/src/trgen/templates/Antlr4cs/st.test.sh +++ b/src/trgen/templates/Antlr4cs/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -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/Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- ./bin/Debug/net7.0/Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog ./bin/Debug/net7.0/Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,8 +59,13 @@ do done # Group parsing. -echo "${files[*]}" | trwdog ./bin/Debug/net7.0/Test.exeTest -q -x -tee -tree > parse.txt 2>&1 -status=$? +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- ./bin/Debug/net7.0/Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog ./bin/Debug/net7.0/Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +fi +status="$?" # trwdog returns 255 if it cannot spawn the process. This could happen diff --git a/src/trgen/templates/CSharp/st.ErrorListener.cs b/src/trgen/templates/CSharp/st.ErrorListener.cs index 318cc778c..a387bee64 100644 --- a/src/trgen/templates/CSharp/st.ErrorListener.cs +++ b/src/trgen/templates/CSharp/st.ErrorListener.cs @@ -1,4 +1,4 @@ -// Generated from trgen +// Generated from trgen using Antlr4.Runtime; using Antlr4.Runtime.Misc; @@ -6,6 +6,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Security.Cryptography.X509Certificates; +using Antlr4.Runtime.Atn; +using Antlr4.Runtime.Dfa; +using Antlr4.Runtime.Sharpen; namespace { @@ -37,4 +41,74 @@ public void SyntaxError(TextWriter output, IRecognizer recognizer, S offendingSy } } } + +public class MyDiagnosticErrorListener : DiagnosticErrorListener +{ + public override void ReportAmbiguity​(Parser recognizer, DFA dfa, int startIndex, int stopIndex, + bool exact, BitSet ambigAlts, ATNConfigSet configs) + { + NewMethod(recognizer, dfa, startIndex, stopIndex, configs); + } + + private void NewMethod(Parser recognizer, DFA dfa, int startIndex, int stopIndex, ATNConfigSet configs) + { + try + { + string decisionDescription = GetDecisionDescription(recognizer, dfa); + string text = ((ITokenStream)recognizer.InputStream).GetText(Interval.Of(startIndex, stopIndex)); + int line = recognizer.CurrentToken.Line; + int col = recognizer.CurrentToken.Column; + System.Console.WriteLine(line + ":" + col + " " + decisionDescription + " " + text); + System.Console.WriteLine(configs); + foreach (var e in configs.Elements) + { + ATNState s = e.state; + PredictionContext c = e.context; + System.Console.WriteLine(OutIt(recognizer, c)); + } + } + catch (RecognitionException e) + { + System.Console.WriteLine("catch"); + } + } + + public override void ReportAttemptingFullContext(Parser recognizer, DFA dfa, int startIndex, int stopIndex, BitSet conflictingAlts, + ATNConfigSet configs) + { + string decisionDescription = GetDecisionDescription(recognizer, dfa); + string text = ((ITokenStream)recognizer.InputStream).GetText(Interval.Of(startIndex, stopIndex)); + string msg = $"reportAttemptingFullContext d={decisionDescription}, input='{text}'"; + System.Console.WriteLine(msg); + NewMethod(recognizer, dfa, startIndex, stopIndex, configs); + } + + public override void ReportContextSensitivity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, int prediction, + ATNConfigSet configs) + { + string decisionDescription = GetDecisionDescription(recognizer, dfa); + string text = ((ITokenStream)recognizer.InputStream).GetText(Interval.Of(startIndex, stopIndex)); + string msg = $"reportContextSensitivity d={decisionDescription}, input='{text}'"; + System.Console.WriteLine(msg); + NewMethod(recognizer, dfa, startIndex, stopIndex, configs); + } + + string OutIt(Parser recognizer, PredictionContext p) + { + if (p == null) return ""; + var str = OutIt(recognizer, p.GetParent(0)); + int rs = p.GetReturnState(0); + if (rs != PredictionContext.EMPTY_RETURN_STATE) + { + var a = recognizer.Atn; + var ss = a.states[rs]; + var riss = ss.ruleIndex; + if (riss \< 0) return ""; + var rnss = recognizer.RuleNames[riss]; + if (str != "") str = str + " -> "; + return str + rnss; + } + return ""; + } +} } diff --git a/src/trgen/templates/CSharp/st.Test.cs b/src/trgen/templates/CSharp/st.Test.cs index 2a5074281..0126fdc31 100644 --- a/src/trgen/templates/CSharp/st.Test.cs +++ b/src/trgen/templates/CSharp/st.Test.cs @@ -86,6 +86,7 @@ public static IParseTree Parse(string input) static bool show_tree = false; static bool show_tokens = false; static bool show_trace = false; + static bool show_diagnostic = false; static bool old = false; static bool two_byte = false; static int exit_code = 0; @@ -100,7 +101,11 @@ static void Main(string[] args) List\ inputs = new List\(); for (int i = 0; i \< args.Length; ++i) { - if (args[i] == "-profile") + if (args[i] == "-d") + { + show_diagnostic = true; + } + else if (args[i] == "-profile") { show_profile = true; } @@ -249,6 +254,10 @@ static void DoParse(ICharStream str, string input_name, int row_number) parser.RemoveErrorListeners(); lexer.AddErrorListener(listener_lexer); parser.AddErrorListener(listener_parser); + if (show_diagnostic) + { + parser.AddErrorListener(new MyDiagnosticErrorListener()); + } if (show_profile) { parser.Profile = true; diff --git a/src/trgen/templates/CSharp/st.test.sh b/src/trgen/templates/CSharp/st.test.sh index 0a82f3eff..5955005a4 100644 --- a/src/trgen/templates/CSharp/st.test.sh +++ b/src/trgen/templates/CSharp/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 - dotnet trwdog -- ./bin/Debug/net7.0/Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- ./bin/Debug/net7.0/Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog ./bin/Debug/net7.0/Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- ./bin/Debug/net7.0/Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- ./bin/Debug/net7.0/Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog ./bin/Debug/net7.0/Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgen/templates/Cpp/st.test.sh b/src/trgen/templates/Cpp/st.test.sh index d8f9b8974..0e11c7ebb 100644 --- a/src/trgen/templates/Cpp/st.test.sh +++ b/src/trgen/templates/Cpp/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 - dotnet trwdog -- ./build/Release/ -q -tee -tree $f >> parse.txt + if [ "$global" == "" ] + then + dotnet trwdog -- ./build/Release/ -q -tee -tree $f >> parse.txt + else + trwdog ./build/Release/ -q -tee -tree $f >> parse.txt + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,8 +59,13 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- ./build/Release/ -q -x -tee -tree > parse.txt 2>&1 -status=$? +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- ./build/Release/ -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog ./build/Release/ -q -x -tee -tree > parse.txt 2>&1 +fi +status="$?" # trwdog returns 255 if it cannot spawn the process. This could happen diff --git a/src/trgen/templates/Dart/st.test.sh b/src/trgen/templates/Dart/st.test.sh index 873a57590..136de3c44 100644 --- a/src/trgen/templates/Dart/st.test.sh +++ b/src/trgen/templates/Dart/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 - dotnet trwdog -- ./Test.exe -q -tee -tree $f >> parse.txt + if [ "$global" == "" ] + then + dotnet trwdog -- ./Test.exe -q -tee -tree $f >> parse.txt + else + trwdog ./Test.exe -q -tee -tree $f >> parse.txt + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- ./Test.exe -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- ./Test.exe -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog ./Test.exe -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgen/templates/Go/st.test.sh b/src/trgen/templates/Go/st.test.sh index 62cf0dcdc..b783df9d8 100644 --- a/src/trgen/templates/Go/st.test.sh +++ b/src/trgen/templates/Go/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 ) @@ -32,12 +40,17 @@ do done # Parse all input files. -# Individual parsing. +# Individual parsing. rm -f parse.txt for f in ${files[*]} do - dotnet trwdog -- ./Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- ./Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog ./Test.exeTest -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- ./Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- ./Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog ./Test.exeTest -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgen/templates/Java/st.MyDiagnosticErrorListener.java b/src/trgen/templates/Java/st.MyDiagnosticErrorListener.java new file mode 100644 index 000000000..83eff9d25 --- /dev/null +++ b/src/trgen/templates/Java/st.MyDiagnosticErrorListener.java @@ -0,0 +1,86 @@ +// Generated from trgen + +import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.dfa.*; +import org.antlr.v4.runtime.misc.*; +import java.nio.charset.StandardCharsets; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.PrintStream; +import java.util.BitSet; + + +public class MyDiagnosticErrorListener extends DiagnosticErrorListener +{ + @Override + public void reportAmbiguity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, + boolean exact, BitSet ambigAlts, ATNConfigSet configs) + { + NewMethod(recognizer, dfa, startIndex, stopIndex, configs); + } + + private void NewMethod(Parser recognizer, DFA dfa, int startIndex, int stopIndex, ATNConfigSet configs) + { + try + { + String decisionDescription = getDecisionDescription(recognizer, dfa); + String text = recognizer.getTokenStream().getText(Interval.of(startIndex, stopIndex)); + int line = recognizer.getCurrentToken().getLine(); + int col = recognizer.getCurrentToken().getCharPositionInLine(); + System.out.println(line + ":" + col + " " + decisionDescription + " " + text); + System.out.println(configs); + for (ATNConfig config : configs.elements()) { + ATNState s = config.state; + PredictionContext c = config.context; + System.out.println(OutIt(recognizer, c)); + } + } + catch (RecognitionException e) + { + System.out.println("catch"); + } + } + + @Override + public void reportAttemptingFullContext(Parser recognizer, DFA dfa, int startIndex, int stopIndex, BitSet conflictingAlts, + ATNConfigSet configs) + { + String format = "reportAttemptingFullContext d=%s, input='%s'"; + String decision = getDecisionDescription(recognizer, dfa); + String text = recognizer.getTokenStream().getText(Interval.of(startIndex, stopIndex)); + String msg = String.format(format, decision, text); + System.out.println(msg); + NewMethod(recognizer, dfa, startIndex, stopIndex, configs); + } + + @Override + public void reportContextSensitivity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, int prediction, + ATNConfigSet configs) + { + String format = "reportContextSensitivity d=%s, input='%s'"; + String decision = getDecisionDescription(recognizer, dfa); + String text = recognizer.getTokenStream().getText(Interval.of(startIndex, stopIndex)); + String msg = String.format(format, decision, text); + System.out.println(msg); + NewMethod(recognizer, dfa, startIndex, stopIndex, configs); + } + + String OutIt(Parser recognizer, PredictionContext p) + { + if (p == null) return ""; + var str = OutIt(recognizer, p.getParent(0)); + int rs = p.getReturnState(0); + if (rs != PredictionContext.EMPTY_RETURN_STATE) + { + var a = recognizer.getATN(); + var ss = a.states.get(rs); + var riss = ss.ruleIndex; + if (riss \< 0) return ""; + var rnss = recognizer.getRuleNames()[riss]; + if (str != "") str = str + " -> "; + return str + rnss; + } + return ""; + } +} diff --git a/src/trgen/templates/Java/st.Test.java b/src/trgen/templates/Java/st.Test.java index 99a96f222..6cd42b647 100644 --- a/src/trgen/templates/Java/st.Test.java +++ b/src/trgen/templates/Java/st.Test.java @@ -25,6 +25,7 @@ public class Test { static boolean show_tree = false; static boolean show_tokens = false; static boolean show_trace = false; + static boolean show_diagnostic = false; static int error_code = 0; static java.nio.charset.Charset charset = null; static int string_instance = 0; @@ -37,7 +38,11 @@ public static void main(String[] args) throws FileNotFoundException, IOExceptio List\ inputs = new ArrayList\(); for (int i = 0; i \< args.length; ++i) { - if (args[i].equals("-profile")) + if (args[i].equals("-d")) + { + show_diagnostic = true; + } + else if (args[i].equals("-profile")) { show_profile = true; } @@ -169,6 +174,10 @@ static void DoParse(CharStream str, String input_name, int row_number) { lexer.removeErrorListeners(); parser.addErrorListener(listener_parser); lexer.addErrorListener(listener_lexer); + if (show_diagnostic) + { + parser.addErrorListener(new MyDiagnosticErrorListener()); + } if (show_trace) { parser.setTrace(true); diff --git a/src/trgen/templates/Java/st.test.sh b/src/trgen/templates/Java/st.test.sh index c39b0a5ab..7d782fd32 100644 --- a/src/trgen/templates/Java/st.test.sh +++ b/src/trgen/templates/Java/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 ) @@ -40,7 +48,12 @@ CLASSPATH="$JAR\;:." rm -f parse.txt for f in ${files[*]} do - dotnet trwdog -- java -classpath "$CLASSPATH" Test -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- java -classpath "$CLASSPATH" Test -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog java -classpath "$CLASSPATH" Test -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -49,7 +62,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- java -classpath "$CLASSPATH" Test -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- java -classpath "$CLASSPATH" Test -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog java -classpath "$CLASSPATH" Test -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgen/templates/JavaScript/st.test.sh b/src/trgen/templates/JavaScript/st.test.sh index 7af61b6ca..ca8d236b6 100644 --- a/src/trgen/templates/JavaScript/st.test.sh +++ b/src/trgen/templates/JavaScript/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 - dotnet trwdog -- node Test.js -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- node Test.js -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog node Test.js -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- node Test.js -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- node Test.js -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog node Test.js -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgen/templates/Python3/st.test.sh b/src/trgen/templates/Python3/st.test.sh index ef25d012d..2ddeafe69 100644 --- a/src/trgen/templates/Python3/st.test.sh +++ b/src/trgen/templates/Python3/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 - dotnet trwdog -- python3 Test.py -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- python3 Test.py -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog python3 Test.py -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- python3 Test.py -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- python3 Test.py -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog python3 Test.py -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgen/templates/TypeScript/st.test.sh b/src/trgen/templates/TypeScript/st.test.sh index ea39c5ba1..2c6a6bb0d 100644 --- a/src/trgen/templates/TypeScript/st.test.sh +++ b/src/trgen/templates/TypeScript/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# 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 ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet 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 - dotnet trwdog -- sh -c "ts-node Test.js -q -tee -tree $f" >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- sh -c "ts-node Test.js -q -tee -tree $f" >> parse.txt 2>&1 + else + trwdog sh -c "ts-node Test.js -q -tee -tree $f" >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- sh -c "ts-node Test.js -q -x -tee -tree" > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- sh -c "ts-node Test.js -q -x -tee -tree" > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog sh -c "ts-node Test.js -q -x -tee -tree" > parse.txt 2>&1 +fi status="$?" diff --git a/src/trgen/trgen.csproj b/src/trgen/trgen.csproj index d4c0d22f9..6ad858359 100644 --- a/src/trgen/trgen.csproj +++ b/src/trgen/trgen.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trgen git diff --git a/src/trgen2/Command.cs b/src/trgen2/Command.cs index 9da9c9629..207a94acb 100644 --- a/src/trgen2/Command.cs +++ b/src/trgen2/Command.cs @@ -64,7 +64,7 @@ public int Execute(Config config) return 0; } - public static string version = "0.21.1"; + public static string version = "0.21.2"; public List all_source_files = null; public List all_target_files = null; public string root_directory; diff --git a/src/trgen2/readme.md b/src/trgen2/readme.md index 4102b4eea..c5986e717 100644 --- a/src/trgen2/readme.md +++ b/src/trgen2/readme.md @@ -19,4 +19,4 @@ The generated parser is placed in the directory /Generated/. ## 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. diff --git a/src/trgen2/trgen2.csproj b/src/trgen2/trgen2.csproj index fad69822e..931796bfe 100644 --- a/src/trgen2/trgen2.csproj +++ b/src/trgen2/trgen2.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trgen2 git diff --git a/src/trgroup/readme.md b/src/trgroup/readme.md index 41062957c..fd21d6bf0 100644 --- a/src/trgroup/readme.md +++ b/src/trgroup/readme.md @@ -56,4 +56,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. diff --git a/src/triconv/readme.md b/src/triconv/readme.md index 27b0fdb3a..b33aa79cf 100644 --- a/src/triconv/readme.md +++ b/src/triconv/readme.md @@ -20,4 +20,4 @@ unicode. ## 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. diff --git a/src/triconv/triconv.csproj b/src/triconv/triconv.csproj index 23defe68e..98afa133b 100644 --- a/src/triconv/triconv.csproj +++ b/src/triconv/triconv.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trxml2 git diff --git a/src/trinsert/readme.md b/src/trinsert/readme.md index 7ad2603ba..f91d4ca6e 100644 --- a/src/trinsert/readme.md +++ b/src/trinsert/readme.md @@ -43,4 +43,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. diff --git a/src/trinsert/trinsert.csproj b/src/trinsert/trinsert.csproj index c429e0ff3..be7c61e18 100644 --- a/src/trinsert/trinsert.csproj +++ b/src/trinsert/trinsert.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trinsert git diff --git a/src/tritext/readme.md b/src/tritext/readme.md index 190c2e24f..2d00c6a09 100644 --- a/src/tritext/readme.md +++ b/src/tritext/readme.md @@ -18,4 +18,4 @@ Get strings from a PDF file using IText. ## 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. diff --git a/src/tritext/tritext.csproj b/src/tritext/tritext.csproj index 39ac6ac18..30167a02f 100644 --- a/src/tritext/tritext.csproj +++ b/src/tritext/tritext.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/tritext git diff --git a/src/trjson/readme.md b/src/trjson/readme.md index 3c4845d21..1c2c99023 100644 --- a/src/trjson/readme.md +++ b/src/trjson/readme.md @@ -18,4 +18,4 @@ Read a parse tree from stdin and write a JSON represenation of it. ## 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. diff --git a/src/trjson/trjson.csproj b/src/trjson/trjson.csproj index 55522d407..19505912b 100644 --- a/src/trjson/trjson.csproj +++ b/src/trjson/trjson.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trjson git diff --git a/src/trkleene/readme.md b/src/trkleene/readme.md index dea80217e..3b14e0b06 100644 --- a/src/trkleene/readme.md +++ b/src/trkleene/readme.md @@ -38,4 +38,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. diff --git a/src/trkleene/trkleene.csproj b/src/trkleene/trkleene.csproj index 8e76bc512..cf97f8794 100644 --- a/src/trkleene/trkleene.csproj +++ b/src/trkleene/trkleene.csproj @@ -21,7 +21,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trkleene git diff --git a/src/trmove/readme.md b/src/trmove/readme.md index 25a7b22e9..8e06e985f 100644 --- a/src/trmove/readme.md +++ b/src/trmove/readme.md @@ -43,4 +43,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. diff --git a/src/trmove/trmove.csproj b/src/trmove/trmove.csproj index cb64a622b..9203b1fe0 100644 --- a/src/trmove/trmove.csproj +++ b/src/trmove/trmove.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trmove git diff --git a/src/trparse/readme.md b/src/trparse/readme.md index 694ba98a4..6c48684e3 100644 --- a/src/trparse/readme.md +++ b/src/trparse/readme.md @@ -49,4 +49,4 @@ the `--type` command-line option: ## 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. diff --git a/src/trparse/trparse.csproj b/src/trparse/trparse.csproj index 402f30d82..2780f33ae 100644 --- a/src/trparse/trparse.csproj +++ b/src/trparse/trparse.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trparse git diff --git a/src/trperf/readme.md b/src/trperf/readme.md index b286bddb1..dad72f1be 100644 --- a/src/trperf/readme.md +++ b/src/trperf/readme.md @@ -27,4 +27,4 @@ be in a trgen-generated parser directory, or use the -p option. ## 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. diff --git a/src/trperf/trperf.csproj b/src/trperf/trperf.csproj index 52e7561ab..462151aa0 100644 --- a/src/trperf/trperf.csproj +++ b/src/trperf/trperf.csproj @@ -21,7 +21,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trperf git diff --git a/src/trpiggy/readme.md b/src/trpiggy/readme.md index 710ca7f67..feeebc88a 100644 --- a/src/trpiggy/readme.md +++ b/src/trpiggy/readme.md @@ -63,4 +63,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. diff --git a/src/trpiggy/trpiggy.csproj b/src/trpiggy/trpiggy.csproj index 556ce9c99..8899d4ec8 100644 --- a/src/trpiggy/trpiggy.csproj +++ b/src/trpiggy/trpiggy.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trpiggy git diff --git a/src/trprint/readme.md b/src/trprint/readme.md index c7c6a69c2..25c2bd071 100644 --- a/src/trprint/readme.md +++ b/src/trprint/readme.md @@ -18,4 +18,4 @@ Read stdin and print out the text for the tree. ## 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. diff --git a/src/trprint/trprint.csproj b/src/trprint/trprint.csproj index da68418cc..f018c623e 100644 --- a/src/trprint/trprint.csproj +++ b/src/trprint/trprint.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trprint git diff --git a/src/trquery/readme.md b/src/trquery/readme.md index 63fdb0e5c..18d8e2a3e 100644 --- a/src/trquery/readme.md +++ b/src/trquery/readme.md @@ -27,4 +27,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. diff --git a/src/trquery/trquery.csproj b/src/trquery/trquery.csproj index b43c4816b..07d8a7454 100644 --- a/src/trquery/trquery.csproj +++ b/src/trquery/trquery.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trquery git diff --git a/src/trrename/readme.md b/src/trrename/readme.md index a20ac92b8..781dbc0da 100644 --- a/src/trrename/readme.md +++ b/src/trrename/readme.md @@ -27,4 +27,4 @@ make sure to enclose the argument as it contains semi-colons. ## 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. diff --git a/src/trrename/trrename.csproj b/src/trrename/trrename.csproj index c01cad36f..f1dcafbfe 100644 --- a/src/trrename/trrename.csproj +++ b/src/trrename/trrename.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trrename git diff --git a/src/trreplace/readme.md b/src/trreplace/readme.md index 1bf3669f2..293468432 100644 --- a/src/trreplace/readme.md +++ b/src/trreplace/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. diff --git a/src/trreplace/trreplace.csproj b/src/trreplace/trreplace.csproj index 91cb17f3c..000de1c6c 100644 --- a/src/trreplace/trreplace.csproj +++ b/src/trreplace/trreplace.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trreplace git diff --git a/src/trrr/readme.md b/src/trrr/readme.md index d45f640cd..5aff87ad5 100644 --- a/src/trrr/readme.md +++ b/src/trrr/readme.md @@ -14,4 +14,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. diff --git a/src/trrr/trrr.csproj b/src/trrr/trrr.csproj index 5a2670640..fa3dcc5b9 100644 --- a/src/trrr/trrr.csproj +++ b/src/trrr/trrr.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trrr git diff --git a/src/trrup/readme.md b/src/trrup/readme.md index f8776411f..7bbde2c19 100644 --- a/src/trrup/readme.md +++ b/src/trrup/readme.md @@ -42,4 +42,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. diff --git a/src/trrup/trrup.csproj b/src/trrup/trrup.csproj index 6ec9eb572..1361e68fe 100644 --- a/src/trrup/trrup.csproj +++ b/src/trrup/trrup.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trrup git diff --git a/src/trsem/readme.md b/src/trsem/readme.md index 91e72c32e..b624dd17b 100644 --- a/src/trsem/readme.md +++ b/src/trsem/readme.md @@ -18,4 +18,4 @@ Read a static semantics spec file and generate code. ## 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. diff --git a/src/trsem/trsem.csproj b/src/trsem/trsem.csproj index ce4e5eb9e..5d8941cc8 100644 --- a/src/trsem/trsem.csproj +++ b/src/trsem/trsem.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trsem git diff --git a/src/trsort/readme.md b/src/trsort/readme.md index cd75ddbe4..05e9be948 100644 --- a/src/trsort/readme.md +++ b/src/trsort/readme.md @@ -37,4 +37,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. diff --git a/src/trsort/trsort.csproj b/src/trsort/trsort.csproj index 92cfb097e..52eee58f5 100644 --- a/src/trsort/trsort.csproj +++ b/src/trsort/trsort.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trsort git diff --git a/src/trsplit/readme.md b/src/trsplit/readme.md index 8a130f297..a4ccebcf6 100644 --- a/src/trsplit/readme.md +++ b/src/trsplit/readme.md @@ -45,4 +45,4 @@ modified. ## 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. diff --git a/src/trsplit/trsplit.csproj b/src/trsplit/trsplit.csproj index ccff04efa..47fba5dfe 100644 --- a/src/trsplit/trsplit.csproj +++ b/src/trsplit/trsplit.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trsplit git diff --git a/src/trsponge/readme.md b/src/trsponge/readme.md index 305292005..49b1a58dd 100644 --- a/src/trsponge/readme.md +++ b/src/trsponge/readme.md @@ -19,4 +19,4 @@ results to file(s). ## 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. diff --git a/src/trsponge/trsponge.csproj b/src/trsponge/trsponge.csproj index 5f10ce7b1..6d6c20d43 100644 --- a/src/trsponge/trsponge.csproj +++ b/src/trsponge/trsponge.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trsponge git diff --git a/src/trst/readme.md b/src/trst/readme.md index 66059ff2d..310e5d151 100644 --- a/src/trst/readme.md +++ b/src/trst/readme.md @@ -18,4 +18,4 @@ Output tree using the Antlr runtime ToStringTree(). ## 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. diff --git a/src/trst/trst.csproj b/src/trst/trst.csproj index da223546b..a5ddfe81f 100644 --- a/src/trst/trst.csproj +++ b/src/trst/trst.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trst git diff --git a/src/trstrip/readme.md b/src/trstrip/readme.md index 40e6a062f..c34639d8f 100644 --- a/src/trstrip/readme.md +++ b/src/trstrip/readme.md @@ -19,4 +19,4 @@ of all comments, labels, and action blocks. ## 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. diff --git a/src/trstrip/trstrip.csproj b/src/trstrip/trstrip.csproj index b72a7178a..00be0cdfc 100644 --- a/src/trstrip/trstrip.csproj +++ b/src/trstrip/trstrip.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trstrip git diff --git a/src/trtext/readme.md b/src/trtext/readme.md index 524634efe..b3a7f7a46 100644 --- a/src/trtext/readme.md +++ b/src/trtext/readme.md @@ -19,4 +19,4 @@ specified, the line number range for the tree is printed. ## 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. diff --git a/src/trtext/trtext.csproj b/src/trtext/trtext.csproj index ca362f2ca..3c4e84068 100644 --- a/src/trtext/trtext.csproj +++ b/src/trtext/trtext.csproj @@ -21,7 +21,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trtext git diff --git a/src/trthompson/readme.md b/src/trthompson/readme.md index 950601486..c74c2a1f0 100644 --- a/src/trthompson/readme.md +++ b/src/trthompson/readme.md @@ -12,4 +12,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. diff --git a/src/trthompson/trthompson.csproj b/src/trthompson/trthompson.csproj index 405fc5a13..a3f6cfab4 100644 --- a/src/trthompson/trthompson.csproj +++ b/src/trthompson/trthompson.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trthompson git diff --git a/src/trtokens/readme.md b/src/trtokens/readme.md index 6924584c9..7691fd995 100644 --- a/src/trtokens/readme.md +++ b/src/trtokens/readme.md @@ -52,4 +52,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. diff --git a/src/trtokens/trtokens.csproj b/src/trtokens/trtokens.csproj index f9a4f7194..b7f5279eb 100644 --- a/src/trtokens/trtokens.csproj +++ b/src/trtokens/trtokens.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trtokens git diff --git a/src/trtree/readme.md b/src/trtree/readme.md index 1c12678bc..f39ee9099 100644 --- a/src/trtree/readme.md +++ b/src/trtree/readme.md @@ -18,4 +18,4 @@ Reads a tree from stdin and prints the tree as an indented node list. ## 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. diff --git a/src/trtree/trtree.csproj b/src/trtree/trtree.csproj index 61c664086..939f5bb66 100644 --- a/src/trtree/trtree.csproj +++ b/src/trtree/trtree.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trtree git diff --git a/src/trull/readme.md b/src/trull/readme.md index d546ca20a..1ad6ea4c2 100644 --- a/src/trull/readme.md +++ b/src/trull/readme.md @@ -63,4 +63,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. diff --git a/src/trull/trull.csproj b/src/trull/trull.csproj index 8f15d91ed..2369540a4 100644 --- a/src/trull/trull.csproj +++ b/src/trull/trull.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trull git diff --git a/src/trunfold/readme.md b/src/trunfold/readme.md index cf319f7c1..23d5e9f62 100644 --- a/src/trunfold/readme.md +++ b/src/trunfold/readme.md @@ -51,5 +51,5 @@ 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. diff --git a/src/trunfold/trunfold.csproj b/src/trunfold/trunfold.csproj index 85977078b..9d659cb18 100644 --- a/src/trunfold/trunfold.csproj +++ b/src/trunfold/trunfold.csproj @@ -20,7 +20,7 @@ in the parse tree. This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trunfold git diff --git a/src/trungroup/readme.md b/src/trungroup/readme.md index c1caf9f43..9aad86085 100644 --- a/src/trungroup/readme.md +++ b/src/trungroup/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. diff --git a/src/trungroup/trungroup.csproj b/src/trungroup/trungroup.csproj index b63775e67..f39cc4cca 100644 --- a/src/trungroup/trungroup.csproj +++ b/src/trungroup/trungroup.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trungroup git diff --git a/src/trwdog/readme.md b/src/trwdog/readme.md index 7a86172cb..641f5ca66 100644 --- a/src/trwdog/readme.md +++ b/src/trwdog/readme.md @@ -18,4 +18,4 @@ Execute a command with a watchdog timer. ## 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. diff --git a/src/trwdog/trwdog.csproj b/src/trwdog/trwdog.csproj index 1da64d079..3439b1c66 100644 --- a/src/trwdog/trwdog.csproj +++ b/src/trwdog/trwdog.csproj @@ -21,7 +21,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trwdog git diff --git a/src/trxgrep/readme.md b/src/trxgrep/readme.md index 94608b5b2..f55fb60f5 100644 --- a/src/trxgrep/readme.md +++ b/src/trxgrep/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. diff --git a/src/trxgrep/trxgrep.csproj b/src/trxgrep/trxgrep.csproj index 4c723b47a..7e274dc6d 100644 --- a/src/trxgrep/trxgrep.csproj +++ b/src/trxgrep/trxgrep.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trxgrep git diff --git a/src/trxml/readme.md b/src/trxml/readme.md index 686e1a7ea..ac0ee2f13 100644 --- a/src/trxml/readme.md +++ b/src/trxml/readme.md @@ -18,4 +18,4 @@ Read a tree from stdin and write an XML represenation of it. ## 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. diff --git a/src/trxml/trxml.csproj b/src/trxml/trxml.csproj index 3fc73ceba..f9a09470a 100644 --- a/src/trxml/trxml.csproj +++ b/src/trxml/trxml.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trxml git diff --git a/src/trxml2/readme.md b/src/trxml2/readme.md index c51884fb7..c900ae1f7 100644 --- a/src/trxml2/readme.md +++ b/src/trxml2/readme.md @@ -18,4 +18,4 @@ Read an xml file and enumerate all paths to elements in xpath syntax. ## 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. diff --git a/src/trxml2/trxml2.csproj b/src/trxml2/trxml2.csproj index 2e641f619..d066bf03b 100644 --- a/src/trxml2/trxml2.csproj +++ b/src/trxml2/trxml2.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trxml2 git