refactor: Simpler structure for lookahead set

eclipse-che4z · Aug 17, 2023 · 9d50f09 · 9d50f09
1 parent 5f75430
commit 9d50f09
Show file tree

Hide file tree

Showing 40 changed files with 131 additions and 88 deletions.
diff --git a/parser_library/src/expressions/conditional_assembly/ca_expression.h b/parser_library/src/expressions/conditional_assembly/ca_expression.h
@@ -27,7 +27,6 @@ namespace hlasm_plugin::parser_library::expressions {
 class ca_expr_visitor;
 class ca_expression;
 using ca_expr_ptr = std::unique_ptr<ca_expression>;
-using undef_sym_set = std::set<context::id_index>;
 
 struct evaluation_context;
 
@@ -60,7 +59,8 @@ class ca_expression
     ca_expression(context::SET_t_enum expr_kind, range expr_range);
 
     // retrieves set of attributed symbols that are not yet defined
-    virtual bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const = 0;
+    virtual bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const = 0;
 
     // builds parts of the expression tree that could not be built during parsing
     virtual void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) = 0;

diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_binary.cpp b/parser_library/src/expressions/conditional_assembly/ca_operator_binary.cpp
@@ -34,7 +34,7 @@ ca_binary_operator::ca_binary_operator(
 {}
 
 bool ca_binary_operator::get_undefined_attributed_symbols(
-    undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     bool result = false;
     result |= left_expr->get_undefined_attributed_symbols(symbols, eval_ctx);
@@ -79,7 +79,7 @@ ca_function_binary_operator::ca_function_binary_operator(ca_expr_ptr left_expr,
 {}
 
 // Detects (T'&VAR EQ 'O') condition
-std::optional<bool> t_attr_special_case(undef_sym_set& symbols,
+std::optional<bool> t_attr_special_case(std::vector<context::id_index>& symbols,
     const expressions::ca_expression* left,
     const expressions::ca_expression* right,
     const evaluation_context& eval_ctx)
@@ -116,7 +116,7 @@ std::optional<bool> t_attr_special_case(undef_sym_set& symbols,
 }
 
 bool ca_function_binary_operator::get_undefined_attributed_symbols(
-    undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     if (is_relational() && m_expr_ctx.parent_expr_kind == context::SET_t_enum::B_TYPE)
     {

diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_binary.h b/parser_library/src/expressions/conditional_assembly/ca_operator_binary.h
@@ -29,7 +29,8 @@ class ca_binary_operator : public ca_expression
 
     ca_binary_operator(ca_expr_ptr left_expr, ca_expr_ptr right_expr, context::SET_t_enum expr_kind, range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 
@@ -69,7 +70,8 @@ class ca_function_binary_operator final : public ca_binary_operator
         range expr_range,
         context::SET_t_enum parent_expr_kind = context::SET_t_enum::UNDEF_TYPE);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_unary.cpp b/parser_library/src/expressions/conditional_assembly/ca_operator_unary.cpp
@@ -28,7 +28,7 @@ ca_unary_operator::ca_unary_operator(ca_expr_ptr expr, context::SET_t_enum expr_
 {}
 
 bool ca_unary_operator::get_undefined_attributed_symbols(
-    undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     return expr->get_undefined_attributed_symbols(symbols, eval_ctx);
 }

diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_unary.h b/parser_library/src/expressions/conditional_assembly/ca_operator_unary.h
@@ -27,7 +27,8 @@ class ca_unary_operator : public ca_expression
 
     ca_unary_operator(ca_expr_ptr expr, context::SET_t_enum expr_kind, range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_constant.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_constant.cpp
@@ -26,7 +26,10 @@ ca_constant::ca_constant(context::A_t value, range expr_range)
     , value(value)
 {}
 
-bool ca_constant::get_undefined_attributed_symbols(undef_sym_set&, const evaluation_context&) const { return false; }
+bool ca_constant::get_undefined_attributed_symbols(std::vector<context::id_index>&, const evaluation_context&) const
+{
+    return false;
+}
 
 void ca_constant::resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags)
 {

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_constant.h b/parser_library/src/expressions/conditional_assembly/terms/ca_constant.h
@@ -31,7 +31,8 @@ class ca_constant final : public ca_expression
 
     ca_constant(context::A_t value, range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_expr_list.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_expr_list.cpp
@@ -31,7 +31,8 @@ ca_expr_list::ca_expr_list(std::vector<ca_expr_ptr> expr_list, range expr_range,
     , parenthesized(parenthesized)
 {}
 
-bool ca_expr_list::get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+bool ca_expr_list::get_undefined_attributed_symbols(
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     bool result = false;
     for (auto&& expr : expr_list)

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_expr_list.h b/parser_library/src/expressions/conditional_assembly/terms/ca_expr_list.h
@@ -28,7 +28,8 @@ class ca_expr_list final : public ca_expression
 public:
     ca_expr_list(std::vector<ca_expr_ptr> expr_list, range expr_range, bool parenthesized);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_function.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_function.cpp
@@ -48,7 +48,8 @@ ca_function::ca_function(context::id_index function_name,
     , duplication_factor(std::move(duplication_factor))
 {}
 
-bool ca_function::get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+bool ca_function::get_undefined_attributed_symbols(
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     bool result = false;
     for (auto&& expr : parameters)

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_function.h b/parser_library/src/expressions/conditional_assembly/terms/ca_function.h
@@ -40,7 +40,8 @@ class ca_function final : public ca_expression
         ca_expr_ptr duplication_factor,
         range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_string.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_string.cpp
@@ -38,7 +38,8 @@ ca_string::ca_string(
     , substring(std::move(substring))
 {}
 
-bool ca_string::get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+bool ca_string::get_undefined_attributed_symbols(
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     bool result = false;
     if (duplication_factor)

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_string.h b/parser_library/src/expressions/conditional_assembly/terms/ca_string.h
@@ -39,7 +39,8 @@ class ca_string final : public ca_expression
 
     ca_string(semantics::concat_chain value, ca_expr_ptr duplication_factor, substring_t substring, range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_symbol.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_symbol.cpp
@@ -25,7 +25,10 @@ ca_symbol::ca_symbol(context::id_index symbol, range expr_range)
     , symbol(symbol)
 {}
 
-bool ca_symbol::get_undefined_attributed_symbols(undef_sym_set&, const evaluation_context&) const { return false; }
+bool ca_symbol::get_undefined_attributed_symbols(std::vector<context::id_index>&, const evaluation_context&) const
+{
+    return false;
+}
 
 void ca_symbol::resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags)
 {

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_symbol.h b/parser_library/src/expressions/conditional_assembly/terms/ca_symbol.h
@@ -27,7 +27,8 @@ class ca_symbol final : public ca_expression
 
     ca_symbol(context::id_index symbol, range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_symbol_attribute.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_symbol_attribute.cpp
@@ -18,14 +18,12 @@
 #include "ca_var_sym.h"
 #include "context/hlasm_context.h"
 #include "context/literal_pool.h"
-#include "context/ordinary_assembly/dependable.h"
 #include "context/ordinary_assembly/ordinary_assembly_dependency_solver.h"
 #include "diagnostic_consumer.h"
 #include "ebcdic_encoding.h"
 #include "expressions/conditional_assembly/ca_expr_visitor.h"
 #include "expressions/evaluation_context.h"
 #include "lexing/lexer.h"
-#include "lexing/token_stream.h"
 #include "parsing/parser_impl.h"
 #include "processing/op_code.h"
 #include "semantics/range_provider.h"
@@ -78,15 +76,15 @@ ca_symbol_attribute::ca_symbol_attribute(
 {}
 
 bool ca_symbol_attribute::get_undefined_attributed_symbols(
-    undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     if (std::holds_alternative<context::id_index>(symbol))
     {
         if (context::symbol_attributes::is_ordinary_attribute(attribute)
             && !eval_ctx.hlasm_ctx.ord_ctx.get_symbol(std::get<context::id_index>(symbol))
             && !eval_ctx.hlasm_ctx.ord_ctx.get_symbol_reference(std::get<context::id_index>(symbol)))
         {
-            symbols.emplace(std::get<context::id_index>(symbol));
+            symbols.emplace_back(std::get<context::id_index>(symbol));
             return true;
         }
     }
@@ -113,7 +111,7 @@ bool ca_symbol_attribute::get_undefined_attributed_symbols(
                 && !eval_ctx.hlasm_ctx.ord_ctx.get_symbol(ord_name)
                 && !eval_ctx.hlasm_ctx.ord_ctx.get_symbol_reference(ord_name))
             {
-                symbols.emplace(ord_name);
+                symbols.emplace_back(ord_name);
                 return true;
             }
         }

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_symbol_attribute.h b/parser_library/src/expressions/conditional_assembly/terms/ca_symbol_attribute.h
@@ -42,7 +42,8 @@ class ca_symbol_attribute final : public ca_expression
     ca_symbol_attribute(
         semantics::literal_si lit, context::data_attr_kind attribute, range expr_range, range symbol_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_var_sym.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_var_sym.cpp
@@ -27,7 +27,7 @@ ca_var_sym::ca_var_sym(semantics::vs_ptr symbol, range expr_range)
 {}
 
 bool ca_var_sym::get_undefined_attributed_symbols_vs(
-    undef_sym_set& symbols, const semantics::vs_ptr& symbol, const evaluation_context& eval_ctx)
+    std::vector<context::id_index>& symbols, const semantics::vs_ptr& symbol, const evaluation_context& eval_ctx)
 {
     bool result = false;
 
@@ -44,7 +44,8 @@ bool ca_var_sym::get_undefined_attributed_symbols_vs(
     return result;
 }
 
-bool ca_var_sym::get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const
+bool ca_var_sym::get_undefined_attributed_symbols(
+    std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const
 {
     return get_undefined_attributed_symbols_vs(symbols, symbol, eval_ctx);
 }

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_var_sym.h b/parser_library/src/expressions/conditional_assembly/terms/ca_var_sym.h
@@ -28,7 +28,8 @@ class ca_var_sym final : public ca_expression
 
     ca_var_sym(semantics::vs_ptr symbol, range expr_range);
 
-    bool get_undefined_attributed_symbols(undef_sym_set& symbols, const evaluation_context& eval_ctx) const override;
+    bool get_undefined_attributed_symbols(
+        std::vector<context::id_index>& symbols, const evaluation_context& eval_ctx) const override;
 
     void resolve_expression_tree(ca_expression_ctx expr_ctx, diagnostic_op_consumer& diags) override;
 
@@ -39,7 +40,7 @@ class ca_var_sym final : public ca_expression
     context::SET_t evaluate(const evaluation_context& eval_ctx) const override;
 
     static bool get_undefined_attributed_symbols_vs(
-        undef_sym_set& symbols, const semantics::vs_ptr& symbol, const evaluation_context& eval_ctx);
+        std::vector<context::id_index>& symbols, const semantics::vs_ptr& symbol, const evaluation_context& eval_ctx);
 
 private:
     context::SET_t convert_return_types(

diff --git a/parser_library/src/processing/opencode_provider.cpp b/parser_library/src/processing/opencode_provider.cpp
@@ -477,7 +477,8 @@ std::shared_ptr<const context::hlasm_statement> opencode_provider::process_ordin
     if (proc.kind == processing_kind::ORDINARY
         && try_trigger_attribute_lookahead(*result,
             { *m_ctx->hlasm_ctx, library_info_transitional(*m_lib_provider), drop_diagnostic_op },
-            *m_state_listener))
+            *m_state_listener,
+            std::move(lookahead_references)))
         return nullptr;
 
     if (m_current_logical_line.segments.size() > 1)
@@ -725,7 +726,8 @@ context::shared_stmt_ptr opencode_provider::get_next(const statement_processor&
     if (proc.kind == processing_kind::ORDINARY
         && try_trigger_attribute_lookahead(collector.current_instruction(),
             { *m_ctx->hlasm_ctx, library_info_transitional(*m_lib_provider), drop_diagnostic_op },
-            *m_state_listener))
+            *m_state_listener,
+            std::move(lookahead_references)))
         return nullptr;
 
     const auto& current_instr = collector.current_instruction();

diff --git a/parser_library/src/processing/opencode_provider.h b/parser_library/src/processing/opencode_provider.h
@@ -163,6 +163,8 @@ class opencode_provider final : public statement_provider
 
     encoding_warning_issued m_encoding_warning_issued = {};
 
+    std::vector<context::id_index> lookahead_references;
+
 public:
     // rewinds position in file
     void rewind_input(context::source_position pos);

diff --git a/parser_library/src/processing/statement_processors/lookahead_processing_info.h b/parser_library/src/processing/statement_processors/lookahead_processing_info.h
@@ -15,7 +15,7 @@
 #ifndef PROCESSING_LOOKAHEAD_PROCESSING_INFO_H
 #define PROCESSING_LOOKAHEAD_PROCESSING_INFO_H
 
-#include <set>
+#include <vector>
 
 #include "context/ordinary_assembly/symbol.h"
 #include "context/source_snapshot.h"
@@ -51,9 +51,9 @@ struct lookahead_start_data
     {}
 
     // ORD action
-    std::set<context::id_index> targets;
+    std::vector<context::id_index> targets;
 
-    lookahead_start_data(std::set<context::id_index> targets,
+    lookahead_start_data(std::vector<context::id_index> targets,
         context::source_position statement_position,
         context::source_snapshot snapshot)
         : action(lookahead_action::ORD)

diff --git a/parser_library/src/processing/statement_processors/lookahead_processor.cpp b/parser_library/src/processing/statement_processors/lookahead_processor.cpp
@@ -324,7 +324,11 @@ void lookahead_processor::find_ord(const resolved_statement& statement)
     if (!valid)
         return;
 
-    to_find_.erase(id);
+    if (auto it = std::find(to_find_.begin(), to_find_.end(), id); it != to_find_.end())
+    {
+        std::swap(*it, to_find_.back());
+        to_find_.pop_back();
+    }
 
     // find attributes
     // if found ord symbol on CA, macro or undefined instruction, only type attribute is assigned

diff --git a/parser_library/src/processing/statement_processors/lookahead_processor.h b/parser_library/src/processing/statement_processors/lookahead_processor.h
@@ -36,7 +36,7 @@ class lookahead_processor final : public statement_processor
     processing_state_listener& listener_;
     workspaces::parse_lib_provider& lib_provider_;
 
-    std::set<context::id_index> to_find_;
+    std::vector<context::id_index> to_find_;
     context::id_index target_;
 
 public:

diff --git a/parser_library/src/processing/statement_providers/members_statement_provider.cpp b/parser_library/src/processing/statement_providers/members_statement_provider.cpp
@@ -48,7 +48,8 @@ context::shared_stmt_ptr members_statement_provider::get_next(const statement_pr
         {
             if (try_trigger_attribute_lookahead(*instr,
                     { *m_ctx.hlasm_ctx, library_info_transitional(m_lib_provider), drop_diagnostic_op },
-                    m_listener))
+                    m_listener,
+                    std::move(lookahead_references)))
                 return nullptr;
         }
     }
@@ -83,8 +84,10 @@ context::shared_stmt_ptr members_statement_provider::get_next(const statement_pr
     }
 
     if (processor.kind == processing_kind::ORDINARY
-        && try_trigger_attribute_lookahead(
-            *stmt, { *m_ctx.hlasm_ctx, library_info_transitional(m_lib_provider), drop_diagnostic_op }, m_listener))
+        && try_trigger_attribute_lookahead(*stmt,
+            { *m_ctx.hlasm_ctx, library_info_transitional(m_lib_provider), drop_diagnostic_op },
+            m_listener,
+            std::move(lookahead_references)))
         return nullptr;
 
     return stmt;

diff --git a/parser_library/src/processing/statement_providers/members_statement_provider.h b/parser_library/src/processing/statement_providers/members_statement_provider.h
@@ -37,6 +37,8 @@ namespace hlasm_plugin::parser_library::processing {
 // common class for copy and macro statement providers (provider of copy and macro members)
 class members_statement_provider : public statement_provider
 {
+    std::vector<context::id_index> lookahead_references;
+
 public:
     members_statement_provider(const statement_provider_kind kind,
         analyzing_context ctx,