fix: Incorrect parsing of attributes in macro operands

eclipse-che4z · Nov 12, 2024 · ef046d5 · ef046d5
1 parent f82a055
commit ef046d5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/clients/vscode-hlasmplugin/CHANGELOG.md b/clients/vscode-hlasmplugin/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Operand parsing errors reported for operandless instructions used in macros
 - Language server does not recognize symbolic links as available macros (WASM)
 - The language server crashes while processing an invalid prototype of a nested macro
+- Incorrect parsing of attributes in macro operands
 
 ## [1.15.0](https://github.com/eclipse-che4z/che-che4z-lsp-for-hlasm/compare/1.14.0...1.15.0) (2024-09-20)
 

diff --git a/parser_library/src/parsing/grammar/macro_operand_rules.g4 b/parser_library/src/parsing/grammar/macro_operand_rules.g4
@@ -187,12 +187,11 @@ mac_entry returns [concat_chain chain]
                 collector.add_hl_symbol(token_info(provider.get_range($at),hl_scopes::operator_symbol));
             }
             (
-                (
-                    equals
-                    {
-                        $chain.emplace_back(equals_conc(provider.get_range($equals.ctx)));
-                    }
-                )?
+                equals
+                {
+                    $chain.emplace_back(equals_conc(provider.get_range($equals.ctx)));
+                }
+                |
                 ORDSYMBOL
                 {
                     auto r = provider.get_range($ORDSYMBOL);

diff --git a/parser_library/test/context/macro_test.cpp b/parser_library/test/context/macro_test.cpp
@@ -1292,3 +1292,19 @@ TEST(macro, nested_parenthesis_with_attributes)
 
     EXPECT_TRUE(a.diags().empty());
 }
+
+TEST(macro, allowed_incomplete_literal)
+{
+    std::string input = R"(
+         MACRO
+         MAC
+         MEND
+
+         MAC   L'=
+         MAC   "L'=
+)";
+    analyzer a(input);
+    a.analyze();
+
+    EXPECT_TRUE(a.diags().empty());
+}