PR suggestions and test

eclipse-che4z · Sep 16, 2021 · b84f255 · b84f255
1 parent 8035693
commit b84f255
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/parser_library/src/parsing/parser_impl.cpp b/parser_library/src/parsing/parser_impl.cpp
@@ -237,15 +237,8 @@ bool parser_impl::UNKNOWN()
 
 bool parser_impl::ALIAS()
 {
-    static const auto alias_instruction =
-        opcode_t::opcode_variant(&context::instruction::assembler_instructions.at("ALIAS"));
-
-    auto& [format, opcode] = *proc_status;
-    if (format.form != processing::processing_form::ASM)
-        return false;
-
-    auto i = hlasm_ctx->instruction_map().find(opcode.value);
-    return i != hlasm_ctx->instruction_map().end() && i->second == alias_instruction;
+    auto& [_, opcode] = *proc_status;
+    return *opcode.value == "ALIAS";
 }
 
 antlr4::misc::IntervalSet parser_impl::getExpectedTokens()

diff --git a/parser_library/test/processing/asm_instr_test.cpp b/parser_library/test/processing/asm_instr_test.cpp
@@ -197,3 +197,18 @@ J ALIAS C'STRING'
 
     EXPECT_TRUE(a.diags().empty());
 }
+
+TEST(asm_instr_processing, ALIAS_with_opsyn)
+{
+    std::string input = R"(
+X OPSYN ALIAS
+L X     C'SOMESTRING'
+  EXTRN L
+)";
+
+    analyzer a(input);
+    a.analyze();
+    a.collect_diags();
+
+    EXPECT_TRUE(a.diags().empty());
+}