Fixed typo in analyzer.

wiredwiz · wiredwiz · commit 1792bab586c4 · 2020-03-20T12:26:27.000-04:00
Began adding syntax highter support to Grun tool.
diff --git a/Common/Properties/AssemblyInfo.cs b/Common/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20079.0")]
-[assembly: AssemblyFileVersion("1.0.20079.0")]
+[assembly: AssemblyVersion("1.0.20080.0")]
+[assembly: AssemblyFileVersion("1.0.20080.0")]
diff --git a/Grun/Program.cs b/Grun/Program.cs
@@ -44,6 +44,7 @@
 using System.Text;
 using System.Windows.Forms;
 
+using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
 
 using CommandLine;
@@ -59,6 +60,9 @@
 using Org.Edgerunner.ANTLR4.Tools.Testing.Grammar;
 using Org.Edgerunner.ANTLR4.Tools.Testing.GrunDotNet.Properties;
 using Org.Edgerunner.ANTLR4.Tools.Testing.GrunWin;
+using Org.Edgerunner.ANTLR4.Tools.Testing.GrunWin.Editor.SyntaxHighlighting;
+
+using Parser = CommandLine.Parser;
 
 // ReSharper disable RedundantNameQualifier
 namespace Org.Edgerunner.ANTLR4.Tools.Testing.GrunDotNet
@@ -132,10 +136,50 @@ private static void Main(string[] args)
                             }
                             else
                             {
+                               var analyzer = new Analyzer();
+                               var builder = new StringBuilder();
+                               var currentLine = Console.CursorTop;
                                Console.WriteLine(Resources.ReadingFromStandardInputPromptMessage);
-                               string line;
-                               while ((line = Console.ReadLine()) != null)
-                                  data += line + Environment.NewLine;
+                               while (true)
+                               {
+                                  var typed = Console.ReadKey(true);
+
+                                  if ((typed.Modifiers & ConsoleModifiers.Control) == ConsoleModifiers.Control
+                                      && typed.Key == ConsoleKey.Z)
+                                  {
+                                     Console.Write("^Z");
+                                     break;
+                                  }
+
+                                  if (typed.Key == ConsoleKey.Enter)
+                                  {
+                                     Console.WriteLine();
+                                     builder.Append("\r\n");
+                                  }
+                                  else if (typed.Key == ConsoleKey.Backspace)
+                                  {
+                                     if (Console.CursorLeft > 0)
+                                     {
+                                        Console.Write(typed.KeyChar);
+                                        Console.Write(' ');
+                                        Console.Write(typed.KeyChar);
+                                        builder.Remove(builder.Length - 1, 1);
+                                     }
+                                  }
+                                  else
+                                  {
+                                     Console.Write(typed.KeyChar);
+                                     builder.Append(typed.KeyChar);
+                                  }
+
+                                  var grammarParser = analyzer.BuildParserWithOptions(grammar, data, ParseOption.None);
+                                  grammarParser.RemoveErrorListeners();
+                                  analyzer.ExecuteParsing(grammarParser, o.RuleName);
+                                  HighlightSyntaxInConsole(currentLine, analyzer, null);
+                               }
+
+                               Console.WriteLine();
+                               data = builder.ToString();
                             }
 
                             // If tokens are the only option we've received, we don't need to parse
@@ -153,7 +197,7 @@ private static void Main(string[] args)
                                analyzer.ExecuteParsing(grammarParser, o.RuleName);
 
                                if (showParseTree)
-                                  Console.WriteLine(analyzer.ParseContext.ToStringTree(grammarParser));
+                                  Console.WriteLine(analyzer.ParserContext.ToStringTree(grammarParser));
 
                                if (writeSvg)
                                {
@@ -164,7 +208,7 @@ private static void Main(string[] args)
                                      BorderColor = _Settings.GraphNodeBorderColor.GetMsAglColor(),
                                      TextColor = _Settings.GraphNodeTextColor.GetMsAglColor()
                                   };
