Merge pull request #481 from kaby76/main

From main (was checked into main by accident)

_scripts/set-version.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-version="0.23.3"
+version="0.23.4"
 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"' Code clean up, improvements to tritext, added trsort, trclonerename.%' > asdfasdf2
+	cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Clean up build of trgenvsc.%' > 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"' Code clean up, improvements to tritext, added trsort, trclonerename.%' > asdfasdf2
+	cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Clean up build of trgenvsc.%' > asdfasdf2
 	mv asdfasdf2 readme.md
 	cd ..
 done

_tests/TestProject1/TestProject1.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/tragl/readme.md

@@ -19,7 +19,7 @@ This tool is part of Trash, Transformations for Antlr Shell.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/tragl/tragl.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/tragl</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/tranalyze/readme.md

@@ -65,7 +65,7 @@ _Output_
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/tranalyze/tranalyze.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/tranalyze</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trcaret/readme.md

@@ -18,7 +18,7 @@ Reads a tree from stdin and prints lines and caret marks.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trcaret/trcaret.csproj

@@ -19,7 +19,7 @@ This program is part of the Trash toolkit.
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trcaret</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trclonereplace/readme.md

@@ -19,7 +19,7 @@ Clone, rename, and replace symbols in a grammar to optimize full stack fallbacks
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trclonereplace/trclonereplace.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trclonereplace</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trcombine/readme.md

@@ -103,7 +103,7 @@ The original grammars are left unchanged.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trcombine/trcombine.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trcombine</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trconvert/readme.md

@@ -93,7 +93,7 @@ _Output_
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trconvert/trconvert.csproj

@@ -18,7 +18,7 @@ syntax. This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trconvert</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trcover/readme.md

@@ -24,7 +24,7 @@ a grammar.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trcover/trcover.csproj

@@ -18,7 +18,7 @@ for the entire grammar. This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trcover</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trdot/readme.md

@@ -63,7 +63,7 @@ The output will be:
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trdot/trdot.csproj

@@ -18,7 +18,7 @@ This program is part of the Trash toolkit.
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trdot</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trenum/readme.md

@@ -8,7 +8,7 @@
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trenum/trenum.csproj

@@ -18,7 +18,7 @@ This program is part of the Trash toolkit.
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
-    <Version>0.23.3</Version>
+    <Version>0.23.4</Version>
     <RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trull</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>

src/trfirst/readme.md

@@ -24,7 +24,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trfirst/trfirst.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trfirst</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trfold/readme.md

@@ -26,7 +26,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trfold/trfold.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trfold</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trfoldlit/readme.md

@@ -65,7 +65,7 @@ XPaths, type _export MSYS2_ARG_CONV_EXCL="*"_, then execute your command.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trfoldlit/trfoldlit.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trfoldlit</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trformat/readme.md

@@ -18,7 +18,7 @@ Format of grammar using machine learning.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trformat/trformat.csproj

@@ -17,7 +17,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trformat</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trgen/Command.cs

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

src/trgen/Config.cs

@@ -23,6 +23,9 @@ public class Config
         [Option('g', "grammar-name", Required = false, HelpText = "Grammar for parse.")]
         public string grammar_name { get; set; }
 
+	    [Option('i', "ignore", Required = false, Separator = ',', HelpText = "Ignored files or directories for generating app.")]
+	    public IEnumerable<string> ignore { get; set; } = new List<string>();
+
         [Option('o', "output-directory", Required = false, HelpText = "The output directory for the project.")]
         public string output_directory { get; set; }
 

src/trgen/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "dotnet-antlr": {
       "commandName": "Project",
-      "commandLineArgs": "-t CSharp",
+      "commandLineArgs": "-i save,comp -t CSharp",
       "workingDirectory": "C:\\msys64\\home\\Kenne\\fortran"
     }
   }

src/trgen/Test.cs

@@ -86,6 +86,8 @@ public bool IsTargetTypeScript
 
         public Test(Config config)
         {
+            this.ignore_string = null;
+
             // Check for existence of .trgen-ignore file.
             // If there is one, read and create pattern of what to ignore.
             if (File.Exists(config.ignore_list_of_files))
@@ -95,7 +97,19 @@ public Test(Config config)
                 var ignore_lines = lines.Where(l => !l.StartsWith("//")).ToList();
                 this.ignore_string = string.Join("|", ignore_lines);
             }
-            else this.ignore_string = null;
+            if (config.ignore.Any())
+            {
+                var t = string.Join("|", config.ignore);
+                if (this.ignore_string != null)
+                {
+                    this.ignore_string += "|" + t;
+                }
+                else
+                {
+                    this.ignore_string = t;
+                }
+            }
+
         }
     }
 }

src/trgen/readme.md

@@ -49,7 +49,7 @@ simplify and eliminate bugs created when adding new grammars.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trgen/trgen.csproj

@@ -18,7 +18,7 @@ This program is part of the Trash toolkit.]]>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
-		<Version>0.23.3</Version>
+		<Version>0.23.4</Version>
 		<RepositoryUrl>https://github.com/kaby76/Trash/tree/main/src/trgen</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>

src/trgenvsc/Properties/launchSettings.json

@@ -2,8 +2,8 @@
   "profiles": {
     "dotnet-antlr": {
       "commandName": "Project",
-      "commandLineArgs": "--help",
-      "workingDirectory": "C:\\msys64\\home\\Kenne\\issues\\g4-3976\\eiffel"
+      "commandLineArgs": "",
+      "workingDirectory": "C:\\msys64\\home\\Kenne\\issues\\a4-4685"
     }
   }
 }

src/trgenvsc/readme.md

@@ -21,7 +21,7 @@ A basic settings.rc file is supplied for you to edit.
 
 ## Current version
 
-0.23.3 Code clean up, improvements to tritext, added trsort, trclonerename.
+0.23.4 Clean up build of trgenvsc.
 
 ## License
 

src/trgenvsc/templates/install.sh

@@ -21,4 +21,4 @@ npm i vscode-languageserver-protocol@3.16.0-next.7
 npm i vscode-languageserver-types@3.16.0-next.3
 npm install
 npm run compile
-vsce package
+./node_modules/.bin/vsce package