(#72) CParser: __cli_import should be prioritized

ForNeVeR · Feb 15, 2022 · 59f3fac · 59f3fac
1 parent a166b3a
commit 59f3fac
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Cesium.Parser/CParser.cs b/Cesium.Parser/CParser.cs
@@ -208,12 +208,12 @@ private ParseResult<Declaration> customParseDeclaration(int offset)
             var preLastDeclarationSpecifier = declarationSpecifiers[^2];
             initDeclaratorList = parseInitDeclaratorList(preLastDeclarationSpecifier.Offset);
             if (initDeclaratorList.IsOk)
-            {
                 declarationSpecifiers.RemoveAt(declarationSpecifiers.Count - 1);
-                offset = initDeclaratorList.Ok.Offset;
-            }
         }
 
+        if (initDeclaratorList.IsOk)
+            offset = initDeclaratorList.Ok.Offset;
+
         if (TokenStream.TryLookAhead(offset, out var t) && t.Text == ";")
         {
             ++offset;
@@ -240,6 +240,7 @@ private static Declaration MakeDeclaration(
     private static DeclarationSpecifiers MakeDeclarationSpecifiers(IEnumerable<IDeclarationSpecifier> specifiers) =>
         specifiers.ToImmutableArray();
 
+    [Rule("declaration_specifier: cli_import_specifier")] // Extension, see CParser.CliExtensions.cs
     [Rule("declaration_specifier: storage_class_specifier")]
     [Rule("declaration_specifier: type_specifier")]
     [Rule("declaration_specifier: type_qualifier")]