-                                  var graph = grapher.CreateGraph(analyzer.ParseContext, rules.ToList());
+                                  var graph = grapher.CreateGraph(analyzer.ParserContext, rules.ToList());
                                   graph.LayoutAlgorithmSettings = new SugiyamaLayoutSettings();
                                   GraphRenderer renderer = new GraphRenderer(graph);
                                   renderer.CalculateLayout();
@@ -207,6 +251,39 @@ private static void Main(string[] args)
          }
       }
 
+      private static void HighlightSyntaxInConsole(int lineOffset, Analyzer analyzer, IStyleRegistry registry)
+      {
+         return; 
+
+         if (analyzer?.ParserContext == null)
+            return;
+
+         if (registry == null)
+            return;
+
+         var cursorRow = Console.CursorTop;
+         var cursorColumn = Console.CursorLeft;
+         foreach (var token in analyzer.DisplayTokens)
+            ColorToken(token, lineOffset, registry);
+
+         Console.SetCursorPosition(cursorColumn, cursorRow);
+      }
+
+      private static void ColorToken(SyntaxToken token, int lineOffset, IStyleRegistry registry)
+      {
+         var startLine = token.LineNumber + lineOffset;
+         var endLine = token.EndingLineNumber + lineOffset;
+         for (int ln = startLine; ln < endLine + 1; ln++)
+         {
+            for (int col = token.ColumnPosition; col < token.EndingColumnPosition + 1; col++)
+            {
+               Console.SetCursorPosition(col, ln);
+
+               // TODO: add syntax highlight logic.
+            }
+         }
+      }
+
       private static void DisplayTokens(GrammarReference grammar, string data)
       {
          var analyzer = new Grammar.Analyzer();
diff --git a/Grun/Properties/AssemblyInfo.cs b/Grun/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20079.0")]
-[assembly: AssemblyFileVersion("1.0.20079.0")]
+[assembly: AssemblyVersion("1.0.20080.15")]
+[assembly: AssemblyFileVersion("1.0.20080.15")]
diff --git a/GunWin/Dialogs/AboutBox.resx b/GunWin/Dialogs/AboutBox.resx
@@ -126,7 +126,7 @@
         k4H0HyCOSy4oKmFgYIwBsrnLSwpA7AwgWyQpG8yuAbGLgA4EsieA2OkQ9hKwGgh7B1hNSJAzkH0GyHZI
         R2InIbGh9oIAc7IRA9VBSWpFCYh2c2JgAIUpelghxJjFgNgYGBdLEGL5ixgYLL4CxScgxJJmMjBsb2Vg
         kLiFEFNZwMDA38LAsO18cmlRGdRqKSA+zXiSOZl1Ekc29zcBe9FAaRPFj5oTjCSsJ7mxBpbHvs0uqGLt
-        3DirZk3m/trLh18a/P8PAN5BU32YWvgkAAAACXBIWXMAAA7CAAAOwgEVKEqAAAD+Y0lEQVR4Xuz9B0BU
+        3DirZk3m/trLh18a/P8PAN5BU32YWvgkAAAACXBIWXMAAA7BAAAOwQG4kWvtAAD+Y0lEQVR4Xuz9B0BU
         d9o2DidxTd1sNjGJSTY9GjX23nuhV1FRUVARBRURRFBUkCoIdlEQFey999577xXpdXpvzP1d95kZnbhJ
         9nnf73ne/7NZf7tXZhhnzjlz5lzXfd33r5w3Xrf/9vZmhw4+7/n4+HwyfPjwf/gHBTUMCQntMiY4dNS4
         CWEJE8MiN0RNm3FvVkKKKj1jAeWsyKVt23fS4cPH6MzZC3T9+k16/OQplZSUUXW1mFQqNdXU1NDvNjP+
diff --git a/GunWin/Parsing/ParseWorker.cs b/GunWin/Parsing/ParseWorker.cs
@@ -178,7 +178,7 @@ private ParserResult HandleParsing(ParserWorkItem work)
          parser.AddErrorListener(errorListener);
          analyzer.ExecuteParsing(parser, work.ParserRuleName);
 
-         return new ParserResult(analyzer.DisplayTokens, analyzer.ParseContext, work.ParserRuleName, errorListener.Errors, trace ? parseTreeListener.Events : new List<TraceEvent>());
+         return new ParserResult(analyzer.DisplayTokens, analyzer.ParserContext, work.ParserRuleName, errorListener.Errors, trace ? parseTreeListener.Events : new List<TraceEvent>());
       }
 
       private void OnParsingFinished(ParserResult result)
