Merge pull request #233 from sharwell/fix-codegen-test

Fix the testing of the Antlr4UseCSharpGenerator property

Author: sharwell

.gitignore

@@ -24,6 +24,7 @@ obj/
 reference/.metadata/
 reference/reference.net/
 /runtime/CSharp/packages/
+/build/DotnetValidation*/packages/
 
 # ignore Java (Maven) build directory
 tool/target/

appveyor.yml

@@ -5,7 +5,7 @@ init:
 - git config --global core.autocrlf true
 build_script:
 - cd build
-- powershell -Command .\build.ps1 -VisualStudioVersion "15.0" -Verbosity minimal -GenerateTests -MavenRepo C:\MavenRepo -Logger "${env:ProgramFiles}\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" -Java6Home "${env:ProgramFiles}\Java\jdk1.7.0\jre" -Validate
+- powershell -Command .\build.ps1 -VisualStudioVersion "15.0" -GenerateTests -MavenRepo C:\MavenRepo -Logger "${env:ProgramFiles}\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" -Java6Home "${env:ProgramFiles}\Java\jdk1.7.0\jre"
 - cd ..
 test_script:
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\%CONFIGURATION%\net45\Antlr4.Runtime.Test.dll"

build/DotnetValidation/DotnetValidation.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net20;net30;net35;net35-cf;net40;net45;netcoreapp1.1;portable40-net40+sl5+win8+wp8+wpa81</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
-    <UseCSharpGenerator>True</UseCSharpGenerator>
+    <Antlr4UseCSharpGenerator>True</Antlr4UseCSharpGenerator>
   </PropertyGroup>
 
   <Choose>

build/DotnetValidation/NuGet.config

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <config>
+    <add key="globalPackagesFolder" value="packages" />
+  </config>
   <packageSources>
     <add key="Local Build" value="..\nuget" />
   </packageSources>

build/DotnetValidationOld/DotnetValidation.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net20;net30;net35;net35-cf;net40;net45;netcoreapp1.1;portable40-net40+sl5+win8+wp8+wpa81</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
-    <UseCSharpGenerator>False</UseCSharpGenerator>
+    <Antlr4UseCSharpGenerator>False</Antlr4UseCSharpGenerator>
   </PropertyGroup>
 
   <Choose>

build/DotnetValidationOld/NuGet.config

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <config>
+    <add key="globalPackagesFolder" value="packages" />
+  </config>
   <packageSources>
     <add key="Local Build" value="..\nuget" />
   </packageSources>

build/build.ps1

@@ -2,15 +2,15 @@ param (
 	[switch]$Debug,
 	[string]$VisualStudioVersion = "15.0",
 	[switch]$NoClean,
-	[string]$Verbosity = "normal",
+	[string]$Verbosity = "minimal",
 	[string]$Logger,
 	[string]$Java6Home,
 	[string]$MavenHome,
 	[string]$MavenRepo,
 	[switch]$SkipMaven,
 	[switch]$SkipKeyCheck,
 	[switch]$GenerateTests,
-	[switch]$Validate
+	[switch]$NoValidate
 )
 
 # build the solutions
@@ -183,7 +183,7 @@ ForEach ($package in $packages) {
 }
 
 # Validate code generation using the Java code generator
