diff --git a/_scripts/set-version.sh b/_scripts/set-version.sh index f9bc898ec..6674f2253 100644 --- a/_scripts/set-version.sh +++ b/_scripts/set-version.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash -version="0.23.5" +version="0.23.6" cd src directories=`find . -maxdepth 1 -type d -name "tr*"` cwd=`pwd` diff --git a/_tests/trgen-targets/Expression.g4 b/_tests/trgen-targets/Expression.g4 new file mode 100644 index 000000000..b7bd42d23 --- /dev/null +++ b/_tests/trgen-targets/Expression.g4 @@ -0,0 +1,15 @@ +grammar Expression; + +start: (multiply | divide | add | subtract) EOF; + +expression: '(' expression ')' | number; + +multiply: expression '*' expression; +divide: expression '/' expression; +add: expression '+' expression; +subtract: expression '-' expression; + +number: NUMBER; + +NUMBER: [0-9]+; +WS: [ \t\r\n]+ -> skip; \ No newline at end of file diff --git a/_tests/trgen-targets/test.sh b/_tests/trgen-targets/test.sh new file mode 100644 index 000000000..3fe0379e5 --- /dev/null +++ b/_tests/trgen-targets/test.sh @@ -0,0 +1,25 @@ +# +trap 'LAST_COMMAND=$CURRENT_COMMAND; CURRENT_COMMAND=$BASH_COMMAND' DEBUG +trap 'ERROR_CODE=$?; FAILED_COMMAND=$LAST_COMMAND; tput setaf 1; echo "ERROR: command \"$FAILED_COMMAND\" failed with exit code $ERROR_CODE"; put sgr0;' ERR INT TERM +export MSYS2_ARG_CONV_EXCL="*" +where=`dirname -- "$0"` +cd "$where" +where=`pwd` +cd "$where" +echo "$where" + +for target in Antlr4ng CSharp Cpp Dart Java JavaScript Python3 TypeScript Go +do + trgen -t $target + pushd Generated-$target + make + bash run.sh -input '1+2' + if [ "$?" != "0" ] + then + echo Test failed. + exit 1 + fi + popd +done +echo Test succeeded. +exit 0 diff --git a/src/tragl/readme.md b/src/tragl/readme.md index d0dc46272..4ca48497a 100644 --- a/src/tragl/readme.md +++ b/src/tragl/readme.md @@ -19,7 +19,7 @@ This tool is part of Trash, Transformations for Antlr Shell. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/tragl/tragl.csproj b/src/tragl/tragl.csproj index 1ecacdc4a..e27c17183 100644 --- a/src/tragl/tragl.csproj +++ b/src/tragl/tragl.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/tragl git diff --git a/src/tranalyze/readme.md b/src/tranalyze/readme.md index caf6e7318..047d29959 100644 --- a/src/tranalyze/readme.md +++ b/src/tranalyze/readme.md @@ -65,7 +65,7 @@ _Output_ ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/tranalyze/tranalyze.csproj b/src/tranalyze/tranalyze.csproj index 7231a6a54..50b3ef71d 100644 --- a/src/tranalyze/tranalyze.csproj +++ b/src/tranalyze/tranalyze.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/tranalyze git diff --git a/src/trcaret/readme.md b/src/trcaret/readme.md index 94b3e2aa3..940659a9b 100644 --- a/src/trcaret/readme.md +++ b/src/trcaret/readme.md @@ -18,7 +18,7 @@ Reads a tree from stdin and prints lines and caret marks. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trcaret/trcaret.csproj b/src/trcaret/trcaret.csproj index f8131119a..b44776ef5 100644 --- a/src/trcaret/trcaret.csproj +++ b/src/trcaret/trcaret.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trcaret git diff --git a/src/trclonereplace/readme.md b/src/trclonereplace/readme.md index bb9983429..6334ac2a4 100644 --- a/src/trclonereplace/readme.md +++ b/src/trclonereplace/readme.md @@ -19,7 +19,7 @@ Clone, rename, and replace symbols in a grammar to optimize full stack fallbacks ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trclonereplace/trclonereplace.csproj b/src/trclonereplace/trclonereplace.csproj index dbde957bd..87644b7f2 100644 --- a/src/trclonereplace/trclonereplace.csproj +++ b/src/trclonereplace/trclonereplace.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trclonereplace git diff --git a/src/trcombine/readme.md b/src/trcombine/readme.md index 8f2a2478f..0e1d69184 100644 --- a/src/trcombine/readme.md +++ b/src/trcombine/readme.md @@ -103,7 +103,7 @@ The original grammars are left unchanged. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trcombine/trcombine.csproj b/src/trcombine/trcombine.csproj index 7850535c3..57b6e4ab5 100644 --- a/src/trcombine/trcombine.csproj +++ b/src/trcombine/trcombine.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trcombine git diff --git a/src/trconvert/readme.md b/src/trconvert/readme.md index ca455fc8e..6d6e05dd6 100644 --- a/src/trconvert/readme.md +++ b/src/trconvert/readme.md @@ -93,7 +93,7 @@ _Output_ ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trconvert/trconvert.csproj b/src/trconvert/trconvert.csproj index 35f7db659..a00ec6722 100644 --- a/src/trconvert/trconvert.csproj +++ b/src/trconvert/trconvert.csproj @@ -18,7 +18,7 @@ syntax. This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trconvert git diff --git a/src/trcover/readme.md b/src/trcover/readme.md index 7215234a3..0a8698edc 100644 --- a/src/trcover/readme.md +++ b/src/trcover/readme.md @@ -24,7 +24,7 @@ a grammar. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trcover/trcover.csproj b/src/trcover/trcover.csproj index 3d065de14..ec8feac2a 100644 --- a/src/trcover/trcover.csproj +++ b/src/trcover/trcover.csproj @@ -18,7 +18,7 @@ for the entire grammar. This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trcover git diff --git a/src/trdot/readme.md b/src/trdot/readme.md index d72bae479..19f39451e 100644 --- a/src/trdot/readme.md +++ b/src/trdot/readme.md @@ -63,7 +63,7 @@ The output will be: ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trdot/trdot.csproj b/src/trdot/trdot.csproj index b7cea4189..cdb3dd8e8 100644 --- a/src/trdot/trdot.csproj +++ b/src/trdot/trdot.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trdot git diff --git a/src/trenum/readme.md b/src/trenum/readme.md index 6a722b2fb..2dc3f8de7 100644 --- a/src/trenum/readme.md +++ b/src/trenum/readme.md @@ -8,7 +8,7 @@ ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trenum/trenum.csproj b/src/trenum/trenum.csproj index ba14bb9ee..efd71f0ef 100644 --- a/src/trenum/trenum.csproj +++ b/src/trenum/trenum.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trull git diff --git a/src/trfirst/readme.md b/src/trfirst/readme.md index fb760c404..227474838 100644 --- a/src/trfirst/readme.md +++ b/src/trfirst/readme.md @@ -24,7 +24,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trfirst/trfirst.csproj b/src/trfirst/trfirst.csproj index cea5a02b6..f062adf82 100644 --- a/src/trfirst/trfirst.csproj +++ b/src/trfirst/trfirst.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trfirst git diff --git a/src/trfold/readme.md b/src/trfold/readme.md index 0aa4dc26b..a2f58eff7 100644 --- a/src/trfold/readme.md +++ b/src/trfold/readme.md @@ -26,7 +26,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trfold/trfold.csproj b/src/trfold/trfold.csproj index d4e7bf827..f88c1f53d 100644 --- a/src/trfold/trfold.csproj +++ b/src/trfold/trfold.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trfold git diff --git a/src/trfoldlit/readme.md b/src/trfoldlit/readme.md index 20e41fa42..4fcfa4463 100644 --- a/src/trfoldlit/readme.md +++ b/src/trfoldlit/readme.md @@ -65,7 +65,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trfoldlit/trfoldlit.csproj b/src/trfoldlit/trfoldlit.csproj index 56de5fc51..86047fb2f 100644 --- a/src/trfoldlit/trfoldlit.csproj +++ b/src/trfoldlit/trfoldlit.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trfoldlit git diff --git a/src/trformat/readme.md b/src/trformat/readme.md index 9c6b69f03..8df5951d3 100644 --- a/src/trformat/readme.md +++ b/src/trformat/readme.md @@ -18,7 +18,7 @@ Format of grammar using machine learning. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trformat/trformat.csproj b/src/trformat/trformat.csproj index e75840adb..d35183d1d 100644 --- a/src/trformat/trformat.csproj +++ b/src/trformat/trformat.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trformat git diff --git a/src/trgen/Command.cs b/src/trgen/Command.cs index b4100dfd0..4fbf49f3e 100644 --- a/src/trgen/Command.cs +++ b/src/trgen/Command.cs @@ -300,7 +300,7 @@ private void ModifyWithGrammarParse(Config config) OriginalSourceFileName = sgfn, ParsingResultSet = parsing_result_set, StartSymbol = start_symbol, - WhatType = GrammarTuple.Type.Combined, + WhatType = GrammarTuple.Type.Parser, }; test.tool_grammar_tuples.Add(g); } @@ -412,9 +412,9 @@ private void ModifyWithGrammarParse(Config config) } else { - t.GeneratedFileName = pre1 + t.GrammarName + Suffix(test.target); - t.GeneratedIncludeFileName = pre1 + t.GrammarName + ".h"; - t.GrammarAutomName = pre2 + t.GrammarName; + t.GrammarAutomName = pre2 + t.GrammarName + "Parser"; + t.GeneratedFileName = pre1 + t.GrammarAutomName + Suffix(test.target); + t.GeneratedIncludeFileName = pre1 + t.GrammarAutomName + ".h"; t.GrammarGoNewName = ""; } } @@ -431,14 +431,15 @@ private void ModifyWithGrammarParse(Config config) } else { - t.GeneratedFileName = pre1 + t.GrammarName + Suffix(test.target); - t.GeneratedIncludeFileName = pre1 + t.GrammarName + ".h"; - t.GrammarAutomName = pre2 + t.GrammarName; + t.GrammarAutomName = pre2 + t.GrammarName + "Lexer"; + t.GeneratedFileName = pre1 + t.GrammarAutomName + Suffix(test.target); + t.GeneratedIncludeFileName = pre1 + t.GrammarAutomName + ".h"; t.GrammarGoNewName = ""; } } else if (t.WhatType == GrammarTuple.Type.Combined) { + throw new Exception("Should not execute!"); var pre1 = test.package == "" ? "" : test.package + "/"; var pre2 = test.package.Replace("/", ".") == "" ? "" : test.package.Replace("/", ".") + "."; if (test.target == "Go") @@ -466,17 +467,14 @@ private void ModifyWithGrammarParse(Config config) if (!t.IsTopLevel) continue; if (t.WhatType == GrammarTuple.Type.Parser) { - t.GrammarAutomName = t.GrammarName; t.GrammarGoNewName = "New" + t.GrammarAutomName; } else if (t.WhatType == GrammarTuple.Type.Lexer) { - t.GrammarAutomName = t.GrammarName; t.GrammarGoNewName = "New" + t.GrammarAutomName; } else if (t.WhatType == GrammarTuple.Type.Combined) { - t.GrammarAutomName = test.grammar_name; t.GrammarGoNewName = "New" + t.GrammarAutomName; } } @@ -513,6 +511,7 @@ private void ModifyWithGrammarParse(Config config) } else if (t.WhatType == GrammarTuple.Type.Combined) { + throw new Exception("Should not execute!"); if (test.grammar_name == t.GrammarName) { test.fully_qualified_parser_name = t.GrammarAutomName + "Parser"; @@ -541,7 +540,7 @@ private void ModifyWithGrammarParse(Config config) } } - public static string version = "0.23.5"; + public static string version = "0.23.6"; // For maven-generated code. public List failed_modules = new List(); @@ -1731,7 +1730,10 @@ void ComputeSort(Test test) { if (!graph.Edges.Any(e => e.To == n)) { - test.tool_grammar_tuples.Where(t => t.GrammarName == n).First().IsTopLevel = true; + foreach (var z in test.tool_grammar_tuples.Where(t => t.GrammarName == n)) + { + z.IsTopLevel = true; + } } } diff --git a/src/trgen/Properties/launchSettings.json b/src/trgen/Properties/launchSettings.json index 5c3203c0c..d3706061f 100644 --- a/src/trgen/Properties/launchSettings.json +++ b/src/trgen/Properties/launchSettings.json @@ -2,8 +2,8 @@ "profiles": { "dotnet-antlr": { "commandName": "Project", - "commandLineArgs": "-i save,comp -t CSharp", - "workingDirectory": "C:\\msys64\\home\\Kenne\\fortran" + "commandLineArgs": "-t TypeScript", + "workingDirectory": "C:\\msys64\\home\\Kenne\\temp4" } } } \ No newline at end of file diff --git a/src/trgen/readme.md b/src/trgen/readme.md index 98b8c70fe..0b3755f3c 100644 --- a/src/trgen/readme.md +++ b/src/trgen/readme.md @@ -49,7 +49,7 @@ simplify and eliminate bugs created when adding new grammars. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trgen/templates/TypeScript/package.json b/src/trgen/templates/TypeScript/package.json index 3fc91edaf..e0ec05b3a 100644 --- a/src/trgen/templates/TypeScript/package.json +++ b/src/trgen/templates/TypeScript/package.json @@ -13,6 +13,7 @@ "buffer": "^6.0.3", "fs-extra": "^11.1.1", "timer-node": "^5.0.6", + "typescript-collections": "^1.3.3", "typescript-string-operations": "^1.5.0" }, "type": "module", diff --git a/src/trgen/trgen.csproj b/src/trgen/trgen.csproj index 7d13c722f..7160ea71d 100644 --- a/src/trgen/trgen.csproj +++ b/src/trgen/trgen.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trgen git diff --git a/src/trgenvsc/readme.md b/src/trgenvsc/readme.md index 9505dd41f..f79e07c08 100644 --- a/src/trgenvsc/readme.md +++ b/src/trgenvsc/readme.md @@ -30,7 +30,7 @@ the XPath patterns to match certain parse trees. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trgenvsc/trgenvsc.csproj b/src/trgenvsc/trgenvsc.csproj index 86c262697..723d86bdd 100644 --- a/src/trgenvsc/trgenvsc.csproj +++ b/src/trgenvsc/trgenvsc.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trgenvsc git diff --git a/src/trglob/readme.md b/src/trglob/readme.md index c70c805dd..e37067d2b 100644 --- a/src/trglob/readme.md +++ b/src/trglob/readme.md @@ -17,7 +17,7 @@ Expand a glob string into file names. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trglob/trglob.csproj b/src/trglob/trglob.csproj index 716c11fd0..9da14199b 100644 --- a/src/trglob/trglob.csproj +++ b/src/trglob/trglob.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trglob git diff --git a/src/trgroup/readme.md b/src/trgroup/readme.md index 6f9b1cdd2..b2bd999da 100644 --- a/src/trgroup/readme.md +++ b/src/trgroup/readme.md @@ -56,7 +56,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trgroup/trgroup.csproj b/src/trgroup/trgroup.csproj index 7aff38d92..f25ae1c64 100644 --- a/src/trgroup/trgroup.csproj +++ b/src/trgroup/trgroup.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trgroup git diff --git a/src/triconv/readme.md b/src/triconv/readme.md index 14de4ca0d..7a82429a1 100644 --- a/src/triconv/readme.md +++ b/src/triconv/readme.md @@ -20,7 +20,7 @@ unicode. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/triconv/triconv.csproj b/src/triconv/triconv.csproj index 387f5c570..c257ff8ae 100644 --- a/src/triconv/triconv.csproj +++ b/src/triconv/triconv.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trxml2 git diff --git a/src/tritext/readme.md b/src/tritext/readme.md index 3cb668af1..54cd292b7 100644 --- a/src/tritext/readme.md +++ b/src/tritext/readme.md @@ -18,7 +18,7 @@ Get strings from a PDF file using IText. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/tritext/tritext.csproj b/src/tritext/tritext.csproj index fcd5bf805..3e99cd6a3 100644 --- a/src/tritext/tritext.csproj +++ b/src/tritext/tritext.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/tritext git diff --git a/src/trjson/readme.md b/src/trjson/readme.md index 4c3b8d14a..c336bb0b3 100644 --- a/src/trjson/readme.md +++ b/src/trjson/readme.md @@ -18,7 +18,7 @@ Read a parse tree from stdin and write a JSON represenation of it. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trjson/trjson.csproj b/src/trjson/trjson.csproj index 8fa1fad6b..ccf0a13d1 100644 --- a/src/trjson/trjson.csproj +++ b/src/trjson/trjson.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trjson git diff --git a/src/trkleene/readme.md b/src/trkleene/readme.md index 1f3a6b723..709f619c9 100644 --- a/src/trkleene/readme.md +++ b/src/trkleene/readme.md @@ -38,7 +38,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trkleene/trkleene.csproj b/src/trkleene/trkleene.csproj index 82478fdd4..23385358e 100644 --- a/src/trkleene/trkleene.csproj +++ b/src/trkleene/trkleene.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trkleene git diff --git a/src/trparse/readme.md b/src/trparse/readme.md index 59ad10749..9f5044145 100644 --- a/src/trparse/readme.md +++ b/src/trparse/readme.md @@ -50,7 +50,7 @@ the `--type` command-line option: ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trparse/trparse.csproj b/src/trparse/trparse.csproj index ea8074ff8..778074c79 100644 --- a/src/trparse/trparse.csproj +++ b/src/trparse/trparse.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trparse git diff --git a/src/trperf/readme.md b/src/trperf/readme.md index 1473c4347..312764ebc 100644 --- a/src/trperf/readme.md +++ b/src/trperf/readme.md @@ -41,7 +41,7 @@ be in a trgen-generated parser directory, or use the -p option. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trperf/trperf.csproj b/src/trperf/trperf.csproj index a4469e74f..77409a525 100644 --- a/src/trperf/trperf.csproj +++ b/src/trperf/trperf.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trperf git diff --git a/src/trpiggy/readme.md b/src/trpiggy/readme.md index 454774c78..e36f24c85 100644 --- a/src/trpiggy/readme.md +++ b/src/trpiggy/readme.md @@ -63,7 +63,7 @@ Output: ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trpiggy/trpiggy.csproj b/src/trpiggy/trpiggy.csproj index 1daac93fd..7eb654caa 100644 --- a/src/trpiggy/trpiggy.csproj +++ b/src/trpiggy/trpiggy.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trpiggy git diff --git a/src/trquery/readme.md b/src/trquery/readme.md index 15a4216a7..e277e57e1 100644 --- a/src/trquery/readme.md +++ b/src/trquery/readme.md @@ -47,7 +47,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trquery/trquery.csproj b/src/trquery/trquery.csproj index 1ecddc18d..11e5d6b43 100644 --- a/src/trquery/trquery.csproj +++ b/src/trquery/trquery.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trquery git diff --git a/src/trrename/readme.md b/src/trrename/readme.md index 788a8a9be..ffcadb67c 100644 --- a/src/trrename/readme.md +++ b/src/trrename/readme.md @@ -27,7 +27,7 @@ make sure to enclose the argument as it contains semi-colons. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trrename/trrename.csproj b/src/trrename/trrename.csproj index 9cd7c9e5d..15178d988 100644 --- a/src/trrename/trrename.csproj +++ b/src/trrename/trrename.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trrename git diff --git a/src/trrr/readme.md b/src/trrr/readme.md index 8f68b7cb4..c32a11014 100644 --- a/src/trrr/readme.md +++ b/src/trrr/readme.md @@ -14,7 +14,7 @@ ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trrr/trrr.csproj b/src/trrr/trrr.csproj index 099c755c0..4a92c586f 100644 --- a/src/trrr/trrr.csproj +++ b/src/trrr/trrr.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trrr git diff --git a/src/trrup/readme.md b/src/trrup/readme.md index 6d71dc656..4d2201b88 100644 --- a/src/trrup/readme.md +++ b/src/trrup/readme.md @@ -42,7 +42,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trrup/trrup.csproj b/src/trrup/trrup.csproj index b165dd487..060ce0f40 100644 --- a/src/trrup/trrup.csproj +++ b/src/trrup/trrup.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trrup git diff --git a/src/trsem/readme.md b/src/trsem/readme.md index 4fe0d3431..576063ff2 100644 --- a/src/trsem/readme.md +++ b/src/trsem/readme.md @@ -18,7 +18,7 @@ Read a static semantics spec file and generate code. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trsem/trsem.csproj b/src/trsem/trsem.csproj index 6e7179668..723449a96 100644 --- a/src/trsem/trsem.csproj +++ b/src/trsem/trsem.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trsem git diff --git a/src/trsort/readme.md b/src/trsort/readme.md index 0d272954b..3c4070f81 100644 --- a/src/trsort/readme.md +++ b/src/trsort/readme.md @@ -37,7 +37,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trsort/trsort.csproj b/src/trsort/trsort.csproj index 57b504b9d..7312b2b72 100644 --- a/src/trsort/trsort.csproj +++ b/src/trsort/trsort.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trsort git diff --git a/src/trsplit/readme.md b/src/trsplit/readme.md index 4529675f0..8c86ee1f3 100644 --- a/src/trsplit/readme.md +++ b/src/trsplit/readme.md @@ -45,7 +45,7 @@ modified. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trsplit/trsplit.csproj b/src/trsplit/trsplit.csproj index 4f1725bdb..e28feb977 100644 --- a/src/trsplit/trsplit.csproj +++ b/src/trsplit/trsplit.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trsplit git diff --git a/src/trsponge/readme.md b/src/trsponge/readme.md index 73c3eb25f..301de3b7a 100644 --- a/src/trsponge/readme.md +++ b/src/trsponge/readme.md @@ -19,7 +19,7 @@ results to file(s). ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trsponge/trsponge.csproj b/src/trsponge/trsponge.csproj index 7f5f9bf03..3350dd8ba 100644 --- a/src/trsponge/trsponge.csproj +++ b/src/trsponge/trsponge.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trsponge git diff --git a/src/trst/readme.md b/src/trst/readme.md index fdee15750..560c4b894 100644 --- a/src/trst/readme.md +++ b/src/trst/readme.md @@ -18,7 +18,7 @@ Output tree using the Antlr runtime ToStringTree(). ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trst/trst.csproj b/src/trst/trst.csproj index b298fbee8..74e1094b2 100644 --- a/src/trst/trst.csproj +++ b/src/trst/trst.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trst git diff --git a/src/trtext/readme.md b/src/trtext/readme.md index f062aaae2..e4bd6ce9c 100644 --- a/src/trtext/readme.md +++ b/src/trtext/readme.md @@ -19,7 +19,7 @@ specified, the line number range for the tree is printed. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trtext/trtext.csproj b/src/trtext/trtext.csproj index fe1da7cdf..23eeed941 100644 --- a/src/trtext/trtext.csproj +++ b/src/trtext/trtext.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trtext git diff --git a/src/trthompson/readme.md b/src/trthompson/readme.md index 1c6ce54c6..f96c769f6 100644 --- a/src/trthompson/readme.md +++ b/src/trthompson/readme.md @@ -12,7 +12,7 @@ ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trthompson/trthompson.csproj b/src/trthompson/trthompson.csproj index c2a93276a..40f6202c9 100644 --- a/src/trthompson/trthompson.csproj +++ b/src/trthompson/trthompson.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trthompson git diff --git a/src/trtokens/readme.md b/src/trtokens/readme.md index 55de112dd..b4741fe01 100644 --- a/src/trtokens/readme.md +++ b/src/trtokens/readme.md @@ -52,7 +52,7 @@ Output: ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trtokens/trtokens.csproj b/src/trtokens/trtokens.csproj index 1e2b2aba7..8bfe7c8ce 100644 --- a/src/trtokens/trtokens.csproj +++ b/src/trtokens/trtokens.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trtokens git diff --git a/src/trtree/readme.md b/src/trtree/readme.md index 47df779a2..c7e6bb15e 100644 --- a/src/trtree/readme.md +++ b/src/trtree/readme.md @@ -18,7 +18,7 @@ Reads a tree from stdin and prints the tree as an indented node list. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trtree/trtree.csproj b/src/trtree/trtree.csproj index 6d25fed41..40a373ba3 100644 --- a/src/trtree/trtree.csproj +++ b/src/trtree/trtree.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trtree git diff --git a/src/trull/readme.md b/src/trull/readme.md index aa20d3f7f..19cf51b01 100644 --- a/src/trull/readme.md +++ b/src/trull/readme.md @@ -63,7 +63,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trull/trull.csproj b/src/trull/trull.csproj index b1f82f636..6b4d75cdf 100644 --- a/src/trull/trull.csproj +++ b/src/trull/trull.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trull git diff --git a/src/trunfold/readme.md b/src/trunfold/readme.md index 5fae343b9..f88ead20f 100644 --- a/src/trunfold/readme.md +++ b/src/trunfold/readme.md @@ -51,7 +51,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trunfold/trunfold.csproj b/src/trunfold/trunfold.csproj index de175935c..337d83c84 100644 --- a/src/trunfold/trunfold.csproj +++ b/src/trunfold/trunfold.csproj @@ -18,7 +18,7 @@ in the parse tree. This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trunfold git diff --git a/src/trungroup/readme.md b/src/trungroup/readme.md index 815fc0ad1..e6f3cfc28 100644 --- a/src/trungroup/readme.md +++ b/src/trungroup/readme.md @@ -24,7 +24,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trungroup/trungroup.csproj b/src/trungroup/trungroup.csproj index 662884fbd..7d70636aa 100644 --- a/src/trungroup/trungroup.csproj +++ b/src/trungroup/trungroup.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trungroup git diff --git a/src/trwdog/readme.md b/src/trwdog/readme.md index 409be5b6b..1ded159c7 100644 --- a/src/trwdog/readme.md +++ b/src/trwdog/readme.md @@ -18,7 +18,7 @@ Execute a command with a watchdog timer. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trwdog/trwdog.csproj b/src/trwdog/trwdog.csproj index 056b93d41..fb3d42d76 100644 --- a/src/trwdog/trwdog.csproj +++ b/src/trwdog/trwdog.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trwdog git diff --git a/src/trxgrep/readme.md b/src/trxgrep/readme.md index d7fe0859c..a094db827 100644 --- a/src/trxgrep/readme.md +++ b/src/trxgrep/readme.md @@ -24,7 +24,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trxgrep/trxgrep.csproj b/src/trxgrep/trxgrep.csproj index 674659e1b..900853189 100644 --- a/src/trxgrep/trxgrep.csproj +++ b/src/trxgrep/trxgrep.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit. true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trxgrep git diff --git a/src/trxml/readme.md b/src/trxml/readme.md index b2e562ea2..a38c5eed5 100644 --- a/src/trxml/readme.md +++ b/src/trxml/readme.md @@ -18,7 +18,7 @@ Read a tree from stdin and write an XML represenation of it. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trxml/trxml.csproj b/src/trxml/trxml.csproj index 3eaa9e6f5..321e182ad 100644 --- a/src/trxml/trxml.csproj +++ b/src/trxml/trxml.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trxml git diff --git a/src/trxml2/readme.md b/src/trxml2/readme.md index 78838a8ad..1ddaae664 100644 --- a/src/trxml2/readme.md +++ b/src/trxml2/readme.md @@ -18,7 +18,7 @@ Read an xml file and enumerate all paths to elements in xpath syntax. ## Current version -0.23.5 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. +0.23.6 Add --ambig option to trparse. Add file names to trtree. Add new output styles for trtree. Update packages for trgenvsc templates. ## License diff --git a/src/trxml2/trxml2.csproj b/src/trxml2/trxml2.csproj index 3cb8c2985..92ce3b950 100644 --- a/src/trxml2/trxml2.csproj +++ b/src/trxml2/trxml2.csproj @@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]> true portable true - 0.23.5 + 0.23.6 https://github.com/kaby76/Trash/tree/main/src/trxml2 git