diff --git a/GunWin/Properties/AssemblyInfo.cs b/GunWin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20079.0")]
-[assembly: AssemblyFileVersion("1.0.20079.0")]
+[assembly: AssemblyVersion("1.0.20080.1")]
+[assembly: AssemblyFileVersion("1.0.20080.1")]
diff --git a/GunWin/VisualAnalyzer.cs b/GunWin/VisualAnalyzer.cs
@@ -232,7 +232,7 @@ public void ParseSource()
 
          try
          {
-            _GraphWorker?.Graph(_Grapher, analyzer.ParseContext, _Grammar.ParserRules);
+            _GraphWorker?.Graph(_Grapher, analyzer.ParserContext, _Grammar.ParserRules);
          }
          catch (Exception ex)
          {
diff --git a/TestRig/Grammar/Analyzer.cs b/TestRig/Grammar/Analyzer.cs
@@ -65,10 +65,10 @@ public class Analyzer
       public IList<SyntaxToken> DisplayTokens { get; private set; }
 
       /// <summary>
-      /// Gets the parse context.
+      /// Gets the parser context.
       /// </summary>
-      /// <value>The parse context.</value>
-      public ParserRuleContext ParseContext { get; private set; }
+      /// <value>The parser context.</value>
+      public ParserRuleContext ParserContext { get; private set; }
 
       /// <summary>
       /// Gets a Lisp-style parse tree.
@@ -183,7 +183,7 @@ public void ExecuteParsing([NotNull] Parser parser, [NotNull] string parserRule)
          if (methodInfo == null)
             throw new GrammarException($"No parser rule with name \"{parserRule}\" found.");
 
-         ParseContext = methodInfo.Invoke(parser, null) as ParserRuleContext;
+         ParserContext = methodInfo.Invoke(parser, null) as ParserRuleContext;
          IsParsed = true;
       }
 
diff --git a/TestRig/Properties/AssemblyInfo.cs b/TestRig/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20079.0")]
-[assembly: AssemblyFileVersion("1.0.20079.0")]
+[assembly: AssemblyVersion("1.0.20080.0")]
+[assembly: AssemblyFileVersion("1.0.20080.0")]

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private ParserResult HandleParsing(ParserWorkItem work)`
`178`	`178`	`parser.AddErrorListener(errorListener);`
`179`	`179`	`analyzer.ExecuteParsing(parser, work.ParserRuleName);`
`180`	`180`
`181`		`- return new ParserResult(analyzer.DisplayTokens, analyzer.ParseContext, work.ParserRuleName, errorListener.Errors, trace ? parseTreeListener.Events : new List<TraceEvent>());`
	`181`	`+ return new ParserResult(analyzer.DisplayTokens, analyzer.ParserContext, work.ParserRuleName, errorListener.Errors, trace ? parseTreeListener.Events : new List<TraceEvent>());`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`private void OnParsingFinished(ParserResult result)`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public void ParseSource()`
`232`	`232`
`233`	`233`	`try`
`234`	`234`	`{`
`235`		`- _GraphWorker?.Graph(_Grapher, analyzer.ParseContext, _Grammar.ParserRules);`
	`235`	`+ _GraphWorker?.Graph(_Grapher, analyzer.ParserContext, _Grammar.ParserRules);`
`236`	`236`	`}`
`237`	`237`	`catch (Exception ex)`
`238`	`238`	`{`