Исправлены предупреждения -Wrepeated в src/compiler (bmstu-iu9#290)

Mazdaywik · Mar 8, 2021 · a1aa6ab · a1aa6ab
1 parent 34df5c8
commit a1aa6ab
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/compiler/Desugaring.ref b/src/compiler/Desugaring.ref
@@ -843,7 +843,7 @@ ExtractNested-Result-Term {
             (Symbol Name e.ClosureName);
 
         /* Случай функции с контекстом */
-        (e.NestedBorrowedVars) Sentences e.Sentences
+        (e.NestedBorrowedVars^) Sentences e.Sentences
           = <CreateContext s.MarkupContext e.NestedBorrowedVars> : e.Context
           = (Function
               GN-Local (e.ClosureName)

diff --git a/src/compiler/GlobalGen.ref b/src/compiler/GlobalGen.ref
@@ -248,7 +248,7 @@ GlobalGenFromLocalGen {
             = <Max s.NumAcc s.NumNext>
             : {
                 s.NumAcc = (s.NumAcc e.SentenceAcc);
-                s.NumNext = (s.NumNext e.SentenceNext);
+                s._ = (s.NumNext e.SentenceNext);
               };
         }
         t.Sentence

diff --git a/src/compiler/HighLevelRASL-ConjointFunc.ref b/src/compiler/HighLevelRASL-ConjointFunc.ref
@@ -275,7 +275,7 @@ DoFindDivision {
     = ForGroup (<Subst-Collapse e.Image>) (e.FirstGroup) e.SecondGroup;
 
   s.Counter (e.TrivialGCG) (e.Image) (e.FirstGroup) (e.NextSentence) e.Sentences
-    = <ImagedSentence e.NextSentence> : (e.NextImage) e.NextSentence
+    = <ImagedSentence e.NextSentence> : (e.NextImage) e.NextSentence^
     = <Subst-Generalization (e.Image) (e.NextImage)> : e.NewImage
     = e.NewImage
     : {

diff --git a/src/compiler/OptTree-Spec.ref b/src/compiler/OptTree-Spec.ref
@@ -328,7 +328,7 @@ SpecSentence {
         (e.SpecInfo (e.Histories) (e.History) (e.NewFunctions))
         e.Result
       >
-    : (e.SpecInfo^ (e.Histories^) (e.History) (e.NewFunctions^)) e.Result^
+    : (e.SpecInfo^ (e.Histories^) (e.History^) (e.NewFunctions^)) e.Result^
     = (e.SpecInfo (e.Histories) (e.History) (e.NewFunctions))
       ((e.Pattern) e.Conditions (e.Result));
 }
@@ -350,7 +350,7 @@ SpecResult {
         Functions (e.SpecInfo (e.Histories) (e.History) (e.NewFunctions))
         e.Result
       >
-    : (e.SpecInfo^ (e.Histories^) (e.History) (e.NewFunctions^)) e.Result^
+    : (e.SpecInfo^ (e.Histories^) (e.History^) (e.NewFunctions^)) e.Result^
     = <SpecResult-Pass
         Closures (e.SpecInfo (e.Histories) (e.History) (e.NewFunctions))
         e.Result
@@ -1143,7 +1143,7 @@ MapGenericMatches {
         ((e.ArgStaticMatches) (/* for result */))
         e.PatternStaticMatches
       >
-    : ((e.ArgStaticMatches) (e.ResultMatches))
+    : ((e._) (e.ResultMatches))
     = e.ResultMatches;
 }
 

diff --git a/src/compiler/R5-Lexer.ref b/src/compiler/R5-Lexer.ref
@@ -465,9 +465,9 @@ HexDigit {
   s.Digit
     , <Type s.Digit>
     : {
-        'D0' s.Digit = <Numb s.Digit>;
-        'Lu' s.Digit = <DoHexDigit 'ABCDEF' 10 s.Digit>;
-        'Ll' s.Digit = <DoHexDigit 'abcdef' 10 s.Digit>;
+        'D0' s.Digit^ = <Numb s.Digit>;
+        'Lu' s.Digit^ = <DoHexDigit 'ABCDEF' 10 s.Digit>;
+        'Ll' s.Digit^ = <DoHexDigit 'abcdef' 10 s.Digit>;
 
         s.Other = /* пусто */;
       };

diff --git a/src/compiler/R5-Parser.ref b/src/compiler/R5-Parser.ref
@@ -446,18 +446,18 @@ Block-AfterSentence {
             (Sentences e.Sentences t.NextSentence)
             e.Tokens;
 
-        (TkCloseBlock t.Pos) t.Token2
+        (TkCloseBlock t.Pos) t._
           = t.ErrorList
             (Sentences e.Sentences t.NextSentence)
             t.Token2 e.Tokens;
 
-        (TkSemicolon t.Pos) t.Token2
+        (TkSemicolon t.Pos) t._
           = <Block-AfterSentence
               s.Mode (e.Sentences t.NextSentence)
               <Sentence t.ErrorList s.Mode t.Token2 e.Tokens>
             >;
 
-        t.Token1 t.Token2
+        t._ t._
           = <UnexpectedToken t.ErrorList t.Token1 '\';\' or \'}\', skipped'>
           : t.ErrorList^
           = <Block-AfterSentence