From 6b79c57f01a0061c86f6b30fbb8a7a4e971fe85b Mon Sep 17 00:00:00 2001
From: Baklanov Lev <penachett@bk.ru>
Date: Sun, 28 Feb 2021 23:24:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B4=D0=BB=D1=8F=20rep?=
 =?UTF-8?q?eated-maybe=20(#290)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compiler/Checker.ref      | 11 ++++++-----
 src/compiler/ParseCmdLine.ref |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/compiler/Checker.ref b/src/compiler/Checker.ref
index ef27437b..bf4cd98e 100644
--- a/src/compiler/Checker.ref
+++ b/src/compiler/Checker.ref
@@ -83,10 +83,10 @@ PrepareMessage {
     = 'Repeated variable ' s.Mode '.' e.Index ' in specialization pattern';
 
   RepeatedVariable s.Mode e.Index
-      = 'Repeated variable ' s.Mode '.' e.Index ' in assignment';
+      = 'Repeated variable ' s.Mode '.' e.Index ' in assignment/last sentence';
 
   RepeatedVariableMaybe s.Mode e.Index
-      = 'Maybe repeated variable ' s.Mode '.' e.Index ' in last sentence';
+      = 'Maybe repeated variable ' s.Mode '.' e.Index;
 
   UnnamedVariableInSpecPattern s.Mode e.Index
     = 'Unnamed variable ' s.Mode '.' e.Index ' can\'t appear '
@@ -781,7 +781,7 @@ CheckSentenceRec {
   (e.ScopeVars) t.LastSentence
     = <CheckSentence e.ScopeVars t.LastSentence LastSentence> ;
   (e.ScopeVars) t.Sentence e.Sentences
-    = <CheckSentence e.ScopeVars t.Sentence>
+    = <CheckSentence e.ScopeVars t.Sentence NotLastSentence>
       <CheckSentenceRec (e.ScopeVars) e.Sentences>;
   (e.ScopeVars) /* предложений нет */ = /* пусто */ ;
 }
@@ -945,8 +945,9 @@ ReplaceInterval {
 
 WarningIdByFlag {
   Assign = RepeatedVariable;
-  LastSentence = RepeatedVariableMaybe;
-  Condition = /* для условий предупреждения не выдаются */;
+  LastSentence = RepeatedVariable;
+  NotLastSentence = RepeatedVariableMaybe;
+  Condition = RepeatedVariableMaybe;
   /* пусто */ = /* пусто */;
 }
 
diff --git a/src/compiler/ParseCmdLine.ref b/src/compiler/ParseCmdLine.ref
index 28c59400..6ed4a013 100644
--- a/src/compiler/ParseCmdLine.ref
+++ b/src/compiler/ParseCmdLine.ref
@@ -388,9 +388,9 @@ PrintHelp {
 '          -Wpseudofunctions, -Wno-... - check/don\'t pseudofunction\n'
 '                                        correctness (enabled by default)\n'
 '          -Wrepeated, -Wno-... - check/don\'t repeated variables\n'
-'                                        in assignments (disabled by default)\n'
+'                          in assignments/last sentences (disabled by default)\n'
 '          -Wrepeated-maybe, -Wno-... - check/don\'t repeated variables\n'
-'                                        in last sentences (disabled by default)\n'
+'                                        (disabled by default)\n'
 '          -Werror[=...], -Wno-error[=...] - treat/don\'t all or only provided\n'
 '                                            warning(s) as error(s)\n'
 '-p, --prefix prefix-name\n'