Displays file line/column on lexing

Author: rollrat

ParserGenerator.cs

@@ -1307,7 +1307,8 @@ public class ParsingTreeNode
         {
             public string Produnction;
             public string Contents;
-            public string UserContents;
+            public object UserContents;
+            public int ProductionRuleIndex;
             public ParsingTreeNode Parent;
             public List<ParsingTreeNode> Childs;
 
@@ -1318,15 +1319,13 @@ public static ParsingTreeNode NewNode(string production)
             public static ParsingTreeNode NewNode(string production, string contents)
                 => new ParsingTreeNode { Parent = null, Childs = new List<ParsingTreeNode>(), Produnction = production, Contents = contents };
         }
-
-        int tree_index;
+        
         ParsingTreeNode root;
 
-        public ParsingTree(int index = 0)
+        public ParsingTree(ParsingTreeNode root)
         {
-            tree_index = index;
+            this.root = root;
         }
-
     }
 
     /// <summary>
@@ -1371,6 +1370,8 @@ public void Clear()
             treenode_stack.Clear();
         }
 
+        public ParsingTree Tree => new ParsingTree(treenode_stack.Peek());
+
         public string Stack() => string.Join(" ", new Stack<int>(state_stack));
 
         public void Insert(string token_name, string contents) => Insert(symbol_name_index[token_name], contents);
@@ -1426,6 +1427,7 @@ private void reduce(int index)
             state_stack.Push(goto_table[state_stack.Peek()][group_table[reduce_production]]);
 
             var reduction_parent = ParsingTree.ParsingTreeNode.NewNode(symbol_index_name[group_table[reduce_production]]);
+            reduction_parent.ProductionRuleIndex = reduce_production - 1;
             reduce_treenodes.ForEach(x => x.Parent = reduction_parent);
             reduction_parent.Contents = string.Join("", reduce_treenodes.Select(x => x.Contents));
             reduction_parent.Childs = reduce_treenodes;

ScannerGenerator.cs

@@ -149,7 +149,7 @@ private diagram make_nfa(string pattern)
                         break;
 
                     case ')':
-                        if (opstack.Peek() != '(')
+                        if (opstack.Count == 0 || opstack.Peek() != '(')
                         {
                             build_errors.Add($"[regex] {i} no opener!");
                             return null;
@@ -896,6 +896,8 @@ public class Scanner
         bool err = false;
         int latest_pos;
         List<int> err_pos;
+        int current_line;
+        int current_column;
 
         public Scanner(int[][] transition_table, string[] accept_table)
         {
@@ -907,6 +909,8 @@ public void AllocateTarget(string literal)
         {
             target = literal;
             pos = 0;
+            current_line = 0;
+            current_column = 0;
             err_pos = new List<int>();
             err = false;
         }
@@ -923,12 +927,15 @@ public bool Error()
 
         public int Position { get { return latest_pos; } }
 
-        public Tuple<string, string> Next()
+        public Tuple<string, string, int, int> Next()
         {
             var builder = new StringBuilder();
             var node_pos = 0;
             latest_pos = pos;
 
+            int cur_line = current_line;
+            int cur_column = current_column;
+
             for (; pos < target.Length; pos++)
             {
                 int next_transition = transition_table[node_pos][target[pos]];
@@ -944,6 +951,9 @@ public Tuple<string, string> Next()
                             latest_pos = pos;
                             pos--;
                             node_pos = 0;
+                            current_column--;
+                            cur_line = current_line;
+                            cur_column = current_column;
                             continue;
                         }
                         if (accept_table[node_pos] == null)
@@ -952,20 +962,21 @@ public Tuple<string, string> Next()
                             err_pos.Add(pos);
                             continue;
                         }
-                        return new Tuple<string, string>(accept_table[node_pos], builder.ToString());
+                        return new Tuple<string, string, int, int> (accept_table[node_pos], builder.ToString(), cur_line + 1, cur_column + 1);
 
                     default:
+                        if (target[pos] == '\n') { current_line++; current_column = 1; } else current_column++;
                         builder.Append(target[pos]);
                         break;
                 }
 
                 node_pos = next_transition;
             }
 
-            return new Tuple<string, string>(accept_table[node_pos], builder.ToString());
+            return new Tuple<string, string, int, int> (accept_table[node_pos], builder.ToString(), cur_line + 1, cur_column + 1);
         }
 
-        public Tuple<string, string> Lookahead()
+        public Tuple<string, string, int, int> Lookahead()
         {
             var npos = pos;
             var result = Next();