Проверка внесена в основной checker + добавлен маркер последнего пред…

…ложения (#290)
bmstu-iu9 · Feb 26, 2021 · 58d33af · 58d33af
1 parent 034630a
commit 58d33af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 52 deletions.
diff --git a/src/compiler/Checker-RepeatedVars.ref b/src/compiler/Checker-RepeatedVars.ref
diff --git a/src/compiler/Checker.ref b/src/compiler/Checker.ref
@@ -15,9 +15,6 @@ $EXTERN ExtractVariables-Expr;
 *$FROM Checker-Screening
 $EXTERN CheckScreening;
 
-*$FROM Checker-RepeatedVars
-$EXTERN CheckRepeatedVars;
-
 $ENTRY CheckProgram {
   (e.WarningIds) t.ErrorList e.AST
     = <Reduce
@@ -130,8 +127,7 @@ FindErrors {
         (<CheckDeclarations (e.WarningIds) e.Declarations>)
         <Map &CheckFunctionBody e.FunctionBodies>
       >
-      <CheckScreening (e.WarningIds) (e.AST)>
-      <CheckRepeatedVars (e.WarningIds) (e.AST)>;
+      <CheckScreening (e.WarningIds) (e.AST)>;
 }
 
 CheckPseudofunctions {
@@ -775,12 +771,20 @@ CheckFunctionBody {
 
 CheckFunctionBodyRec {
   (e.ScopeVars) Sentences e.Sentences =
-    <Map (&CheckSentence e.ScopeVars) e.Sentences>;
+    <CheckSentenceRec (e.ScopeVars) e.Sentences>;
 
   (e.ScopeVars) NativeBody e.Code =
     /* пусто, нет ни имён функций, ни ошибок внутри */;
 }
 
+CheckSentenceRec {
+  (e.ScopeVars) t.LastSentence
+    = <CheckSentence e.ScopeVars t.LastSentence LastSentenceMarker> ;
+  (e.ScopeVars) t.Sentence e.Sentences
+    = <CheckSentence e.ScopeVars t.Sentence>
+      <CheckSentenceRec (e.ScopeVars) e.Sentences>;
+}
+
 CheckSentence {
   e.ScopeVars ((e.Pattern) e.Assignments (e.Result) (e.Blocks))
 
@@ -866,7 +870,12 @@ FlatExpr {
 
 CheckPattern {
   (e.ScopeVars) e.Pattern
-    = <CheckPattern-Flatten (e.ScopeVars) <FlatExpr e.Pattern>>;
+    = <CheckPattern-WarnRepeated (e.ScopeVars) e.Pattern>
+      <CheckPattern-Flatten (e.ScopeVars) <FlatExpr e.Pattern>>;
+}
+
+CheckPattern-WarnRepeated {
+ e._ =;
 }
 
 CheckPattern-Flatten {