-If ($Validate) {
+If (-not $NoValidate) {
 	git 'clean' '-dxf' 'DotnetValidationOld'
 	dotnet 'run' '--project' '.\DotnetValidationOld\DotnetValidation.csproj' '--framework' 'netcoreapp1.1'
 	if (-not $?) {
@@ -192,7 +192,7 @@ If ($Validate) {
 	}
 
 	git 'clean' '-dxf' 'DotnetValidationOld'
-	nuget 'restore' 'DotnetValidationOld'
+	&$nuget 'restore' 'DotnetValidationOld'
 	&$msbuild '/nologo' '/m' '/nr:false' '/t:Rebuild' $LoggerArgument "/verbosity:$Verbosity" "/p:Configuration=$BuildConfig" '.\DotnetValidationOld\DotnetValidation.sln'
 	if (-not $?) {
 		$host.ui.WriteErrorLine('Build failed, aborting!')
@@ -237,7 +237,7 @@ If ($Validate) {
 }
 
 # Validate code generation using the C# code generator
-If ($Validate) {
+If (-not $NoValidate) {
 	git 'clean' '-dxf' 'DotnetValidation'
 	dotnet 'run' '--project' '.\DotnetValidation\DotnetValidation.csproj' '--framework' 'netcoreapp1.1'
 	if (-not $?) {
@@ -246,7 +246,7 @@ If ($Validate) {
 	}
 
 	git 'clean' '-dxf' 'DotnetValidation'
-	nuget 'restore' 'DotnetValidation'
+	&$nuget 'restore' 'DotnetValidation'
 	&$msbuild '/nologo' '/m' '/nr:false' '/t:Rebuild' $LoggerArgument "/verbosity:$Verbosity" "/p:Configuration=$BuildConfig" '.\DotnetValidation\DotnetValidation.sln'
 	if (-not $?) {
 		$host.ui.WriteErrorLine('Build failed, aborting!')

runtime/CSharp/Antlr4.Tool/Analysis/LeftRecursiveRuleAnalyzer.cs

@@ -23,6 +23,7 @@ namespace Antlr4.Analysis
     using NotNullAttribute = Antlr4.Runtime.Misc.NotNullAttribute;
     using Path = System.IO.Path;
     using Tuple = System.Tuple;
+    using Uri = System.Uri;
 
     /** Using a tree walker on the rules, determine if a rule is directly left-recursive and if it follows
      *  our pattern.
@@ -76,11 +77,11 @@ public LeftRecursiveRuleAnalyzer(GrammarAST ruleAST,
 
         public virtual void LoadPrecRuleTemplates()
         {
+            string codeBaseLocation = new Uri(typeof(AntlrTool).GetTypeInfo().Assembly.CodeBase).LocalPath;
+            string baseDirectory = Path.GetDirectoryName(codeBaseLocation);
             string templateGroupFile = Path.Combine("Tool", "Templates", "LeftRecursiveRules.stg");
             recRuleTemplates = new TemplateGroupFile(
-                Path.Combine(
-                    Path.GetDirectoryName(typeof(AntlrTool).GetTypeInfo().Assembly.Location),
-                    templateGroupFile),
+                Path.Combine(baseDirectory, templateGroupFile),
                 Encoding.UTF8);
             if (!recRuleTemplates.IsDefined("recRule"))
             {

runtime/CSharp/Antlr4.Tool/AntlrTool.cs

@@ -17,6 +17,7 @@ namespace Antlr4
     using Antlr4.Tool.Ast;
     using ANTLRStringStream = Antlr.Runtime.ANTLRStringStream;
     using CommonTokenStream = Antlr.Runtime.CommonTokenStream;
+    using Console = System.Console;
     using StreamWriter = System.IO.StreamWriter;
     using Directory = System.IO.Directory;
     using Exception = System.Exception;
@@ -853,6 +854,7 @@ public virtual TextWriter GetOutputFileWriter(Grammar g, string fileName)
             // for subdir/T.g4, you get subdir here.  Well, depends on -o etc...
             string outputDir = GetOutputDirectory(g.fileName);
             string outputFile = Path.Combine(outputDir, fileName);
+            Console.WriteLine($"Generating file '{Path.GetFullPath(outputFile)}' for grammar '{g.fileName}'");
 
             Directory.CreateDirectory(outputDir);
 

runtime/CSharp/Antlr4.Tool/Codegen/Target.cs

@@ -16,6 +16,7 @@ namespace Antlr4.Codegen
     using Path = System.IO.Path;
     using TemplateMessage = Antlr4.StringTemplate.Misc.TemplateMessage;
     using TokenConstants = Antlr4.Runtime.TokenConstants;
+    using Uri = System.Uri;
 
     /** */
     public abstract class AbstractTarget
@@ -397,9 +398,11 @@ public virtual bool GrammarSymbolCausesIssueInGeneratedCode(GrammarAST idNode)
         [return: NotNull]
         protected virtual TemplateGroup LoadTemplates()
         {
+            string codeBaseLocation = new Uri(typeof(AntlrTool).GetTypeInfo().Assembly.CodeBase).LocalPath;
+            string baseDirectory = Path.GetDirectoryName(codeBaseLocation);
             TemplateGroup result = new TemplateGroupFile(
                 Path.Combine(
-                    Path.GetDirectoryName(typeof(AntlrTool).GetTypeInfo().Assembly.Location),
+                    baseDirectory,
                     Path.Combine(CodeGenerator.TEMPLATE_ROOT, GetLanguage(), GetLanguage() + TemplateGroup.GroupFileExtension)),
                 Encoding.UTF8);
             result.RegisterRenderer(typeof(int), new NumberRenderer());