Псевдокомментарии \*\$(NO-)?(OPT|DRIVE|SPEC) (#195, #314)

После псевдокомментария может следовать любое количество имён, запятых и точек с запятой (знаки пунктуации игнорируются), имя должно быть как минимум одно.
bmstu-iu9 · Aug 22, 2021 · edd0579 · edd0579
1 parent 84c8d7b
commit edd0579
Show file tree

Hide file tree

Showing 27 changed files with 359 additions and 74 deletions.
diff --git a/autotests/opt-tree-no-drive.ref b/autotests/opt-tree-no-drive.ref
@@ -0,0 +1,19 @@
+* TREE
+
+$ENTRY Go {
+  /* empty */ = /* empty */;
+
+  X = <Test '******************************' ()>;
+}
+
+*$NODRIVE Test, Double
+
+Test {
+  '*' e.Count (e.Acc) = <Test e.Count (<Double (e.Acc)>)>;
+
+  /* empty */ (e.Acc) = e.Acc;
+}
+
+Double {
+  (e.Acc) = (e.Acc) (e.Acc)
+}
diff --git a/autotests/opt-tree-no-opt-misplaced.ref b/autotests/opt-tree-no-opt-misplaced.ref
@@ -0,0 +1,15 @@
+* TREE
+
+$ENTRY Go {
+  /* empty */ = /* empty */;
+
+  X = <Test '******************************' ()>;
+}
+
+Test {
+  '*' e.Count (e.Acc) = <Test e.Count ((e.Acc) (e.Acc))>;
+
+*$NOOPT Test
+
+  /* empty */ (e.Acc) = e.Acc;
+}
diff --git a/autotests/opt-tree-no-opt.ref b/autotests/opt-tree-no-opt.ref
@@ -0,0 +1,15 @@
+* TREE
+
+$ENTRY Go {
+  /* empty */ = /* empty */;
+
+  X = <Test '******************************' ()>;
+}
+
+*$NOOPT Test
+
+Test {
+  '*' e.Count (e.Acc) = <Test e.Count ((e.Acc) (e.Acc))>;
+
+  /* empty */ (e.Acc) = e.Acc;
+}
diff --git a/autotests/opt-tree-no-spec.ref b/autotests/opt-tree-no-spec.ref
@@ -0,0 +1,16 @@
+* TREE
+
+$ENTRY Go {
+  /* empty */ = /* empty */;
+
+  X = <Test '******************************' ()>;
+}
+
+*$NODRIVE Test
+*$NOSPEC Test
+
+Test {
+  '*' e.Count (e.Acc) = <Test e.Count ((e.Acc) (e.Acc))>;
+
+  /* empty */ (e.Acc) = e.Acc;
+}
diff --git a/autotests/pseudocomments-error-misplaced.BAD-SYNTAX.ref b/autotests/pseudocomments-error-misplaced.BAD-SYNTAX.ref
diff --git a/autotests/pseudocomments-ok-multiline.ref b/autotests/pseudocomments-ok-multiline.ref
@@ -1,3 +1,5 @@
+* NO-WARNINGS
+
 *$EXTENDED;
 
 *$DRIVE Foo,

diff --git a/autotests/pseudocomments-ok.ref b/autotests/pseudocomments-ok.ref
@@ -1,6 +1,8 @@
+* NO-WARNINGS
+
 *$EXTENDED;
 
-*$SPEC Func s.STAT (s.dyn);
+*$SPEC Func;,;,;
 
 Func {
   s.Stat (s.Dyn) = s.Stat s.Dyn;

diff --git a/...eudocomments-warnings-classic.WARNING.ref → ...seudocomments-warning-classic.WARNING.ref b/...eudocomments-warnings-classic.WARNING.ref → ...seudocomments-warning-classic.WARNING.ref
@@ -1,4 +1,4 @@
-* WARNING ignored-pseudocomments
+* WARNING pseudocomment
 
 *$CLASSIC;
 

diff --git a/autotests/pseudocomments-warning-conflict.WARNING.ref b/autotests/pseudocomments-warning-conflict.WARNING.ref
@@ -0,0 +1,6 @@
+* WARNING pseudocomment
+
+*$SPEC S;
+*$NOSPEC S;
+
+$ENTRY S { = }
diff --git a/autotests/pseudocomments-warning-dangling.WARNING.ref b/autotests/pseudocomments-warning-dangling.WARNING.ref
@@ -0,0 +1,5 @@
+* WARNING pseudocomment
+
+*$OPT Undefined;
+
+$ENTRY Go { = }
diff --git a/autotests/pseudocomments-warning-empty.WARNING.ref b/autotests/pseudocomments-warning-empty.WARNING.ref
@@ -0,0 +1,7 @@
+* WARNING pseudocomment
+
+*$OPT
+
+$ENTRY Test {
+  /* empty */ = /* empty */
+}
diff --git a/...eudocomments-warning-extended.WARNING.ref → ...pseudocomments-warning-lexer1.WARNING.ref b/...eudocomments-warning-extended.WARNING.ref → ...pseudocomments-warning-lexer1.WARNING.ref
@@ -1,8 +1,8 @@
-* WARNING nul-in-compound
+* WARNING pseudocomment
 
 *$EXTENDED;
 
-*$SPEC Func s.STAT "ABC\x00DEF" s.dyn;
+*$SPEC Func "unclosed quote;
 
 $ENTRY Func {
   s.Stat ABC s.Dyn = s.Stat s.Dyn;

diff --git a/...pseudocomments-error-lexer.BAD-SYNTAX.ref → ...pseudocomments-warning-lexer2.WARNING.ref b/...pseudocomments-error-lexer.BAD-SYNTAX.ref → ...pseudocomments-warning-lexer2.WARNING.ref
@@ -1,6 +1,8 @@
+* WARNING pseudocomment
+
 *$EXTENDED;
 
-*$SPEC Func s.STAT 'unclosed quote;
+*$SPEC Func "ABC\x00DEF";
 
 $ENTRY Func {
   s.Stat ABC s.Dyn = s.Stat s.Dyn;

diff --git a/...docomments-error-multiunit.BAD-SYNTAX.ref → ...udocomments-warning-multiunit.WARNING.ref b/...docomments-error-multiunit.BAD-SYNTAX.ref → ...udocomments-warning-multiunit.WARNING.ref
@@ -1,3 +1,5 @@
+* WARNING pseudocomment
+
 *$EXTENDED;
 
 *$DRIVE D; $INLINE F;

diff --git a/...seudocomments-error-syntax.BAD-SYNTAX.ref → ...pseudocomments-warning-syntax.WARNING.ref b/...seudocomments-error-syntax.BAD-SYNTAX.ref → ...pseudocomments-warning-syntax.WARNING.ref
@@ -1,3 +1,5 @@
+* WARNING pseudocomment
+
 *$EXTENDED;
 
 *$SPEC Func s.STAT (s.dyn;

diff --git a/...docomments-error-semantics.BAD-SYNTAX.ref → ...nts-warning-unexpected-format.WARNING.ref b/...docomments-error-semantics.BAD-SYNTAX.ref → ...nts-warning-unexpected-format.WARNING.ref
@@ -1,3 +1,5 @@
+* WARNING pseudocomment
+
 *$EXTENDED;
 
 *$SPEC Func (s.STAT) s.dyn;

diff --git a/src/compiler/Checker.ref b/src/compiler/Checker.ref
@@ -126,6 +126,15 @@ PrepareMessage {
   IntrinsicForDefined e.Name
     = 'Function ' e.Name ' is defined, '
       '$INTRINSIC declaration for it will be ignored';
+
+  OptFeaturesConflict s.Label1 s.Label2 e.Name
+    = 'Conflict between pseudocomments '
+      '$' <Upper <Explode s.Label1>> ' ' e.Name '; and '
+      '$' <Upper <Explode s.Label2>> ' ' e.Name ';, '
+      '$NO... pseudocomment has priority';
+
+  DanglingOptPseudocomment s.Label e.Name
+    = '$' <Upper <Explode s.Label>> ' ' e.Name '; label for missed function';
 }
 
 FindErrors {
@@ -146,7 +155,9 @@ CheckPseudofunctions {
     = <Map
         {
           (s.Tag t.SrcPos s.ScopeClass e.Name)
-            , LegacyDrive LegacyInline Intrinsic : e._ s.Tag e._
+            , Opt Drive Spec NoOpt NoDrive NoSpec
+              LegacyDrive LegacyInline Intrinsic
+            : e._ s.Tag e._
             , <Pseudofunctions> : e._ (e.Name) e._
             = (Error t.SrcPos TaggedPseudofunction s.Tag e.Name);
 
@@ -557,6 +568,15 @@ SeparateDefines {
           (e.Declarations) (LegacyDrive t.SrcPos s.ScopeClass e.Name) =
             (e.Declarations (LegacyDrive t.SrcPos e.Name));
 
+          (e.Declarations) (s.OptNode t.SrcPos e.Name)
+            , (Opt Drive Spec Yes) (Drive Drive Yes) (Spec Spec Yes)
+              (NoOpt Drive Spec No) (NoDrive Drive No) (NoSpec Spec No)
+            : e._ (s.OptNode e.Features s.Enable) e._
+            = (
+                e.Declarations
+                (Opt s.OptNode (e.Features) s.Enable t.SrcPos e.Name)
+              );
+
           (e.Declarations) (Intrinsic t.SrcPos s.ScopeClass e.Name) =
             (e.Declarations (Intrinsic t.SrcPos e.Name));
 
@@ -585,6 +605,9 @@ CheckDeclarations {
           &CheckRedefinitions
           &FindFinalInitEntry
           &CheckIntrinsics
+          &CheckConflictOptPseudocomments
+          &CleanupValidOptPseudocomments
+          &CheckDanglingOptPseudocomments
         >
       >
 }
@@ -804,6 +827,82 @@ CheckIntrinsics {
   e.Declarations = e.Declarations;
 }
 
+CheckConflictOptPseudocomments {
+  e.Declarations-B
+  (Opt s.OptNode1 (e.Feat1-B s.Feature e.Feat1-E) Yes t.YesPos e.Name)
+  e.Declarations-M
+  (Opt s.OptNode2 (e.Feat2-B s.Feature e.Feat2-E) No t.NoPos e.Name)
+  e.Declarations-E
+    = <CheckConflictOptPseudocomments
+        e.Declarations-B
+        (Opt s.OptNode1 (e.Feat1-B e.Feat1-E) Yes t.YesPos e.Name)
+        (Warning
+          pseudocomment t.YesPos OptFeaturesConflict s.OptNode1 s.OptNode2
+          e.Name
+        )
+        e.Declarations-M
+        (Opt s.OptNode2 (e.Feat2-B s.Feature e.Feat2-E) No t.NoPos e.Name)
+        e.Declarations-E
+      >;
+
+  e.Declarations-B
+  (Opt s.OptNode1 (e.Feat1-B s.Feature e.Feat1-E) No t.NoPos e.Name)
+  e.Declarations-M
+  (Opt s.OptNode2 (e.Feat2-B s.Feature e.Feat2-E) Yes t.YesPos e.Name)
+  e.Declarations-E
+    = <CheckConflictOptPseudocomments
+        e.Declarations-B
+        (Opt s.OptNode1 (e.Feat1-B s.Feature e.Feat1-E) No t.NoPos e.Name)
+        e.Declarations-M
+        (Opt s.OptNode2 (e.Feat2-B e.Feat2-E) Yes t.YesPos e.Name)
+        (Warning
+          pseudocomment t.YesPos OptFeaturesConflict s.OptNode1 s.OptNode2
+          e.Name
+        )
+        e.Declarations-E
+      >;
+
+  e.Declarations-B (Opt s._ () Yes t._ e._) e.Declarations-E
+    = <CheckConflictOptPseudocomments e.Declarations-B e.Declarations-E>;
+
+  e.Declarations = e.Declarations;
+}
+
+CleanupValidOptPseudocomments {
+  e.Declarations-B
+  (Opt s.OptNode (e.Features) s.Enable t.OptPos e.Name) e.Declarations-M
+  (Define t.SrcPos s.ScopeClass e.Name) e.Declarations-E
+    = <CleanupValidOptPseudocomments
+        e.Declarations-B e.Declarations-M
+        (Define t.SrcPos s.ScopeClass e.Name) e.Declarations-E
+      >;
+
+  e.Declarations-B
+  (Define t.SrcPos s.ScopeClass e.Name) e.Declarations-M
+  (Opt s.OptNode (e.Features) s.Enable t.OptPos e.Name) e.Declarations-E
+    = <CleanupValidOptPseudocomments
+      e.Declarations-B
+      (Define t.SrcPos s.ScopeClass e.Name) e.Declarations-M e.Declarations-E
+      >;
+
+  e.Declarations = e.Declarations;
+}
+
+CheckDanglingOptPseudocomments {
+  e.Declarations
+    = <Map
+        {
+          (Opt s.OptNode (e._) s._ t.Pos e.Name)
+            = (Warning
+                pseudocomment t.Pos DanglingOptPseudocomment s.OptNode e.Name
+              );
+
+          t.Declaration = t.Declaration;
+        }
+        e.Declarations
+      >
+}
+
 CheckFunctionBody {
   (e.Body) =
     <CheckFunctionBodyRec (<gen_e__ /* vars */>) e.Body>;

diff --git a/src/compiler/Config.ref b/src/compiler/Config.ref
@@ -20,6 +20,7 @@ $ENTRY Config-Create {
         (Optimize /* пусто */)
         (WarningIds
           nul-in-compound pseudofunctions repeated deprecated intrinsic
+          pseudocomment
         )
         (WarningIdsAsErrors /* пусто */)
         (ErrorFile /* пусто */)
@@ -533,7 +534,7 @@ ValidWarningId {
 WarningForName {
   'screening' = True screening;
   'nul-in-compound' = True nul-in-compound;
-  'ignored-pseudocomments' = True ignored-pseudocomments;
+  'pseudocomment' = True pseudocomment;
   'pseudofunctions' = True pseudofunctions;
   'pseudofunction' = True pseudofunctions; /* синоним */
   'repeated' = True repeated;

diff --git a/src/compiler/Desugaring.ref b/src/compiler/Desugaring.ref
@@ -44,6 +44,10 @@ $ENTRY Pass-RemovePos {
 
           (LegacySpec t.SrcPos (e.Name) e.Pattern) = (LegacySpec e.Name);
 
+          (s.OptMarkup t.SrcPos e.Name)
+            , Opt Drive Spec NoOpt NoDrive NoSpec : e._ s.OptMarkup e._
+            = (s.OptMarkup e.Name);
+
           (s.EnumSwapDeclaration t.SrcPos s.ScopeClass e.Name)
             = (s.EnumSwapDeclaration s.ScopeClass e.Name);
         }
@@ -812,6 +816,12 @@ Pass-CollectDeclarations {
           (Intrinsic e.Name) = (GROUP Intrinsics (e.Name));
           (LegacySpec e.Name) = (GROUP Specs (e.Name));
 
+          (s.OptMarkup e.Name)
+            , (Opt Drives Specs) (Drive Drives) (Spec Specs)
+              (NoOpt NoDrives NoSpecs) (NoDrive NoDrives) (NoSpec NoSpecs)
+            : e._ (s.OptMarkup e.Groups) e._
+            = <Map { s.Group = (GROUP s.Group (e.Name)) } e.Groups>;
+
           (Function (e.Name) e.Body)
             = (GROUP DefinedFunctions (e.Name)) (Function (e.Name) e.Body);
 
@@ -828,6 +838,8 @@ Pass-CollectDeclarations {
         (GROUP Inlines)
         (GROUP Intrinsics)
         (GROUP Specs)
+        (GROUP NoDrives)
+        (GROUP NoSpecs)
         (GROUP DefinedFunctions)
       >
     : e.AST^
@@ -836,13 +848,17 @@ Pass-CollectDeclarations {
       (GROUP Inlines e.Inlines)
       (GROUP Intrinsics e.Intrinsics)
       (GROUP Specs e.Specs)
+      (GROUP NoDrives e.NoDrives)
+      (GROUP NoSpecs e.NoSpecs)
       (GROUP DefinedFunctions e.DefinedFunctions)
 
     = <Unique e.Externs> : e.Externs^
     = <Unique e.Drives> : e.Drives^
     = <Unique e.Inlines> : e.Inlines^
     = <Unique e.Intrinsics> : e.Intrinsics^
     = <Unique e.Specs> : e.Specs^
+    = <Unique e.NoDrives> : e.NoDrives^
+    = <Unique e.NoSpecs> : e.NoSpecs^
 
     = <Set-Reject (e.Externs) (e.DefinedFunctions)> : e.Externs^
     = <Set-Reject (e.Inlines) (e.Drives)> : e.Inlines^
@@ -851,6 +867,7 @@ Pass-CollectDeclarations {
     = (Externs e.Externs)
       (Drives e.Drives) (Inlines e.Inlines) (Intrinsics e.Intrinsics)
       (Specs e.Specs)
+      (NoDrives e.NoDrives) (NoSpecs e.NoSpecs)
       e.AST
 }