diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 000000000..f88c50108 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,25 @@ +{ + "permissions": { + "allow": [ + "Bash(gh issue:*)", + "WebFetch(domain:chatgpt.com)", + "WebFetch(domain:www.nuget.org)", + "Bash(dotnet sln:*)", + "Bash(dotnet build:*)", + "Bash(grep:*)", + "Bash(ls:*)", + "Bash(dotnet pack:*)", + "Bash(dotnet tool:*)", + "Bash(bash:*)", + "Bash(do:*)", + "Bash(dotnet trash:*)", + "Bash(unzip:*)", + "Bash(git add:*)", + "Bash(git commit:*)", + "Bash(git config:*)", + "Bash(sed:*)", + "Bash(sed s|.*:||:*)", + "Bash(git push:*)" + ] + } +} diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8893e66b2..95bdd3046 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "trash": { - "version": "1.0.0", + "version": "1.1.0", "commands": [ "trash" ], diff --git a/_scripts/publish.sh b/_scripts/publish.sh index 46f23cf4d..b272e29bd 100644 --- a/_scripts/publish.sh +++ b/_scripts/publish.sh @@ -1,4 +1,4 @@ #!/usr/bin/bash -version=1.0.0 +version=1.1.0 cd src dotnet nuget push trash/bin/Release/trash.$version.nupkg --api-key $trashkey --source https://api.nuget.org/v3/index.json diff --git a/_scripts/set-version.sh b/_scripts/set-version.sh index 8d1025619..b696b3199 100644 --- a/_scripts/set-version.sh +++ b/_scripts/set-version.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash #set -e #set -x -version="1.0.0" +version="1.1.0" cd src directories=`find . -maxdepth 1 -type d -name "tr*"` cwd=`pwd` @@ -42,10 +42,10 @@ do do sed -i -e "s%[<][Vv]ersion[>].*[<][/][Vv]ersion[>]%$version%" $csproj done - sed -i -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Unified dispatcher for the Trash toolkit.%' readme.md + sed -i -e 's%^[0-9]*[.][0-9]*[.][0-9]*.*$'"%$version"' Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement.%' readme.md for cs in *.cs do - sed -i -e "s%public string Version { get; set; } = \"0[.][0-9]*[.][0-9]*\";%public string Version { get; set; } = \"$version\";%" $cs + sed -i -e "s%public string Version { get; set; } = \"[0-9][.][0-9]*[.][0-9]*\";%public string Version { get; set; } = \"$version\";%" $cs done cd .. done @@ -80,7 +80,7 @@ do rm -f asdfasdf cat *.csproj | sed -e "s%[<][Vv]ersion[>].*[<][/][Vv]ersion[>]%$version%" > asdfasdf mv asdfasdf *.csproj - sed -i -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Unified dispatcher for the Trash toolkit.%' readme.md + sed -i -e 's%^[0-9]*[.][0-9]*[.][0-9]*.*$'"%$version"' Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement.%' readme.md cd .. done diff --git a/readme.md b/readme.md index 74bceb2f6..c91a5b44b 100644 --- a/readme.md +++ b/readme.md @@ -171,7 +171,7 @@ In order to use the generate parser application, you must first build it: ### Run the generated parser application - dotnet trash parse -i "1+2+3" | dotnet trash tree + trash parse -i "1+2+3" | trash tree After using `trgen` to generate a parser program in C#, shown previously, and after building the program, you can run the parser using `trparse`. This program @@ -183,14 +183,14 @@ with most tools of Trash, is parse tree data. ### Find nodes in the parse tree using XPath - mkdir empty; cd empty; dotnet trash gen; dotnet build Generated/Test.csproj; \ - dotnet trash parse -i "1+2+3" | dotnet trash query "grep //SCIENTIFIC_NUMBER" | trst + mkdir empty; cd empty; trash gen; dotnet build Generated/Test.csproj; \ + trash parse -i "1+2+3" | trash query "grep //SCIENTIFIC_NUMBER" With this command, a directory is created, the Arithmetic grammar generated, build, -and then run using [trparse](https://github.com/kaby76/Trash/tree/main/src/trparse). -The `trparse` tool unifies all parsing, whether it's parsing a grammar or parsing input +and then run using [parse](https://github.com/kaby76/Trash/tree/main/src/trparse). +The `trash parse` tool unifies all parsing, whether it's parsing a grammar or parsing input using a generated parser application. The output from the `trparse` tool is a parse -tree which you can search. [Trquery](https://github.com/kaby76/Trash/tree/main/src/trquery) +tree which you can search. [query](https://github.com/kaby76/Trash/tree/main/src/trquery) is the generalized search program for parse trees. `Trquery` uses XPath expressions to precisely identify nodes in the parse tree. @@ -202,8 +202,8 @@ used more often in compiler construction. ### Rename a symbol in a grammar, generate a parser for new grammar - dotnet trash parse Arithmetic.g4 | dotnet trash rename "//parserRuleSpec//labeledAlt//RULE_REF[text() = 'expression']" "xxx" | dotnet trash text > new-source.g4 - dotnet trash parse Arithmetic.g4 | dotnet trash rename -r "expression,expression_;atom,atom_;scientific,scientific_" | trprint + trash parse Arithmetic.g4 | trash rename "//parserRuleSpec//labeledAlt//RULE_REF[text() = 'expression']" "xxx" | dotnet trash text > new-source.g4 + trash parse Arithmetic.g4 | trash rename -r "expression,expression_;atom,atom_;scientific,scientific_" | trprint In these two examples, the Arithmetic grammar is parsed. [trrename](https://github.com/kaby76/Trash/tree/main/src/trrename) reads the parse tree data and @@ -217,8 +217,8 @@ grammar symbols in any support source code (but it could if the tool is extended git clone https://github.com/antlr/grammars-v4.git; \ cd grammars-v4/java/java9; \ - dotnet trash gen; dotnet build Generated/Test.csproj;\ - dotnet trash parse examples/AllInOne8.java | dotnet trash query "greap //methodDeclaration" | trst | wc + trash gen; dotnet build Generated/Test.csproj;\ + trash parse examples/AllInOne8.java | trash query "greap //methodDeclaration" | trst | wc This command clones the Antlr4 grammars-v4 repo, generates a parser for the Java9 grammar, then runs the parser on [examples/AllInOne8.java](https://github.com/antlr/grammars-v4/blob/master/java/java9/examples/AllInOne8.java). @@ -228,7 +228,7 @@ a `methodDeclaration` type, converts it to a simple string, and counts the resul ### Strip a grammar of all non-essential CFG - dotnet trash parse Java9.g4 | trstrip | dotnet trash text > Essential-Java9.g4 + trash parse Java9.g4 | trash strip | trash text > Essential-Java9.g4 ### Split a grammar @@ -239,7 +239,7 @@ a grammar, it's tedious. For automating transformations, it's necessary because Antlr4 requires the grammars to be split when super classes are needed for different targets. - dotnet trash combine ArithmeticLexer.g4 ArithmeticParser.g4 | trprint > Arithmetic.g4 + trash combine ArithmeticLexer.g4 ArithmeticParser.g4 | trash text > Arithmetic.g4 This command calls [trcombine](https://github.com/kaby76/Trash/tree/main/src/trcombine) which parses two split grammar files @@ -249,7 +249,7 @@ and and creates a [combined grammar](https://github.com/kaby76/Trash/blob/main/_tests/combine/Arithmetic.g4) for the two. - dotnet trash parse Arithmetic.g4 | dotnet trash split | dotnet trash sponge -o true + trash parse Arithmetic.g4 | trash split | trash sponge -o true This command calls [trsplit](https://github.com/kaby76/Trash/tree/main/src/trsplit) which splits the grammar into two parse tree results, one that defines diff --git a/src/tragl/readme.md b/src/tragl/readme.md index 895343c84..76147bc24 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/tragl/tragl.csproj b/src/tragl/tragl.csproj index 6e27acc6f..d0f875fb6 100644 --- a/src/tragl/tragl.csproj +++ b/src/tragl/tragl.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/tragl git diff --git a/src/tranalyze/Config.cs b/src/tranalyze/Config.cs index 6296a5c35..c275ac8a3 100644 --- a/src/tranalyze/Config.cs +++ b/src/tranalyze/Config.cs @@ -18,6 +18,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/tranalyze/readme.md b/src/tranalyze/readme.md index c462a2180..9c8a28709 100644 --- a/src/tranalyze/readme.md +++ b/src/tranalyze/readme.md @@ -65,7 +65,7 @@ _Output_ ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/tranalyze/tranalyze.csproj b/src/tranalyze/tranalyze.csproj index fede083ea..0f9d6ed2e 100644 --- a/src/tranalyze/tranalyze.csproj +++ b/src/tranalyze/tranalyze.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/tranalyze git diff --git a/src/trash/Program.cs b/src/trash/Program.cs index 1c87c9a55..6703f452e 100644 --- a/src/trash/Program.cs +++ b/src/trash/Program.cs @@ -8,7 +8,7 @@ namespace Trash; public class Program { - private const string Version = "0.23.45"; + private const string Version = "1.1.0"; // Maps both full names (e.g. "trgen") and short aliases (e.g. "gen") to the // sub-tool directory name that lives next to trash.dll in the package. diff --git a/src/trash/readme.md b/src/trash/readme.md index fad516c9e..1802260f8 100644 --- a/src/trash/readme.md +++ b/src/trash/readme.md @@ -1,4 +1,4 @@ -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. # trash diff --git a/src/trash/trash.csproj b/src/trash/trash.csproj index 1d7f08d7a..999ca0255 100644 --- a/src/trash/trash.csproj +++ b/src/trash/trash.csproj @@ -19,7 +19,7 @@ Usage: trash [options] (e.g. trash trgen, trash gen, trash trparse)]] true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trash git diff --git a/src/trcaret/Config.cs b/src/trcaret/Config.cs index 2ce1f8b57..4ec8ebe2a 100644 --- a/src/trcaret/Config.cs +++ b/src/trcaret/Config.cs @@ -17,6 +17,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trcaret/readme.md b/src/trcaret/readme.md index 29fde4671..10a5c169c 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trcaret/trcaret.csproj b/src/trcaret/trcaret.csproj index c99842ad6..abbae1e42 100644 --- a/src/trcaret/trcaret.csproj +++ b/src/trcaret/trcaret.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trcaret git diff --git a/src/trclonereplace/Config.cs b/src/trclonereplace/Config.cs index 99f042045..1bf4b21e8 100644 --- a/src/trclonereplace/Config.cs +++ b/src/trclonereplace/Config.cs @@ -21,5 +21,5 @@ public class Config public string Suffix { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trclonereplace/readme.md b/src/trclonereplace/readme.md index b8f485739..b56a9d4c5 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trclonereplace/trclonereplace.csproj b/src/trclonereplace/trclonereplace.csproj index 272e20be0..de766fb1e 100644 --- a/src/trclonereplace/trclonereplace.csproj +++ b/src/trclonereplace/trclonereplace.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trclonereplace git diff --git a/src/trcombine/Config.cs b/src/trcombine/Config.cs index ba3cfbf39..03b38b7f9 100644 --- a/src/trcombine/Config.cs +++ b/src/trcombine/Config.cs @@ -14,6 +14,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trcombine/readme.md b/src/trcombine/readme.md index 80ff3cca5..bcca73ae9 100644 --- a/src/trcombine/readme.md +++ b/src/trcombine/readme.md @@ -103,7 +103,7 @@ The original grammars are left unchanged. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trcombine/trcombine.csproj b/src/trcombine/trcombine.csproj index 7f1ebaccf..f15c33b22 100644 --- a/src/trcombine/trcombine.csproj +++ b/src/trcombine/trcombine.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trcombine git diff --git a/src/trconvert/Config.cs b/src/trconvert/Config.cs index c308480fb..a28a80a13 100644 --- a/src/trconvert/Config.cs +++ b/src/trconvert/Config.cs @@ -17,6 +17,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trconvert/readme.md b/src/trconvert/readme.md index 486377cd8..c9358c957 100644 --- a/src/trconvert/readme.md +++ b/src/trconvert/readme.md @@ -93,7 +93,7 @@ _Output_ ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trconvert/trconvert.csproj b/src/trconvert/trconvert.csproj index c89a0d442..4c1f290d1 100644 --- a/src/trconvert/trconvert.csproj +++ b/src/trconvert/trconvert.csproj @@ -19,7 +19,7 @@ syntax. This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trconvert git diff --git a/src/trcover/Config.cs b/src/trcover/Config.cs index 804a76552..32e154e67 100644 --- a/src/trcover/Config.cs +++ b/src/trcover/Config.cs @@ -33,6 +33,6 @@ public class Config public bool ReadFileNameStdin { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trcover/readme.md b/src/trcover/readme.md index 5071d235a..e483f8244 100644 --- a/src/trcover/readme.md +++ b/src/trcover/readme.md @@ -24,7 +24,7 @@ a grammar. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trcover/trcover.csproj b/src/trcover/trcover.csproj index 2d2a32aac..3de9d51ac 100644 --- a/src/trcover/trcover.csproj +++ b/src/trcover/trcover.csproj @@ -19,7 +19,7 @@ for the entire grammar. This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trcover git diff --git a/src/trdistill/Config.cs b/src/trdistill/Config.cs index c308480fb..a28a80a13 100644 --- a/src/trdistill/Config.cs +++ b/src/trdistill/Config.cs @@ -17,6 +17,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trdistill/readme.md b/src/trdistill/readme.md index 486377cd8..c9358c957 100644 --- a/src/trdistill/readme.md +++ b/src/trdistill/readme.md @@ -93,7 +93,7 @@ _Output_ ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trdistill/trdistill.csproj b/src/trdistill/trdistill.csproj index 1a2d170ed..4ddd3c616 100644 --- a/src/trdistill/trdistill.csproj +++ b/src/trdistill/trdistill.csproj @@ -19,7 +19,7 @@ syntax. This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trdistill git diff --git a/src/trdot/Config.cs b/src/trdot/Config.cs index 3da96648f..230546e0e 100644 --- a/src/trdot/Config.cs +++ b/src/trdot/Config.cs @@ -14,6 +14,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trdot/readme.md b/src/trdot/readme.md index 16bbd3b04..ad5101f18 100644 --- a/src/trdot/readme.md +++ b/src/trdot/readme.md @@ -63,7 +63,7 @@ The output will be: ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trdot/trdot.csproj b/src/trdot/trdot.csproj index eafd448f2..bf49d8b0c 100644 --- a/src/trdot/trdot.csproj +++ b/src/trdot/trdot.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trdot git diff --git a/src/trenum/Config.cs b/src/trenum/Config.cs index 82d4d2015..ddcad15b4 100644 --- a/src/trenum/Config.cs +++ b/src/trenum/Config.cs @@ -12,6 +12,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trenum/readme.md b/src/trenum/readme.md index 624bc6cbc..df9ed0151 100644 --- a/src/trenum/readme.md +++ b/src/trenum/readme.md @@ -8,7 +8,7 @@ ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trenum/trenum.csproj b/src/trenum/trenum.csproj index 32d8e64d4..fc30c45ee 100644 --- a/src/trenum/trenum.csproj +++ b/src/trenum/trenum.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trull git diff --git a/src/trextract/Config.cs b/src/trextract/Config.cs index ba3cfbf39..03b38b7f9 100644 --- a/src/trextract/Config.cs +++ b/src/trextract/Config.cs @@ -14,6 +14,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trextract/readme.md b/src/trextract/readme.md index a1e496e72..2d0cb8087 100644 --- a/src/trextract/readme.md +++ b/src/trextract/readme.md @@ -33,7 +33,7 @@ The outputed files are: ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trextract/trextract.csproj b/src/trextract/trextract.csproj index 719977add..83c35dcd3 100644 --- a/src/trextract/trextract.csproj +++ b/src/trextract/trextract.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trextract git diff --git a/src/trff/Config.cs b/src/trff/Config.cs index f404b3050..d4464ffe2 100644 --- a/src/trff/Config.cs +++ b/src/trff/Config.cs @@ -12,7 +12,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0, Required = false, Default = 1)] public int K { get; set; } diff --git a/src/trff/readme.md b/src/trff/readme.md index c29f7a11a..5ad1af92b 100644 --- a/src/trff/readme.md +++ b/src/trff/readme.md @@ -22,7 +22,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trff/trff.csproj b/src/trff/trff.csproj index 8b6d57836..1728d1b27 100644 --- a/src/trff/trff.csproj +++ b/src/trff/trff.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trff git diff --git a/src/trfold/Config.cs b/src/trfold/Config.cs index db66e8985..1e4f025ff 100644 --- a/src/trfold/Config.cs +++ b/src/trfold/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0, Min = 1)] public IEnumerable Expr { get; set; } diff --git a/src/trfold/readme.md b/src/trfold/readme.md index e4206d89d..2eb46c027 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trfold/trfold.csproj b/src/trfold/trfold.csproj index 35231cbfd..14fe7a8c9 100644 --- a/src/trfold/trfold.csproj +++ b/src/trfold/trfold.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trfold git diff --git a/src/trfoldlit/Config.cs b/src/trfoldlit/Config.cs index 59c56fa00..240f86069 100644 --- a/src/trfoldlit/Config.cs +++ b/src/trfoldlit/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Expr { get; set; } diff --git a/src/trfoldlit/readme.md b/src/trfoldlit/readme.md index 9b91152f9..ef9eb0e41 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trfoldlit/trfoldlit.csproj b/src/trfoldlit/trfoldlit.csproj index 3239498f6..9fabd8e54 100644 --- a/src/trfoldlit/trfoldlit.csproj +++ b/src/trfoldlit/trfoldlit.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trfoldlit git diff --git a/src/trformat/Config.cs b/src/trformat/Config.cs index 457681fab..48189d168 100644 --- a/src/trformat/Config.cs +++ b/src/trformat/Config.cs @@ -15,6 +15,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trformat/readme.md b/src/trformat/readme.md index 48ab9731b..0c498b696 100644 --- a/src/trformat/readme.md +++ b/src/trformat/readme.md @@ -18,7 +18,7 @@ Format of grammar using machine learning. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trformat/trformat.csproj b/src/trformat/trformat.csproj index babbb49c6..cfda98e4c 100644 --- a/src/trformat/trformat.csproj +++ b/src/trformat/trformat.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trformat git diff --git a/src/trgen/Command.cs b/src/trgen/Command.cs index 5aae8bdfa..3b0409032 100644 --- a/src/trgen/Command.cs +++ b/src/trgen/Command.cs @@ -586,7 +586,7 @@ private void ModifyWithGrammarParse(Config config) } } - public static string version = "1.0.0"; + public static string version = "1.1.0"; // For maven-generated code. public List failed_modules = new List(); diff --git a/src/trgen/Config.cs b/src/trgen/Config.cs index 2dc273d36..1c57b6f8e 100644 --- a/src/trgen/Config.cs +++ b/src/trgen/Config.cs @@ -146,5 +146,5 @@ public void OverrideWithTrgenRc() public bool deps { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trgen/readme.md b/src/trgen/readme.md index 4ec080d73..a33dc3c9d 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trgen/templates/Antlr4cs/st.Test.cs b/src/trgen/templates/Antlr4cs/st.Test.cs index e11b8323d..c6beaa538 100644 --- a/src/trgen/templates/Antlr4cs/st.Test.cs +++ b/src/trgen/templates/Antlr4cs/st.Test.cs @@ -35,6 +35,7 @@ public class Program static int string_instance = 0; static string prefix = ""; static bool quiet = false; + static long total_tokens = 0; static void Main(string[] args) { @@ -125,7 +126,7 @@ static void Main(string[] args) DateTime after = DateTime.Now; if (!quiet) { - System.Console.Error.WriteLine(prefix + "Total Time: " + (after - before).TotalSeconds); + System.Console.Error.WriteLine(prefix + "Total Time: " + (after - before).TotalSeconds + " Tokens per second: " + (long)(total_tokens / (after - before).TotalSeconds)); } } Environment.ExitCode = exit_code; @@ -200,6 +201,8 @@ static void DoParse(ICharStream str, string input_name, int row_number) DateTime before = DateTime.Now; var tree = parser.(); DateTime after = DateTime.Now; + var token_count = tokens.Size; + total_tokens += token_count; var result = ""; if (parser.NumberOfSyntaxErrors > 0) { @@ -222,7 +225,7 @@ static void DoParse(ICharStream str, string input_name, int row_number) } if (!quiet) { - System.Console.Error.WriteLine(prefix + "Antlr4cs " + row_number + " " + input_name + " " + result + " " + (after - before).TotalSeconds); + System.Console.Error.WriteLine(prefix + "Antlr4cs " + row_number + " " + input_name + " " + result + " " + (after - before).TotalSeconds + " s " + (long)(token_count / (after - before).TotalSeconds) + " tps"); } if (tee) output.Close(); } diff --git a/src/trgen/templates/Antlr4cs/st.Test.csproj b/src/trgen/templates/Antlr4cs/st.Test.csproj index 4a98433b0..7c58adac3 100644 --- a/src/trgen/templates/Antlr4cs/st.Test.csproj +++ b/src/trgen/templates/Antlr4cs/st.Test.csproj @@ -28,7 +28,7 @@ --> \\' | grep -v '.errors$' | grep -v '.tree$'` +for g in `dotnet trash glob -- '../' | grep -v '.errors$' | grep -v '.tree$'` do file=$g x1="${g##*.}" diff --git a/src/trgen/templates/Antlr4ng/st.Test.ts b/src/trgen/templates/Antlr4ng/st.Test.ts index 3981f85d3..f69bd188c 100644 --- a/src/trgen/templates/Antlr4ng/st.Test.ts +++ b/src/trgen/templates/Antlr4ng/st.Test.ts @@ -57,6 +57,7 @@ var enc = ''; var binary = ; var string_instance = 0; var prefix = ''; +var total_tokens = 0; var inputs: string[] = []; var is_fns: boolean[] = []; @@ -128,7 +129,7 @@ function main() { } timer.stop(); var t = timer.time().m * 60 + timer.time().s + timer.time().ms / 1000; - if (!quiet) console.error(prefix + 'Total Time: ' + t); + if (!quiet) console.error(prefix + 'Total Time: ' + t + ' Tokens per second: ' + Math.round(total_tokens / t)); } process.exitCode = error_code; } @@ -189,6 +190,8 @@ function DoParse(str: CharStream, input_name: string, row_number: number) { timer.start(); const tree = parser.(); timer.stop(); + var token_count = tokens.size; + total_tokens += token_count; var result = ""; if (listener_parser.had_error || listener_lexer.had_error) { result = 'fail'; @@ -206,7 +209,7 @@ function DoParse(str: CharStream, input_name: string, row_number: number) { } } if (!quiet) { - console.error(prefix + 'TypeScript ' + row_number + ' ' + input_name + ' ' + result + ' ' + t); + console.error(prefix + 'TypeScript ' + row_number + ' ' + input_name + ' ' + result + ' ' + t + ' s ' + Math.round(token_count / t) + ' tps'); } if (tee) { closeSync(output); diff --git a/src/trgen/templates/CSharp/st.Test.cs b/src/trgen/templates/CSharp/st.Test.cs index bc94dabcf..69c8bdb89 100644 --- a/src/trgen/templates/CSharp/st.Test.cs +++ b/src/trgen/templates/CSharp/st.Test.cs @@ -176,6 +176,7 @@ public static IParseTree Parse(string input) static bool show_tokens = false; static bool show_token_count = false; static long total_count = 0; + static long total_tokens = 0; static bool show_trace = false; static bool show_tree = false; static bool old = false; @@ -328,7 +329,7 @@ static void Main(string[] args) ParseString(inputs[f], f); } DateTime after = DateTime.Now; - if (!quiet) System.Console.Error.WriteLine(prefix + "Total Time: " + (after - before).TotalSeconds); + if (!quiet) System.Console.Error.WriteLine(prefix + "Total Time: " + (after - before).TotalSeconds + " Tokens per second: " + (long)(total_tokens / (after - before).TotalSeconds)); if (show_token_count) System.Console.Error.WriteLine("TC: " + total_count); } Environment.ExitCode = exit_code; @@ -359,6 +360,8 @@ static void ParseFilename(string input, int row_number) str = new Antlr4.Runtime.AntlrInputStream(fs); } else if (file_encoding == null || file_encoding == "") + str = CharStreams.fromPath(input); + else if (file_encoding == "detect") { var detected = CharsetDetector.DetectFromFile(input); var enc = detected.Detected?.Encoding ?? Encoding.UTF8; @@ -431,6 +434,8 @@ static void DoParse(ICharStream str, string input_name, int row_number) DateTime before = DateTime.Now; var tree = parser.(); DateTime after = DateTime.Now; + var token_count = tokens.Size; + total_tokens += token_count; var result = ""; if (listener_lexer.had_error || listener_parser.had_error) { @@ -492,7 +497,7 @@ static void DoParse(ICharStream str, string input_name, int row_number) } if (!quiet) { - System.Console.Error.WriteLine(prefix + "CSharp " + row_number + " " + input_name + " " + result + " " + (after - before).TotalSeconds); + System.Console.Error.WriteLine(prefix + "CSharp " + row_number + " " + input_name + " " + result + " " + (after - before).TotalSeconds + " s " + (long)(token_count / (after - before).TotalSeconds) + " tps"); } if (earley) { diff --git a/src/trgen/templates/Cpp/st.Test.cpp b/src/trgen/templates/Cpp/st.Test.cpp index 12ebfd967..a3aee3845 100644 --- a/src/trgen/templates/Cpp/st.Test.cpp +++ b/src/trgen/templates/Cpp/st.Test.cpp @@ -53,6 +53,7 @@ int string_instance = 0; std::string prefix; bool quiet = false; std::string file_encoding = ""; +long total_tokens = 0; void DoParse(antlr4::CharStream* str, std::string input_name, int row_number) { @@ -89,6 +90,8 @@ void DoParse(antlr4::CharStream* str, std::string input_name, int row_number) auto before = std::chrono::steady_clock::now(); auto* tree = parser->(); auto after = std::chrono::steady_clock::now(); + long token_count = (long)tokens->size(); + total_tokens += token_count; auto duration = std::chrono::duration_cast\(after - before); std::string result; if (listener_parser->had_error || listener_lexer->had_error) @@ -120,7 +123,7 @@ void DoParse(antlr4::CharStream* str, std::string input_name, int row_number) } if (!quiet) { - std::cerr \<\< prefix \<\< "Cpp " \<\< row_number \<\< " " \<\< input_name \<\< " " \<\< result \<\< " " \<\< formatDurationSeconds(duration.count()) \<\< std::endl; + std::cerr \<\< prefix \<\< "Cpp " \<\< row_number \<\< " " \<\< input_name \<\< " " \<\< result \<\< " " \<\< formatDurationSeconds(duration.count()) \<\< " s " \<\< (long)(token_count / (duration.count() / 1000000.0)) \<\< " tps" \<\< std::endl; } if (tee) { @@ -241,7 +244,7 @@ int TryParse(std::vector\& args) } auto after = std::chrono::steady_clock::now(); auto duration = std::chrono::duration_cast\(after - before); - if (! quiet) std::cerr \<\< prefix \<\< "Total Time: " \<\< formatDurationSeconds(duration.count()) \<\< std::endl; + if (! quiet) std::cerr \<\< prefix \<\< "Total Time: " \<\< formatDurationSeconds(duration.count()) \<\< " Tokens per second: " \<\< (long)(total_tokens / (duration.count() / 1000000.0)) \<\< std::endl; } return error_code; } diff --git a/src/trgen/templates/Cpp/st.build.ps1 b/src/trgen/templates/Cpp/st.build.ps1 index 0aa9f4380..c97261139 100644 --- a/src/trgen/templates/Cpp/st.build.ps1 +++ b/src/trgen/templates/Cpp/st.build.ps1 @@ -24,7 +24,7 @@ npm i antlr-ng echo HOME $HOME -$(& cmake .. -G "Visual Studio 17 2022" -A x64 -DHOME=$HOME ; $compile_exit_code = $LASTEXITCODE ) | Write-Host +$(& cmake .. -G "Visual Studio 18 2026" -A x64 -DHOME=$HOME ; $compile_exit_code = $LASTEXITCODE ) | Write-Host $(& cmake .. -DHOME=$HOME ; $compile_exit_code = $LASTEXITCODE ) | Write-Host if($compile_exit_code -ne 0){ diff --git a/src/trgen/templates/Cpp/st.build.sh b/src/trgen/templates/Cpp/st.build.sh index e5ef0f897..2a3851272 100644 --- a/src/trgen/templates/Cpp/st.build.sh +++ b/src/trgen/templates/Cpp/st.build.sh @@ -9,7 +9,7 @@ cd build npm init -y npm i antlr-ng -cmake .. -G "Visual Studio 17 2022" -A x64 +cmake .. -G "Visual Studio 18 2026" -A x64 cmake .. cmake --build . --config Release diff --git a/src/trgen/templates/Dart/st.Test.dart b/src/trgen/templates/Dart/st.Test.dart index 4337a922d..07868811e 100644 --- a/src/trgen/templates/Dart/st.Test.dart +++ b/src/trgen/templates/Dart/st.Test.dart @@ -60,6 +60,7 @@ var error_code = 0; var string_instance = 0; var prefix = ""; var quiet = false; +var total_tokens = 0; void main(List\ args) async { // Set command-line args before anything else. @@ -136,7 +137,7 @@ void main(List\ args) async { } s.stop(); var et = s.elapsedMilliseconds / 1000.0; - if (!quiet) stderr.writeln(prefix + "Total Time: " + et.toString()); + if (!quiet) stderr.writeln(prefix + "Total Time: " + et.toString() + " Tokens per second: " + (et > 0 ? (total_tokens / et).round().toString() : "0")); } exit(error_code); } @@ -220,6 +221,8 @@ Future\ DoParse(CharStream str, String input_name, int row_number) async s.start(); var tree = parser.(); s.stop(); + var token_count = tokens.size; + total_tokens += token_count; var et = s.elapsedMilliseconds / 1000.0; var result = ""; if (parser.numberOfSyntaxErrors > 0) @@ -249,7 +252,7 @@ Future\ DoParse(CharStream str, String input_name, int row_number) async } if (!quiet) { - stderr.writeln(prefix + "Dart " + row_number.toString() + " " + input_name + " " + result + " " + et.toString()); + stderr.writeln(prefix + "Dart " + row_number.toString() + " " + input_name + " " + result + " " + et.toString() + " s " + (et > 0 ? (token_count / et).round().toString() : "0") + " tps"); } if (tee) { diff --git a/src/trgen/templates/Go/Test.go.st b/src/trgen/templates/Go/Test.go.st index 254b37e2f..fb19df7d0 100644 --- a/src/trgen/templates/Go/Test.go.st +++ b/src/trgen/templates/Go/Test.go.st @@ -67,6 +67,7 @@ var prefix = "" var quiet = false var tee = false var binary = +var total_tokens int64 = 0 func main() { for i := 1; i \< len(os.Args); i = i + 1 { @@ -114,7 +115,7 @@ func main() { } elapsed := time.Since(start) if ! quiet { - fmt.Fprintf(os.Stderr, "%sTotal Time: %.3f", prefix, elapsed.Seconds()) + fmt.Fprintf(os.Stderr, "%sTotal Time: %.3f Tokens per second: %.0f", prefix, elapsed.Seconds(), float64(total_tokens)/elapsed.Seconds()) fmt.Fprintln(os.Stderr) } } @@ -202,6 +203,8 @@ func DoParse(str antlr.CharStream, input_name string, row_number int) { start := time.Now() var tree = parser.() elapsed := time.Since(start) + token_count := int64(len(tokens.GetAllTokens())) + total_tokens += token_count var result = "" if parserErrors.errors > 0 || lexerErrors.errors > 0 { result = "fail" @@ -228,7 +231,7 @@ func DoParse(str antlr.CharStream, input_name string, row_number int) { fmt.Fprintf(os.Stderr, "%d ", row_number) fmt.Fprintf(os.Stderr, "%s ", input_name) fmt.Fprintf(os.Stderr, "%s ", result) - fmt.Fprintf(os.Stderr, "%.3f", elapsed.Seconds()) + fmt.Fprintf(os.Stderr, "%.3f s %.0f tps", elapsed.Seconds(), float64(token_count)/elapsed.Seconds()) fmt.Fprintln(os.Stderr) } } diff --git a/src/trgen/templates/Java/st.Test.java b/src/trgen/templates/Java/st.Test.java index 3ea796ab5..da895de4f 100644 --- a/src/trgen/templates/Java/st.Test.java +++ b/src/trgen/templates/Java/st.Test.java @@ -34,6 +34,7 @@ public class Test { static int string_instance = 0; static String prefix = ""; static boolean quiet = false; + static long total_tokens = 0; public static void main(String[] args) throws FileNotFoundException, IOException { @@ -122,7 +123,7 @@ else if (args[i].charAt(0) == '-') } Instant finish = Instant.now(); long timeElapsed = Duration.between(start, finish).toMillis(); - if (!quiet) System.err.println(prefix + "Total Time: " + (timeElapsed * 1.0) / 1000.0); + if (!quiet) System.err.println(prefix + "Total Time: " + (timeElapsed * 1.0) / 1000.0 + " Tokens per second: " + (long)(total_tokens / ((timeElapsed * 1.0) / 1000.0))); } java.lang.System.exit(error_code); } @@ -197,6 +198,8 @@ static void DoParse(CharStream str, String input_name, int row_number) { ParseTree tree = parser.(); Instant finish = Instant.now(); long timeElapsed = Duration.between(start, finish).toMillis(); + long token_count = tokens.size(); + total_tokens += token_count; String result = ""; if (listener_parser.had_error || listener_lexer.had_error) { @@ -227,7 +230,7 @@ static void DoParse(CharStream str, String input_name, int row_number) { } if (!quiet) { - System.err.println(prefix + "Java " + row_number + " " + input_name + " " + result + " " + (timeElapsed * 1.0) / 1000.0); + System.err.println(prefix + "Java " + row_number + " " + input_name + " " + result + " " + (timeElapsed * 1.0) / 1000.0 + " s " + (long)(token_count / ((timeElapsed * 1.0) / 1000.0)) + " tps"); } if (tee) output.close(); } diff --git a/src/trgen/templates/JavaScript/st.Test.js b/src/trgen/templates/JavaScript/st.Test.js index b03a19443..7f5bf0c9c 100644 --- a/src/trgen/templates/JavaScript/st.Test.js +++ b/src/trgen/templates/JavaScript/st.Test.js @@ -57,6 +57,7 @@ var enc = ''; var binary = ; var string_instance = 0; var prefix = ''; +var total_tokens = 0; var inputs = []; var is_fns = []; @@ -128,7 +129,7 @@ function main() { } timer.stop(); var t = timer.time().m * 60 + timer.time().s + timer.time().ms / 1000; - if (!quiet) console.error(prefix + 'Total Time: ' + t); + if (!quiet) console.error(prefix + 'Total Time: ' + t + ' Tokens per second: ' + Math.round(total_tokens / t)); } process.exitCode = error_code; } @@ -188,6 +189,8 @@ function DoParse(str, input_name, row_number) { timer.start(); const tree = parser.(); timer.stop(); + var token_count = tokens.size; + total_tokens += token_count; var result = ""; if (listener_parser.had_error || listener_lexer.had_error) { result = 'fail'; @@ -205,7 +208,7 @@ function DoParse(str, input_name, row_number) { } } if (! quiet) { - console.error(prefix + 'JavaScript ' + row_number + ' ' + input_name + ' ' + result + ' ' + t); + console.error(prefix + 'JavaScript ' + row_number + ' ' + input_name + ' ' + result + ' ' + t + ' s ' + Math.round(token_count / t) + ' tps'); } if (tee) { fs.closeSync(output); diff --git a/src/trgen/templates/JavaScript/st.package.json b/src/trgen/templates/JavaScript/st.package.json index d495b31b5..cfd74831f 100644 --- a/src/trgen/templates/JavaScript/st.package.json +++ b/src/trgen/templates/JavaScript/st.package.json @@ -9,7 +9,7 @@ "author": "", "license": "ISC", "dependencies": { - "antlr4": "*", + "antlr4": "*4.13.2", "fs-extra": "^11.1.0", "timer-node": "^5.0.6", "typescript-string-operations": "^1.4.1" diff --git a/src/trgen/templates/PHP/st.Test.php b/src/trgen/templates/PHP/st.Test.php index 3209c78f0..58c065b38 100644 --- a/src/trgen/templates/PHP/st.Test.php +++ b/src/trgen/templates/PHP/st.Test.php @@ -73,6 +73,7 @@ public function syntaxError( $string_instance = 0; $prefix = ""; $quiet = false; +$total_tokens = 0; function main($argv) : void { global $tee; @@ -85,6 +86,7 @@ function main($argv) : void { global $error_code; global $prefix; global $quiet; + global $total_tokens; for ($i = 1; $i \< count($argv); $i++) { if ($argv[$i] == "-tokens") { $show_tokens = true; @@ -128,7 +130,7 @@ function main($argv) : void { } $duration = $timer->stop(); if (! $quiet) { - fwrite(STDERR, $prefix . "Total Time: " . $duration->asSeconds() . "\n"); + fwrite(STDERR, $prefix . "Total Time: " . $duration->asSeconds() . " Tokens per second: " . (int)($total_tokens / $duration->asSeconds()) . "\n"); } } exit($error_code); @@ -166,6 +168,7 @@ function DoParse($str, $input_name, $row_number) { global $error_code; global $prefix; global $quiet; + global $total_tokens; $lexer = new ($str); if ($show_tokens) { for ($i=0; ; $i++) { @@ -200,6 +203,8 @@ function DoParse($str, $input_name, $row_number) { $timer2->start(); $tree = $parser->(); $duration = $timer2->stop(); + $token_count = $tokens->count(); + $total_tokens += $token_count; $result = ""; if ($parserErrorListener->had_error || $lexerErrorListener->had_error) { $result = "fail"; @@ -218,7 +223,7 @@ function DoParse($str, $input_name, $row_number) { } } if ( ! $quiet ) { - fwrite(STDERR, $prefix . "PHP " . $row_number . " " . $input_name . " " . $result . " " . $duration->asSeconds() . "\n"); + fwrite(STDERR, $prefix . "PHP " . $row_number . " " . $input_name . " " . $result . " " . $duration->asSeconds() . " s " . (int)($token_count / $duration->asSeconds()) . " tps\n"); } if ( $tee ) { fclose($output); diff --git a/src/trgen/templates/Python3/st.Test.py b/src/trgen/templates/Python3/st.Test.py index 55c03e416..48a5c3af7 100644 --- a/src/trgen/templates/Python3/st.Test.py +++ b/src/trgen/templates/Python3/st.Test.py @@ -40,6 +40,7 @@ def syntaxError(self, recognizer, offendingSymbol, line, column, msg, e): prefix = "" quiet = False noop = False +total_tokens = 0 def main(argv): global tee @@ -102,7 +103,7 @@ def main(argv): diff = end_time - start_time diff_time = diff.total_seconds() if (not quiet): - print(f'{prefix}Total Time: {diff_time}', file=sys.stderr); + print(f'{prefix}Total Time: {diff_time} Tokens per second: {int(total_tokens / diff_time) if diff_time > 0 else 0}', file=sys.stderr); sys.exit(error_code) def ParseStdin(): @@ -138,6 +139,7 @@ def DoParse(str, input_name, row_number): global prefix global quiet global error_code + global total_tokens lexer = (str) lexer.removeErrorListeners() @@ -171,6 +173,8 @@ def DoParse(str, input_name, row_number): start_time = datetime.now() tree = parser.() end_time = datetime.now() + token_count = len(tokens.tokens) + total_tokens += token_count diff = end_time - start_time diff_time = diff.total_seconds() result = '' @@ -196,7 +200,9 @@ def DoParse(str, input_name, row_number): sys.stderr.write(result) sys.stderr.write(' ') sys.stderr.write(f'{diff_time}') - sys.stderr.write('\n') + sys.stderr.write(' s ') + sys.stderr.write(f'{int(token_count / diff_time) if diff_time > 0 else 0}') + sys.stderr.write(' tps\n') if (tee): output.close() diff --git a/src/trgen/templates/Rust/src/st.main.rs b/src/trgen/templates/Rust/src/st.main.rs index 2a45b7c98..012a783fa 100644 --- a/src/trgen/templates/Rust/src/st.main.rs +++ b/src/trgen/templates/Rust/src/st.main.rs @@ -27,7 +27,7 @@ fn parse_input( input_name: &str, idx: i32, flags: &Flags, -) -> usize { +) -> (usize, usize) { let writer: Rc\>> = Rc::new(RefCell::new( if flags.tee { Box::new(File::create(format!("{}.errors", input_name)).unwrap()) as Box\ @@ -80,6 +80,7 @@ fn parse_input( let start = Instant::now(); let tree = parser.().expect("parsing failed setup"); let elapsed = start.elapsed(); + let token_count = parser.get_input_stream_mut().size() as usize; let error_cnt = *lec.borrow() + *pec.borrow(); @@ -94,14 +95,15 @@ fn parse_input( } if !flags.quiet { - eprint!("{}Rust {} {} {} {:.3}\n", + eprint!("{}Rust {} {} {} {:.3} s {:.0} tps\n", flags.prefix, idx, input_name, if error_cnt > 0 { "fail" } else { "success" }, - elapsed.as_secs_f64() + elapsed.as_secs_f64(), + token_count as f64 / elapsed.as_secs_f64() ); } - if error_cnt > 0 { 1 } else { 0 } + if error_cnt > 0 { (1, token_count) } else { (0, token_count) } } struct Flags { @@ -167,16 +169,19 @@ fn main() { process::exit(1); } else { let mut exit_code = 0; + let mut total_tokens: usize = 0; let start_all = Instant::now(); for (idx, input) in flags.inputs.iter().enumerate() { - let rc = parse_input(input, idx as i32, &flags); + let (rc, tc) = parse_input(input, idx as i32, &flags); + total_tokens += tc; if rc > 0 { exit_code = 1; } } let elapsed = start_all.elapsed(); if !flags.quiet { - eprintln!("{}Total Time: {:.3}", flags.prefix, elapsed.as_secs_f64()); + let secs = elapsed.as_secs_f64(); + eprintln!("{}Total Time: {:.3} Tokens per second: {:.0}", flags.prefix, secs, total_tokens as f64 / secs); } process::exit(exit_code as i32); } diff --git a/src/trgen/templates/TypeScript/st.Test.ts b/src/trgen/templates/TypeScript/st.Test.ts index c578990bf..a6dec886a 100644 --- a/src/trgen/templates/TypeScript/st.Test.ts +++ b/src/trgen/templates/TypeScript/st.Test.ts @@ -47,6 +47,7 @@ var enc = ''; var binary = ; var string_instance = 0; var prefix = ''; +var total_tokens = 0; var inputs: string[] = []; var is_fns: boolean[] = []; @@ -118,7 +119,7 @@ function main() { } timer.stop(); var t = timer.time().m * 60 + timer.time().s + timer.time().ms / 1000; - if (!quiet) console.error(prefix + 'Total Time: ' + t); + if (!quiet) console.error(prefix + 'Total Time: ' + t + ' Tokens per second: ' + Math.round(total_tokens / t)); } process.exitCode = error_code; } @@ -177,6 +178,8 @@ function DoParse(str: CharStream, input_name: string, row_number: number) { timer.start(); const tree = parser.(); timer.stop(); + var token_count = tokens.size; + total_tokens += token_count; var result = ""; if (listener_parser.had_error || listener_lexer.had_error) { result = 'fail'; @@ -194,7 +197,7 @@ function DoParse(str: CharStream, input_name: string, row_number: number) { } } if (!quiet) { - console.error(prefix + 'TypeScript ' + row_number + ' ' + input_name + ' ' + result + ' ' + t); + console.error(prefix + 'TypeScript ' + row_number + ' ' + input_name + ' ' + result + ' ' + t + ' s ' + Math.round(token_count / t) + ' tps'); } if (tee) { closeSync(output); diff --git a/src/trgen/templates/TypeScript/st.package.json b/src/trgen/templates/TypeScript/st.package.json index 63c72bf27..025e7d9bd 100644 --- a/src/trgen/templates/TypeScript/st.package.json +++ b/src/trgen/templates/TypeScript/st.package.json @@ -9,7 +9,7 @@ "author": "", "license": "ISC", "dependencies": { - "antlr4": "*", + "antlr4": "*4.13.2", "buffer": "^6.0.3", "fs-extra": "^11.1.1", "timer-node": "^5.0.6", diff --git a/src/trgen/trgen.csproj b/src/trgen/trgen.csproj index d727b2971..aedb25dc1 100644 --- a/src/trgen/trgen.csproj +++ b/src/trgen/trgen.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trgen git diff --git a/src/trgenvsc/Config.cs b/src/trgenvsc/Config.cs index 4399ca66d..0beff683f 100644 --- a/src/trgenvsc/Config.cs +++ b/src/trgenvsc/Config.cs @@ -23,6 +23,6 @@ public Config(Config copy) public static readonly Config DEFAULT = new Config(); [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trgenvsc/readme.md b/src/trgenvsc/readme.md index eeefed8a9..dc8546626 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trgenvsc/trgenvsc.csproj b/src/trgenvsc/trgenvsc.csproj index b4f8fbf84..6615ca13f 100644 --- a/src/trgenvsc/trgenvsc.csproj +++ b/src/trgenvsc/trgenvsc.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trgenvsc git diff --git a/src/trglob/Config.cs b/src/trglob/Config.cs index 869787468..6b3167ce2 100644 --- a/src/trglob/Config.cs +++ b/src/trglob/Config.cs @@ -12,7 +12,7 @@ public class Config public bool Full { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Files { get; set; } diff --git a/src/trglob/readme.md b/src/trglob/readme.md index ed03234f1..70107540c 100644 --- a/src/trglob/readme.md +++ b/src/trglob/readme.md @@ -17,7 +17,7 @@ Expand a glob string into file names. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trglob/trglob.csproj b/src/trglob/trglob.csproj index 8c53b0daf..7e6d8742d 100644 --- a/src/trglob/trglob.csproj +++ b/src/trglob/trglob.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trglob git diff --git a/src/trgroup/Config.cs b/src/trgroup/Config.cs index d9c93f2bd..bee90f266 100644 --- a/src/trgroup/Config.cs +++ b/src/trgroup/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Expr { get; set; } diff --git a/src/trgroup/readme.md b/src/trgroup/readme.md index 5cdfa371e..c888b0a3f 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trgroup/trgroup.csproj b/src/trgroup/trgroup.csproj index 8cbd5700b..2d9a69f5f 100644 --- a/src/trgroup/trgroup.csproj +++ b/src/trgroup/trgroup.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trgroup git diff --git a/src/triconv/Config.cs b/src/triconv/Config.cs index f103290f3..41bc63406 100644 --- a/src/triconv/Config.cs +++ b/src/triconv/Config.cs @@ -12,7 +12,7 @@ public class Config public string ToCode { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Files { get; set; } } diff --git a/src/triconv/readme.md b/src/triconv/readme.md index d9e9653f9..0a471e369 100644 --- a/src/triconv/readme.md +++ b/src/triconv/readme.md @@ -20,7 +20,7 @@ unicode. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/triconv/triconv.csproj b/src/triconv/triconv.csproj index 0b729e093..d64ff7aae 100644 --- a/src/triconv/triconv.csproj +++ b/src/triconv/triconv.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trxml2 git diff --git a/src/tritext/Config.cs b/src/tritext/Config.cs index c31d39608..4f6db754b 100644 --- a/src/tritext/Config.cs +++ b/src/tritext/Config.cs @@ -19,5 +19,5 @@ public class Config public string Filter { get; set; } = ""; [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/tritext/readme.md b/src/tritext/readme.md index 68e2f9cdd..86a9e7fa6 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/tritext/tritext.csproj b/src/tritext/tritext.csproj index f33c20d81..0a08c3846 100644 --- a/src/tritext/tritext.csproj +++ b/src/tritext/tritext.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/tritext git diff --git a/src/trjson/Config.cs b/src/trjson/Config.cs index 637103f1d..0509f283d 100644 --- a/src/trjson/Config.cs +++ b/src/trjson/Config.cs @@ -11,5 +11,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trjson/readme.md b/src/trjson/readme.md index ee2078589..c17463858 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trjson/trjson.csproj b/src/trjson/trjson.csproj index bf1675a22..4dc4fc474 100644 --- a/src/trjson/trjson.csproj +++ b/src/trjson/trjson.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trjson git diff --git a/src/trkleene/Config.cs b/src/trkleene/Config.cs index d9c93f2bd..bee90f266 100644 --- a/src/trkleene/Config.cs +++ b/src/trkleene/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Expr { get; set; } diff --git a/src/trkleene/readme.md b/src/trkleene/readme.md index 23e633627..910b10c76 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trkleene/trkleene.csproj b/src/trkleene/trkleene.csproj index 6f97e5923..c82db8496 100644 --- a/src/trkleene/trkleene.csproj +++ b/src/trkleene/trkleene.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trkleene git diff --git a/src/trnullable/Config.cs b/src/trnullable/Config.cs index 0a5856a0c..0e2a8739f 100644 --- a/src/trnullable/Config.cs +++ b/src/trnullable/Config.cs @@ -11,5 +11,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trnullable/readme.md b/src/trnullable/readme.md index 87bdf4060..6ec9828df 100644 --- a/src/trnullable/readme.md +++ b/src/trnullable/readme.md @@ -18,7 +18,7 @@ trparse A.g4 | trnullable ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trnullable/trnullable.csproj b/src/trnullable/trnullable.csproj index b512023c1..1652bcab7 100644 --- a/src/trnullable/trnullable.csproj +++ b/src/trnullable/trnullable.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trnullable git diff --git a/src/trparse/Config.cs b/src/trparse/Config.cs index ced429ed5..88c4bea6d 100644 --- a/src/trparse/Config.cs +++ b/src/trparse/Config.cs @@ -42,7 +42,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Option('x', Required = false, HelpText = "Read input file names from stdin.")] public bool ReadFileNameStdin { get; set; } diff --git a/src/trparse/readme.md b/src/trparse/readme.md index 8b6b41a3e..d0bbecc4b 100644 --- a/src/trparse/readme.md +++ b/src/trparse/readme.md @@ -50,7 +50,7 @@ the `--type` command-line option: ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trparse/trparse.csproj b/src/trparse/trparse.csproj index 1277bde90..6d5f64dcb 100644 --- a/src/trparse/trparse.csproj +++ b/src/trparse/trparse.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trparse git diff --git a/src/trperf/Config.cs b/src/trperf/Config.cs index 0441e3abe..f5f98a68d 100644 --- a/src/trperf/Config.cs +++ b/src/trperf/Config.cs @@ -33,5 +33,5 @@ public class Config public bool ReadFileNameStdin { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trperf/readme.md b/src/trperf/readme.md index d2ee95002..1e1643d4d 100644 --- a/src/trperf/readme.md +++ b/src/trperf/readme.md @@ -67,7 +67,7 @@ be in a trgen-generated parser directory, or use the -p option. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trperf/trperf.csproj b/src/trperf/trperf.csproj index da4a44ff5..ee234e7c4 100644 --- a/src/trperf/trperf.csproj +++ b/src/trperf/trperf.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trperf git diff --git a/src/trpiggy/Config.cs b/src/trpiggy/Config.cs index 2a6e042bb..33fbf624d 100644 --- a/src/trpiggy/Config.cs +++ b/src/trpiggy/Config.cs @@ -15,6 +15,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trpiggy/readme.md b/src/trpiggy/readme.md index 28bd3b361..ef8c2ab39 100644 --- a/src/trpiggy/readme.md +++ b/src/trpiggy/readme.md @@ -63,7 +63,7 @@ Output: ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trpiggy/trpiggy.csproj b/src/trpiggy/trpiggy.csproj index 93cdff94d..a524edeb9 100644 --- a/src/trpiggy/trpiggy.csproj +++ b/src/trpiggy/trpiggy.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trpiggy git diff --git a/src/trquery/Config.cs b/src/trquery/Config.cs index dc7030566..561384a2a 100644 --- a/src/trquery/Config.cs +++ b/src/trquery/Config.cs @@ -22,7 +22,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Query { get; set; } } diff --git a/src/trquery/readme.md b/src/trquery/readme.md index a7a359f0c..85700515d 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trquery/trquery.csproj b/src/trquery/trquery.csproj index 4f866be01..a5c08fd2d 100644 --- a/src/trquery/trquery.csproj +++ b/src/trquery/trquery.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trquery git diff --git a/src/trrename/Config.cs b/src/trrename/Config.cs index d77cca1fd..ea0610c8c 100644 --- a/src/trrename/Config.cs +++ b/src/trrename/Config.cs @@ -23,5 +23,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trrename/readme.md b/src/trrename/readme.md index c23d1d653..f502567bd 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trrename/trrename.csproj b/src/trrename/trrename.csproj index 0dc7baed2..7957bc157 100644 --- a/src/trrename/trrename.csproj +++ b/src/trrename/trrename.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trrename git diff --git a/src/trrr/Config.cs b/src/trrr/Config.cs index adf78e263..c666e5b22 100644 --- a/src/trrr/Config.cs +++ b/src/trrr/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0, Required = false)] public string Expr { get; set; } diff --git a/src/trrr/readme.md b/src/trrr/readme.md index 8402708fa..68316710a 100644 --- a/src/trrr/readme.md +++ b/src/trrr/readme.md @@ -14,7 +14,7 @@ ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trrr/trrr.csproj b/src/trrr/trrr.csproj index f43e5a24f..34ec1ac04 100644 --- a/src/trrr/trrr.csproj +++ b/src/trrr/trrr.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trrr git diff --git a/src/trrup/Config.cs b/src/trrup/Config.cs index 457681fab..48189d168 100644 --- a/src/trrup/Config.cs +++ b/src/trrup/Config.cs @@ -15,6 +15,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trrup/readme.md b/src/trrup/readme.md index d2ecf2b9e..88977275d 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trrup/trrup.csproj b/src/trrup/trrup.csproj index 5700dcefe..d03c8be8d 100644 --- a/src/trrup/trrup.csproj +++ b/src/trrup/trrup.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trrup git diff --git a/src/trsem/Config.cs b/src/trsem/Config.cs index e154de4e0..e38d05642 100644 --- a/src/trsem/Config.cs +++ b/src/trsem/Config.cs @@ -21,6 +21,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trsem/readme.md b/src/trsem/readme.md index 9b25b47c5..20499c5da 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trsem/trsem.csproj b/src/trsem/trsem.csproj index c313e3315..2b2674491 100644 --- a/src/trsem/trsem.csproj +++ b/src/trsem/trsem.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trsem git diff --git a/src/trsort/Config.cs b/src/trsort/Config.cs index 3b4fb4f97..5f957c2e3 100644 --- a/src/trsort/Config.cs +++ b/src/trsort/Config.cs @@ -30,6 +30,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trsort/readme.md b/src/trsort/readme.md index 6d41e9bd0..9c9b72eb3 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trsort/trsort.csproj b/src/trsort/trsort.csproj index 8aab0c5c4..3c1c66b3f 100644 --- a/src/trsort/trsort.csproj +++ b/src/trsort/trsort.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trsort git diff --git a/src/trsplit/Config.cs b/src/trsplit/Config.cs index 6718bc93e..eb4f85351 100644 --- a/src/trsplit/Config.cs +++ b/src/trsplit/Config.cs @@ -15,5 +15,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trsplit/readme.md b/src/trsplit/readme.md index dae87d4c4..244b70092 100644 --- a/src/trsplit/readme.md +++ b/src/trsplit/readme.md @@ -45,7 +45,7 @@ modified. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trsplit/trsplit.csproj b/src/trsplit/trsplit.csproj index 2ac05dcbc..a1c74b3ed 100644 --- a/src/trsplit/trsplit.csproj +++ b/src/trsplit/trsplit.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trsplit git diff --git a/src/trsponge/Config.cs b/src/trsponge/Config.cs index 615ca59ea..a7c4b9beb 100644 --- a/src/trsponge/Config.cs +++ b/src/trsponge/Config.cs @@ -17,5 +17,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trsponge/readme.md b/src/trsponge/readme.md index 03f304a48..5b558e55e 100644 --- a/src/trsponge/readme.md +++ b/src/trsponge/readme.md @@ -19,7 +19,7 @@ results to file(s). ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trsponge/trsponge.csproj b/src/trsponge/trsponge.csproj index 9692e0c77..690b4cd98 100644 --- a/src/trsponge/trsponge.csproj +++ b/src/trsponge/trsponge.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trsponge git diff --git a/src/trtext/Config.cs b/src/trtext/Config.cs index 0964cb22b..7723f8914 100644 --- a/src/trtext/Config.cs +++ b/src/trtext/Config.cs @@ -24,5 +24,5 @@ public class Config public bool Count { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trtext/readme.md b/src/trtext/readme.md index 8148dfd31..454412560 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trtext/trtext.csproj b/src/trtext/trtext.csproj index ae814e577..7d6aa3a0d 100644 --- a/src/trtext/trtext.csproj +++ b/src/trtext/trtext.csproj @@ -20,7 +20,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trtext git diff --git a/src/trthompson/Config.cs b/src/trthompson/Config.cs index e83977d41..f7b688283 100644 --- a/src/trthompson/Config.cs +++ b/src/trthompson/Config.cs @@ -12,6 +12,6 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } } diff --git a/src/trthompson/readme.md b/src/trthompson/readme.md index 8ee2a7f51..f6eb44c20 100644 --- a/src/trthompson/readme.md +++ b/src/trthompson/readme.md @@ -12,7 +12,7 @@ ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trthompson/trthompson.csproj b/src/trthompson/trthompson.csproj index 3aea28fa8..be59f0b80 100644 --- a/src/trthompson/trthompson.csproj +++ b/src/trthompson/trthompson.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trthompson git diff --git a/src/trtokens/Config.cs b/src/trtokens/Config.cs index 637103f1d..0509f283d 100644 --- a/src/trtokens/Config.cs +++ b/src/trtokens/Config.cs @@ -11,5 +11,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trtokens/readme.md b/src/trtokens/readme.md index c258efe53..5e52fa513 100644 --- a/src/trtokens/readme.md +++ b/src/trtokens/readme.md @@ -52,7 +52,7 @@ Output: ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trtokens/trtokens.csproj b/src/trtokens/trtokens.csproj index f3d2bd9b5..5f4642298 100644 --- a/src/trtokens/trtokens.csproj +++ b/src/trtokens/trtokens.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trtokens git diff --git a/src/trtree/Config.cs b/src/trtree/Config.cs index e625c55d2..4ea856000 100644 --- a/src/trtree/Config.cs +++ b/src/trtree/Config.cs @@ -26,5 +26,5 @@ public class Config public bool BlockTreeStyle { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trtree/readme.md b/src/trtree/readme.md index 1f3fd2ed8..199cb410d 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trtree/trtree.csproj b/src/trtree/trtree.csproj index 2f950c7a0..c7decf896 100644 --- a/src/trtree/trtree.csproj +++ b/src/trtree/trtree.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trtree git diff --git a/src/trull/Config.cs b/src/trull/Config.cs index d9c93f2bd..bee90f266 100644 --- a/src/trull/Config.cs +++ b/src/trull/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Expr { get; set; } diff --git a/src/trull/readme.md b/src/trull/readme.md index af948a208..ac6448666 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trull/trull.csproj b/src/trull/trull.csproj index 36c70bdf9..a9b0d975c 100644 --- a/src/trull/trull.csproj +++ b/src/trull/trull.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trull git diff --git a/src/trunfold/Config.cs b/src/trunfold/Config.cs index c5babe344..e53c23337 100644 --- a/src/trunfold/Config.cs +++ b/src/trunfold/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0, Min = 1)] public IEnumerable Expr { get; set; } } diff --git a/src/trunfold/readme.md b/src/trunfold/readme.md index e20869fae..891e5bf64 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trunfold/trunfold.csproj b/src/trunfold/trunfold.csproj index 566a899fb..adaac6cff 100644 --- a/src/trunfold/trunfold.csproj +++ b/src/trunfold/trunfold.csproj @@ -19,7 +19,7 @@ in the parse tree. This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trunfold git diff --git a/src/trunfoldlit/Config.cs b/src/trunfoldlit/Config.cs index a346f19c8..0cc8ebd39 100644 --- a/src/trunfoldlit/Config.cs +++ b/src/trunfoldlit/Config.cs @@ -15,5 +15,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trunfoldlit/readme.md b/src/trunfoldlit/readme.md index f59699bbb..659c06572 100644 --- a/src/trunfoldlit/readme.md +++ b/src/trunfoldlit/readme.md @@ -51,7 +51,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trunfoldlit/trunfoldlit.csproj b/src/trunfoldlit/trunfoldlit.csproj index a11296a53..b77892e8c 100644 --- a/src/trunfoldlit/trunfoldlit.csproj +++ b/src/trunfoldlit/trunfoldlit.csproj @@ -19,7 +19,7 @@ in the parse tree. This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trunfoldlit git diff --git a/src/trungroup/Config.cs b/src/trungroup/Config.cs index c5babe344..e53c23337 100644 --- a/src/trungroup/Config.cs +++ b/src/trungroup/Config.cs @@ -15,7 +15,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0, Min = 1)] public IEnumerable Expr { get; set; } } diff --git a/src/trungroup/readme.md b/src/trungroup/readme.md index 6f89ecb77..81da830ef 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trungroup/trungroup.csproj b/src/trungroup/trungroup.csproj index 8751d7246..d66e8de44 100644 --- a/src/trungroup/trungroup.csproj +++ b/src/trungroup/trungroup.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trungroup git diff --git a/src/trwdog/Config.cs b/src/trwdog/Config.cs index 443439e30..37f353ed9 100644 --- a/src/trwdog/Config.cs +++ b/src/trwdog/Config.cs @@ -11,5 +11,5 @@ public class Config public int? Timeout { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trwdog/readme.md b/src/trwdog/readme.md index 62006ae6d..72f175e1d 100644 --- a/src/trwdog/readme.md +++ b/src/trwdog/readme.md @@ -18,7 +18,7 @@ Execute a command with a watchdog timer. ## Current version -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trwdog/trwdog.csproj b/src/trwdog/trwdog.csproj index 6991e97bc..ed2c7b309 100644 --- a/src/trwdog/trwdog.csproj +++ b/src/trwdog/trwdog.csproj @@ -20,13 +20,13 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trwdog git - + diff --git a/src/trxgrep/Config.cs b/src/trxgrep/Config.cs index 6ba7584ad..1fd981663 100644 --- a/src/trxgrep/Config.cs +++ b/src/trxgrep/Config.cs @@ -18,7 +18,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0, Min = 1)] public IEnumerable Expr { get; set; } } diff --git a/src/trxgrep/readme.md b/src/trxgrep/readme.md index 481d9a874..e73d8df28 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trxgrep/trxgrep.csproj b/src/trxgrep/trxgrep.csproj index f22040303..971fa5c1d 100644 --- a/src/trxgrep/trxgrep.csproj +++ b/src/trxgrep/trxgrep.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit. true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trxgrep git diff --git a/src/trxml/Config.cs b/src/trxml/Config.cs index 637103f1d..0509f283d 100644 --- a/src/trxml/Config.cs +++ b/src/trxml/Config.cs @@ -11,5 +11,5 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; } diff --git a/src/trxml/readme.md b/src/trxml/readme.md index 58ed7ffe6..d6aa284a8 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trxml/trxml.csproj b/src/trxml/trxml.csproj index 6c844edff..b76d787a2 100644 --- a/src/trxml/trxml.csproj +++ b/src/trxml/trxml.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trxml git diff --git a/src/trxml2/Config.cs b/src/trxml2/Config.cs index ffe24c418..af8294ce4 100644 --- a/src/trxml2/Config.cs +++ b/src/trxml2/Config.cs @@ -9,7 +9,7 @@ public class Config public bool Verbose { get; set; } [Option("version", Required = false)] - public string Version { get; set; } = "1.0.0"; + public string Version { get; set; } = "1.1.0"; [Value(0)] public IEnumerable Files { get; set; } } diff --git a/src/trxml2/readme.md b/src/trxml2/readme.md index 86af5e853..0e51b51db 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 -1.0.0 Unified dispatcher for the Trash toolkit. +1.1.0 Unified dispatcher for the Trash toolkit. Fix broken Cpp target on Github. Add tokens per second perf measurement. ## License diff --git a/src/trxml2/trxml2.csproj b/src/trxml2/trxml2.csproj index f8f27a713..30e55f373 100644 --- a/src/trxml2/trxml2.csproj +++ b/src/trxml2/trxml2.csproj @@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]> true portable true - 1.0.0 + 1.1.0 https://github.com/kaby76/Trash/tree/main/src/trxml2 git diff --git a/src/web/driver/driver.csproj b/src/web/driver/driver.csproj index d1ddb769c..957c2a078 100644 --- a/src/web/driver/driver.csproj +++ b/src/web/driver/driver.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/web/wrap/wrap.csproj b/src/web/wrap/wrap.csproj index d139d117a..1d2bf0091 100644 --- a/src/web/wrap/wrap.csproj +++ b/src/web/wrap/wrap.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive