В дереве отслеживаются позиции имён функций в выражениях

Этот коммит предназначен для упрощения восприятия следующего, но вообще может быть полезен при написании демонстрационных компонентов (#27)
Mazdaywik · Mar 12, 2019 · 858d8ab · 858d8ab
1 parent 140d18d
commit 858d8ab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/docs/4-libraryex-components.md b/docs/4-libraryex-components.md
@@ -353,10 +353,11 @@
     t.Term ::=
         (Symbol Char s.CHAR)
       | (Symbol Number s.NUMBER)
-      | (Symbol Name e.Name)
+      | (Symbol Name t.SrcPos e.Name)
       | (Variable s.Mode e.Index)
       | (Brackets e.Expression)
       | (CallBrackets e.Expression)
+    t.SrcPos ::= (s.Row s.Col)
     s.Mode ::= 's' | 't' | 'e'
     e.Index ::= s.CHAR+
 
@@ -372,7 +373,7 @@
     <Symbol s.Type e.Info> == s.CHAR*
     <Char s.CHAR> == s.CHAR*
     <Number s.NUMBER> == s.CHAR*
-    <Name e.Name> == s.CHAR*
+    <Name t.SrcPos e.Name> == s.CHAR*
     <Variable s.Mode e.Index> == s.CHAR*
     <Brackets e.Expression> == s.CHAR*
     <CallBrackets e.Expression> == s.CHAR*

diff --git a/src/R05-AST.ref b/src/R05-AST.ref
@@ -92,7 +92,7 @@ FlatLines {
   t.Term ::=
       (Symbol Char s.CHAR)
     | (Symbol Number s.NUMBER)
-    | (Symbol Name e.Name)
+    | (Symbol Name t.SrcPos e.Name)
     | (Variable s.Mode e.Index)
     | (Brackets e.Expression)
     | (CallBrackets e.Expression)
@@ -113,7 +113,7 @@ $ENTRY Number {
 }
 
 $ENTRY Name {
-  e.Name = e.Name;
+  t.SrcPos e.Name = e.Name;
 }
 
 $ENTRY Variable {

diff --git a/src/R05-Generator.ref b/src/R05-Generator.ref
@@ -239,7 +239,7 @@ MatchArgs {
 SymbolTextRep {
   Char s.Char = '\'' <EscapeChar s.Char> '\'';
   Number s.Number = <Symb s.Number> 'UL';
-  Name e.Name = '&r05f_' e.Name;
+  Name t.SrcPos e.Name = '&r05f_' e.Name;
 }
 
 CmdEmpty {
@@ -461,7 +461,7 @@ CompileSentence-Aux {
     s.MatchType e.MatchValue ::=
         Symbol Char s.Char
       | Symbol Number s.Number
-      | Symbol Name e.Name
+      | Symbol Name t.SrcPos e.Name
       | Brackets s.InnerNum
       | Repeated s.Usings s.Mode e.Index
       | Variable s.Mode e.Index

diff --git a/src/R05-Parser.ref b/src/R05-Parser.ref
@@ -570,7 +570,7 @@ ParsePatternTerm {
 
   /* PatternTerm ::= NAME */
   (TkName t.SrcPos e.Name) e.Tokens t.ErrorList =
-    (PatternTerm ((t.SrcPos e.Name)) () (Symbol Name e.Name))
+    (PatternTerm ((t.SrcPos e.Name)) () (Symbol Name t.SrcPos e.Name))
     e.Tokens t.ErrorList;
 
   /* Переменные */
@@ -717,7 +717,7 @@ ParseResultTerm {
 
   /* ResultTerm ::= NAME */
   (TkName t.SrcPos e.Name) e.Tokens (e.Variables) t.ErrorList =
-    (ResultTerm ((t.SrcPos e.Name)) (Symbol Name e.Name))
+    (ResultTerm ((t.SrcPos e.Name)) (Symbol Name t.SrcPos e.Name))
     e.Tokens (e.Variables) t.ErrorList;
 
   /* Переменные */