Merge from dev (release 0.23.7)

.config/dotnet-tools.json

@@ -3,210 +3,210 @@
   "isRoot": true,
   "tools": {
     "tranalyze": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "tranalyze"
       ],
       "rollForward": false
     },
     "trcaret": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trcaret"
       ],
       "rollForward": false
     },
     "trclonereplace": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trclonereplace"
       ],
       "rollForward": false
     },
     "trcombine": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trcombine"
       ],
       "rollForward": false
     },
     "trconvert": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trconvert"
       ],
       "rollForward": false
     },
     "trcover": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trcover"
       ],
       "rollForward": false
     },
     "trdot": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trdot"
       ],
       "rollForward": false
     },
     "trfoldlit": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trfoldlit"
       ],
       "rollForward": false
     },
     "trgen": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trgen"
       ],
       "rollForward": false
     },
     "trgenvsc": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trgenvsc"
       ],
       "rollForward": false
     },
     "trglob": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trglob"
       ],
       "rollForward": false
     },
     "triconv": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "triconv"
       ],
       "rollForward": false
     },
     "tritext": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "tritext"
       ],
       "rollForward": false
     },
     "trjson": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trjson"
       ],
       "rollForward": false
     },
     "trparse": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trparse"
       ],
       "rollForward": false
     },
     "trperf": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trperf"
       ],
       "rollForward": false
     },
     "trquery": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trquery"
       ],
       "rollForward": false
     },
     "trrename": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trrename"
       ],
       "rollForward": false
     },
     "trsort": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trsort"
       ],
       "rollForward": false
     },
     "trsplit": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trsplit"
       ],
       "rollForward": false
     },
     "trsponge": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trsponge"
       ],
       "rollForward": false
     },
     "trtext": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trtext"
       ],
       "rollForward": false
     },
     "trtokens": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trtokens"
       ],
       "rollForward": false
     },
     "trtree": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trtree"
       ],
       "rollForward": false
     },
     "trunfold": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trunfold"
       ],
       "rollForward": false
     },
     "trungroup": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trungroup"
       ],
       "rollForward": false
     },
     "trwdog": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trwdog"
       ],
       "rollForward": false
     },
     "trxgrep": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trxgrep"
       ],
       "rollForward": false
     },
     "trxml": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trxml"
       ],
       "rollForward": false
     },
     "trxml2": {
-      "version": "0.23.6",
+      "version": "0.23.7",
       "commands": [
         "trxml2"
       ],

.github/workflows/main.yml

@@ -37,6 +37,10 @@ jobs:
       run: |
         echo ${{ steps.setup-php.outputs.php-version }}
         php --version
+    - name: Prep Dotnet
+      run: |
+        sudo mkdir /usr/share/dotnet
+        sudo chmod 777 /usr/share/dotnet
     - name: Install Dotnet
       uses: actions/setup-dotnet@v4.0.1
       with:

_scripts/install-local.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 set -x
-dotnet new tool-manifest
+dotnet new tool-manifest --force
 cd src
 dirs=`find .  -name net8.0 | fgrep 'bin/Release' | fgrep -v Generated | grep '^./tr' | fgrep -v publish | sort -u`
 for i in $dirs
@@ -16,6 +16,6 @@ do
 	pushd $d
 	tool=$d
 	dotnet tool install $tool
-	dotnet $tool -- --version
+	dotnet $tool --version
 	popd
 done

_scripts/publish.sh

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

_scripts/set-version.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-version="0.23.6"
+version="0.23.7"
 cd src
 directories=`find . -maxdepth 1 -type d -name "tr*"`
 cwd=`pwd`
@@ -41,7 +41,7 @@ do
 	mv asdfasdf *.csproj	
 	rm -f asdfasdf2
 	touch readme.md
-	cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fix trgen for combined grammars. Add regression testing of trgen and all targets%' > asdfasdf2
+	cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fixed trcover when started outside of Generated directory. Fixed analysis of grammars in trgen.%' > asdfasdf2
 	mv asdfasdf2 readme.md
 	cd ..
 done
@@ -78,7 +78,7 @@ do
 	mv asdfasdf *.csproj	
 	rm -f asdfasdf2
 	touch readme.md
-	cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fix trgen for combined grammars. Add regression testing of trgen and all targets%' > asdfasdf2
+	cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fixed trcover when started outside of Generated directory. Fixed analysis of grammars in trgen.%' > asdfasdf2
 	mv asdfasdf2 readme.md
 	cd ..
 done

_scripts/uninstall-local.sh

@@ -18,3 +18,4 @@ do
 	dotnet tool uninstall $tool
 	popd
 done
+dotnet nuget locals all --clear

_tests/all-tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #set +e
-#set -x
+set -x
 export TERM=xterm-mono
 export MSYS2_ARG_CONV_EXCL="*"
 where=`dirname -- "$0"`
@@ -10,13 +10,17 @@ echo Tests in Trash: $tests
 failed=()
 for i in $tests
 do
-	bash $i
+	dir=`dirname $i`
+	fn=`basename $i`
+	pushd $dir
+	bash $fn
 	result=$?
 	if [ "$result" != 0 ]
 	then
 		echo Failed $i
 		failed+=( $i )
 	fi
+	popd
 done
 if (( ${#failed[@]} != 0 ))
 then

_tests/basic-trees/test.sh

@@ -12,7 +12,8 @@ echo "$where"
 
 # Test.
 rm -rf Generated-CSharp
-dotnet trgen -- -t CSharp
+dotnet trgen --version
+dotnet trgen -t CSharp
 pushd Generated-CSharp
 make
 popd

_tests/delabel/test.sh

@@ -17,7 +17,7 @@ do
 	echo $i
 	extension="${i##*.}"
 	filename="${i%.*}"
-	dotnet trparse -- $i | dotnet trquery -- -c Generated/g4-scripts/delabel.xq | dotnet trsponge -- -c -o "Generated"
+	dotnet trparse $i | dotnet trquery -c Generated/g4-scripts/delabel.xq | dotnet trsponge -c -o "Generated"
 done
 rm -rf Generated/g4-scripts
 diff -r Gold Generated

_tests/delete/test.sh

@@ -12,9 +12,9 @@ rm -rf Generated
 mkdir Generated
 
 # Test.
-dotnet trparse -- Expression.g4 | dotnet trquery -- delete '//parserRuleSpec[RULE_REF/text()="a"]' > o.pt
-cat o.pt | dotnet trsponge -- -c -o Generated
-cat o.pt | dotnet trtree -- > Generated/delete.tree
+dotnet trparse Expression.g4 | dotnet trquery delete '//parserRuleSpec[RULE_REF/text()="a"]' > o.pt
+cat o.pt | dotnet trsponge -c -o Generated
+cat o.pt | dotnet trtree > Generated/delete.tree
 rm o.pt
 
 # Diff.