From bad80a84fe1b6bc24cb4ea9ca389ae2cdb9eefa8 Mon Sep 17 00:00:00 2001 From: slavek-kucera <53339291+slavek-kucera@users.noreply.github.com> Date: Wed, 31 Jul 2024 12:53:22 +0200 Subject: [PATCH] refactor: Remove redundant arguments --- parser_library/src/context/hlasm_context.cpp | 86 +++++++------------ parser_library/src/context/hlasm_context.h | 6 +- parser_library/src/context/literal_pool.cpp | 1 - .../ordinary_assembly_context.cpp | 45 ++++++---- .../ordinary_assembly_context.h | 17 ++-- .../instruction_sets/asm_processor.cpp | 32 ++----- .../low_language_processor.cpp | 5 +- .../src/processing/processing_manager.cpp | 2 +- .../statement_processors/copy_processor.cpp | 8 +- .../macrodef_processor.cpp | 6 +- parser_library/test/context/address_test.cpp | 8 +- .../context/dependency_collector_test.cpp | 4 +- parser_library/test/context/using_test.cpp | 2 +- .../expressions/ca_symbol_attribute_test.cpp | 2 - .../test/processing/lookahead_test.cpp | 7 +- 15 files changed, 91 insertions(+), 140 deletions(-) diff --git a/parser_library/src/context/hlasm_context.cpp b/parser_library/src/context/hlasm_context.cpp index 5894182bc..4407c2b5a 100644 --- a/parser_library/src/context/hlasm_context.cpp +++ b/parser_library/src/context/hlasm_context.cpp @@ -483,41 +483,6 @@ processing_stack_t hlasm_context::processing_stack() return result; } -processing_frame hlasm_context::processing_stack_top(bool consider_macros) -{ - // this is an inverted version of the loop from processing_stack() - // terminating after finding the first (originally last) element - - assert(!source_stack_.empty()); - - if (consider_macros && source_stack_.size() == 1 && scope_stack_.size() > 1) - { - if (const auto& nest = scope_stack_.back().this_macro->get_current_copy_nest(); !nest.empty()) - { - const auto& last_copy = nest.back(); - return processing_frame(last_copy.loc.pos, - shared_resource_location(last_copy.loc.resource_loc), - last_copy.member_name, - nest.size() == 1 ? file_processing_type::MACRO : file_processing_type::COPY); - } - } - - const auto& last_source = source_stack_.back(); - if (!last_source.copy_stack.empty()) - { - const auto& last_member = last_source.copy_stack.back(); - return processing_frame(last_member.current_statement_position(), - shared_resource_location(last_member.definition_location()->resource_loc), - last_member.name(), - file_processing_type::COPY); - } - - return processing_frame(last_source.current_instruction.pos, - shared_resource_location(last_source.current_instruction.resource_loc), - id_index(), - file_processing_type::OPENCODE); -} - processing_stack_details_t hlasm_context::processing_stack_details() { std::vector res; @@ -560,40 +525,47 @@ processing_stack_details_t hlasm_context::processing_stack_details() return res; } -location hlasm_context::current_statement_location(bool consider_macros) const +position hlasm_context::current_statement_position(bool consider_macros) { - if (!consider_macros || source_stack_.size() > 1 || scope_stack_.size() == 1) - { - if (source_stack_.back().copy_stack.size()) - { - const auto& member = source_stack_.back().copy_stack.back(); - - return location(member.current_statement_position(), member.definition_location()->resource_loc); - } - else - return source_stack_.back().current_instruction; - } + if (consider_macros && source_stack_.size() == 1 && scope_stack_.size() > 1) + return scope_stack_.back().this_macro->get_current_copy_nest().back().loc.pos; + else if (!source_stack_.back().copy_stack.empty()) + return source_stack_.back().copy_stack.back().current_statement_position(); else - { - return scope_stack_.back().this_macro->get_current_copy_nest().back().loc; - } + return source_stack_.back().current_instruction.pos; } -const utils::resource::resource_location& hlasm_context::current_statement_source(bool consider_macros) const +location hlasm_context::current_statement_location(bool consider_macros) { - if (!consider_macros || source_stack_.size() > 1 || scope_stack_.size() == 1) + if (consider_macros && source_stack_.size() == 1 && scope_stack_.size() > 1) { - if (source_stack_.back().copy_stack.size()) - return source_stack_.back().copy_stack.back().definition_location()->resource_loc; - else - return source_stack_.back().current_instruction.resource_loc; + const auto& [p, r] = scope_stack_.back().this_macro->get_current_copy_nest().back().loc; + return location(p, *shared_resource_location(r)); + } + else if (!source_stack_.back().copy_stack.empty()) + { + const auto& member = source_stack_.back().copy_stack.back(); + return location( + member.current_statement_position(), *shared_resource_location(member.definition_location()->resource_loc)); } else { - return scope_stack_.back().this_macro->get_current_copy_nest().back().loc.resource_loc; + const auto& [p, r] = source_stack_.back().current_instruction; + return location(p, *shared_resource_location(r)); } } +const utils::resource::resource_location& hlasm_context::current_statement_source(bool consider_macros) +{ + if (consider_macros && source_stack_.size() == 1 && scope_stack_.size() > 1) + return *shared_resource_location( + scope_stack_.back().this_macro->get_current_copy_nest().back().loc.resource_loc); + else if (source_stack_.back().copy_stack.size()) + return *shared_resource_location(source_stack_.back().copy_stack.back().definition_location()->resource_loc); + else + return *shared_resource_location(source_stack_.back().current_instruction.resource_loc); +} + const std::deque& hlasm_context::scope_stack() const { return scope_stack_; } const source_context& hlasm_context::current_source() const { return source_stack_.back(); } diff --git a/parser_library/src/context/hlasm_context.h b/parser_library/src/context/hlasm_context.h index 2caccaa6e..750c51d16 100644 --- a/parser_library/src/context/hlasm_context.h +++ b/parser_library/src/context/hlasm_context.h @@ -180,10 +180,10 @@ class hlasm_context // gets stack of locations of all currently processed files processing_stack_t processing_stack(); - processing_frame processing_stack_top(bool consider_macros = true); processing_stack_details_t processing_stack_details(); - location current_statement_location(bool consider_macros = true) const; - const utils::resource::resource_location& current_statement_source(bool consider_macros = true) const; + position current_statement_position(bool consider_macros = true); + location current_statement_location(bool consider_macros = true); + const utils::resource::resource_location& current_statement_source(bool consider_macros = true); // gets macro nest const std::deque& scope_stack() const; diff --git a/parser_library/src/context/literal_pool.cpp b/parser_library/src/context/literal_pool.cpp index 069b2e448..6d7aee820 100644 --- a/parser_library/src/context/literal_pool.cpp +++ b/parser_library/src/context/literal_pool.cpp @@ -195,7 +195,6 @@ void literal_pool::generate_pool(diagnosable_ctx& diags, index_tget_type_attribute()), lit->get_length_attribute(solver, diags)), - {}, li); if (size == 0) diff --git a/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.cpp b/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.cpp index 47055d947..cd87993d6 100644 --- a/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.cpp +++ b/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.cpp @@ -63,14 +63,16 @@ location_counter& ordinary_assembly_context::loctr() } bool ordinary_assembly_context::create_symbol( - id_index name, symbol_value value, symbol_attributes attributes, location symbol_location, const library_info& li) + id_index name, symbol_value value, symbol_attributes attributes, const library_info& li) { assert(symbol_can_be_assigned(symbols_, name)); const auto value_kind = value.value_kind(); - symbols_.insert_or_assign( - name, symbol(name, std::move(value), attributes, std::move(symbol_location), hlasm_ctx_.processing_stack())); + auto loc = hlasm_ctx_.processing_stack(); + auto sym_loc = loc.frame().get_location(); + sym_loc.pos.column = 0; + symbols_.insert_or_assign(name, symbol(name, std::move(value), attributes, std::move(sym_loc), std::move(loc))); bool ok = true; @@ -121,8 +123,7 @@ section* ordinary_assembly_context::get_section(id_index name) const section* ordinary_assembly_context::current_section() const { return curr_section_; } -section* ordinary_assembly_context::set_section( - id_index name, section_kind kind, location symbol_location, const library_info& li) +section* ordinary_assembly_context::set_section(id_index name, section_kind kind, const library_info& li) { auto tmp = std::ranges::find_if( sections_, [name, kind](const auto& sect) { return sect->name == name && sect->kind == kind; }); @@ -138,12 +139,15 @@ section* ordinary_assembly_context::set_section( if (!name.empty()) { assert(symbol_can_be_assigned(symbols_, name)); + auto loc = hlasm_ctx_.processing_stack(); + auto sym_loc = loc.frame().get_location(); + sym_loc.pos.column = 0; symbols_.insert_or_assign(name, symbol(name, s->current_location_counter().current_address(), symbol_attributes::make_section_attrs(), - std::move(symbol_location), - hlasm_ctx_.processing_stack())); + std::move(sym_loc), + std::move(loc))); m_symbol_dependencies->add_defined(name, nullptr, li); } } @@ -152,7 +156,7 @@ section* ordinary_assembly_context::set_section( } section* ordinary_assembly_context::create_and_set_class( - id_index name, location symbol_location, const library_info& li, section* base, bool partitioned) + id_index name, const library_info& li, section* base, bool partitioned) { assert(std::ranges::find(sections_, name, §ion::name) == sections_.end()); assert(symbol_can_be_assigned(symbols_, name)); @@ -164,12 +168,15 @@ section* ordinary_assembly_context::create_and_set_class( .parent = base, .partitioned = partitioned, })); + auto loc = hlasm_ctx_.processing_stack(); + auto sym_loc = loc.frame().get_location(); + sym_loc.pos.column = 0; symbols_.insert_or_assign(name, symbol(name, s->current_location_counter().current_address(), symbol_attributes::make_section_attrs(), - std::move(symbol_location), - hlasm_ctx_.processing_stack())); + std::move(sym_loc), + std::move(loc))); m_symbol_dependencies->add_defined(name, nullptr, li); return s; @@ -189,8 +196,7 @@ section* ordinary_assembly_context::set_section(section& s) return &s; } -void ordinary_assembly_context::create_external_section( - id_index name, section_kind kind, location symbol_location, processing_stack_t processing_stack) +void ordinary_assembly_context::create_external_section(id_index name, section_kind kind) { const auto attrs = [kind]() { switch (kind) @@ -206,15 +212,17 @@ void ordinary_assembly_context::create_external_section( assert(symbol_can_be_assigned(symbols_, name)); + auto loc = hlasm_ctx_.processing_stack(); + auto sym_loc = loc.frame().get_location(); symbols_.insert_or_assign(name, symbol(name, create_section(name, kind)->current_location_counter().current_address(), attrs, - std::move(symbol_location), - std::move(processing_stack))); + std::move(sym_loc), + std::move(loc))); } -void ordinary_assembly_context::set_location_counter(id_index name, location symbol_location, const library_info& li) +void ordinary_assembly_context::set_location_counter(id_index name, const library_info& li) { ensure_current_section(); @@ -232,13 +240,16 @@ void ordinary_assembly_context::set_location_counter(id_index name, location sym if (!defined) { auto& l = curr_section_->set_location_counter(name); + auto loc = hlasm_ctx_.processing_stack(); + auto sym_loc = loc.frame().get_location(); + sym_loc.pos.column = 0; assert(symbol_can_be_assigned(symbols_, name)); symbols_.insert_or_assign(name, symbol(name, l.current_address(), symbol_attributes::make_section_attrs(), - std::move(symbol_location), - hlasm_ctx_.processing_stack())); + std::move(sym_loc), + std::move(loc))); m_symbol_dependencies->add_defined(name, nullptr, li); } diff --git a/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h b/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h index 612bced72..5a49433ac 100644 --- a/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h +++ b/parser_library/src/context/ordinary_assembly/ordinary_assembly_context.h @@ -96,11 +96,8 @@ class ordinary_assembly_context // creates symbol // returns false if loctr cycle has occured - [[nodiscard]] bool create_symbol(id_index name, - symbol_value value, - symbol_attributes attributes, - location symbol_location, - const library_info& li); + [[nodiscard]] bool create_symbol( + id_index name, symbol_value value, symbol_attributes attributes, const library_info& li); void add_symbol_reference(symbol sym, const library_info& li); const symbol* get_symbol_reference(context::id_index name) const; @@ -115,17 +112,15 @@ class ordinary_assembly_context const section* current_section() const; // sets current section - section* set_section(id_index name, section_kind kind, location symbol_location, const library_info& li); - section* create_and_set_class( - id_index name, location symbol_location, const library_info& li, section* base, bool partitioned); + section* set_section(id_index name, section_kind kind, const library_info& li); + section* create_and_set_class(id_index name, const library_info& li, section* base, bool partitioned); section* set_section(section& s); // creates an external section - void create_external_section( - id_index name, section_kind kind, location symbol_location, processing_stack_t processing_stack); + void create_external_section(id_index name, section_kind kind); // sets current location counter of current section - void set_location_counter(id_index name, location symbol_location, const library_info& li); + void set_location_counter(id_index name, const library_info& li); void set_location_counter(location_counter& l); // sets value of the current location counter diff --git a/parser_library/src/processing/instruction_sets/asm_processor.cpp b/parser_library/src/processing/instruction_sets/asm_processor.cpp index 28a010336..0b206b5ff 100644 --- a/parser_library/src/processing/instruction_sets/asm_processor.cpp +++ b/parser_library/src/processing/instruction_sets/asm_processor.cpp @@ -104,11 +104,8 @@ void asm_processor::process_sect(const context::section_kind kind, rebuilt_state add_diagnostic(diagnostic_op::error_E031("symbol", stmt.label_ref().field_range)); } else - { - auto sym_loc = hlasm_ctx.processing_stack_top().get_location(); - sym_loc.pos.column = 0; - hlasm_ctx.ord_ctx.set_section(sect_name, kind, std::move(sym_loc), lib_info); - } + hlasm_ctx.ord_ctx.set_section(sect_name, kind, lib_info); + context::ordinary_assembly_dependency_solver dep_solver(hlasm_ctx.ord_ctx, lib_info); hlasm_ctx.ord_ctx.symbol_dependencies().add_postponed_statement( std::make_unique(std::move(stmt), hlasm_ctx.processing_stack()), @@ -123,15 +120,10 @@ void asm_processor::process_LOCTR(rebuilt_statement&& stmt) add_diagnostic(diagnostic_op::error_E053(stmt.label_ref().field_range)); if (hlasm_ctx.ord_ctx.symbol_defined(loctr_name) && !hlasm_ctx.ord_ctx.counter_defined(loctr_name)) - { add_diagnostic(diagnostic_op::error_E031("symbol", stmt.label_ref().field_range)); - } else - { - auto sym_loc = hlasm_ctx.processing_stack_top().get_location(); - sym_loc.pos.column = 0; - hlasm_ctx.ord_ctx.set_location_counter(loctr_name, std::move(sym_loc), lib_info); - } + hlasm_ctx.ord_ctx.set_location_counter(loctr_name, lib_info); + context::ordinary_assembly_dependency_solver dep_solver(hlasm_ctx.ord_ctx, lib_info); hlasm_ctx.ord_ctx.symbol_dependencies().add_postponed_statement( std::make_unique(std::move(stmt), hlasm_ctx.processing_stack()), @@ -498,8 +490,7 @@ void asm_processor::process_external(rebuilt_statement&& stmt, external_type t) if (hlasm_ctx.ord_ctx.symbol_defined(name)) add_diagnostic(diagnostic_op::error_E031("external symbol", op_range)); else - hlasm_ctx.ord_ctx.create_external_section( - name, s_kind, hlasm_ctx.current_statement_location(), hlasm_ctx.processing_stack()); + hlasm_ctx.ord_ctx.create_external_section(name, s_kind); }; for (const auto& op : stmt.operands_ref().value) { @@ -1006,9 +997,7 @@ void asm_processor::process_START(rebuilt_statement&& stmt) return; } - auto sym_loc = hlasm_ctx.processing_stack_top().get_location(); - sym_loc.pos.column = 0; - const auto* section = hlasm_ctx.ord_ctx.set_section(sect_name, EXECUTABLE, std::move(sym_loc), lib_info); + const auto* section = hlasm_ctx.ord_ctx.set_section(sect_name, EXECUTABLE, lib_info); const auto& ops = stmt.operands_ref().value; if (ops.size() != 1) @@ -1541,10 +1530,7 @@ void asm_processor::handle_cattr_ops(context::id_index class_name, } else { - auto sym_loc = hlasm_ctx.processing_stack_top().get_location(); - sym_loc.pos.column = 0; - class_name_sect = hlasm_ctx.ord_ctx.create_and_set_class( - class_name, std::move(sym_loc), lib_info, nullptr, !part_name.empty()); + class_name_sect = hlasm_ctx.ord_ctx.create_and_set_class(class_name, lib_info, nullptr, !part_name.empty()); // TODO: sectalign? part } @@ -1552,9 +1538,7 @@ void asm_processor::handle_cattr_ops(context::id_index class_name, if (part_name.empty()) return; - auto sym_loc = hlasm_ctx.processing_stack_top().get_location(); - sym_loc.pos.column = 0; - hlasm_ctx.ord_ctx.create_and_set_class(part_name, std::move(sym_loc), lib_info, class_name_sect, false); + hlasm_ctx.ord_ctx.create_and_set_class(part_name, lib_info, class_name_sect, false); } void asm_processor::process_CATTR(rebuilt_statement&& stmt) diff --git a/parser_library/src/processing/instruction_sets/low_language_processor.cpp b/parser_library/src/processing/instruction_sets/low_language_processor.cpp index 24c04663e..45cfc899d 100644 --- a/parser_library/src/processing/instruction_sets/low_language_processor.cpp +++ b/parser_library/src/processing/instruction_sets/low_language_processor.cpp @@ -77,10 +77,7 @@ context::id_index low_language_processor::find_using_label(const rebuilt_stateme bool low_language_processor::create_symbol( range err_range, context::id_index symbol_name, context::symbol_value value, context::symbol_attributes attributes) { - auto sym_loc = hlasm_ctx.processing_stack_top().get_location(); - sym_loc.pos.column = 0; - bool ok = hlasm_ctx.ord_ctx.create_symbol( - symbol_name, std::move(value), std::move(attributes), std::move(sym_loc), lib_info); + bool ok = hlasm_ctx.ord_ctx.create_symbol(symbol_name, std::move(value), std::move(attributes), lib_info); if (!ok) add_diagnostic(diagnostic_op::error_E033(err_range)); diff --git a/parser_library/src/processing/processing_manager.cpp b/parser_library/src/processing/processing_manager.cpp index 92487b236..69065088d 100644 --- a/parser_library/src/processing/processing_manager.cpp +++ b/parser_library/src/processing/processing_manager.cpp @@ -445,7 +445,7 @@ void processing_manager::register_sequence_symbol(context::id_index target, rang std::unique_ptr processing_manager::create_opencode_sequence_symbol( context::id_index name, range symbol_range) { - auto loc = hlasm_ctx_.processing_stack_top(false).get_location(); + auto loc = hlasm_ctx_.current_statement_location(false); loc.pos = symbol_range.start; auto&& [statement_position, snapshot] = hlasm_ctx_.get_begin_snapshot(lookahead_active()); diff --git a/parser_library/src/processing/statement_processors/copy_processor.cpp b/parser_library/src/processing/statement_processors/copy_processor.cpp index 6eee35e33..35ff69da3 100644 --- a/parser_library/src/processing/statement_processors/copy_processor.cpp +++ b/parser_library/src/processing/statement_processors/copy_processor.cpp @@ -47,7 +47,7 @@ void copy_processor::process_statement(context::shared_stmt_ptr statement) { if (first_statement_) { - result_.definition_location = hlasm_ctx.processing_stack_top().get_location(); + result_.definition_location = hlasm_ctx.current_statement_location(); first_statement_ = false; } @@ -66,12 +66,12 @@ void copy_processor::end_processing() { if (first_statement_) { - result_.definition_location = hlasm_ctx.processing_stack_top().get_location(); // empty file + result_.definition_location = hlasm_ctx.current_statement_location(); // empty file } if (macro_nest_ > 0) { - range r(hlasm_ctx.processing_stack_top().pos); + range r(hlasm_ctx.current_statement_position()); add_diagnostic(diagnostic_op::error_E061(start_.member_name.to_string_view(), r)); result_.invalid_member = true; } @@ -97,7 +97,7 @@ void copy_processor::process_MEND() --macro_nest_; if (macro_nest_ < 0) { - range r(hlasm_ctx.processing_stack_top().pos); + range r(hlasm_ctx.current_statement_position()); add_diagnostic(diagnostic_op::error_E061(start_.member_name.to_string_view(), r)); result_.invalid_member = true; } diff --git a/parser_library/src/processing/statement_processors/macrodef_processor.cpp b/parser_library/src/processing/statement_processors/macrodef_processor.cpp index 87ea630d1..0b1b6ee7f 100644 --- a/parser_library/src/processing/statement_processors/macrodef_processor.cpp +++ b/parser_library/src/processing/statement_processors/macrodef_processor.cpp @@ -38,7 +38,7 @@ macrodef_processor::macrodef_processor(const analyzing_context& ctx, , finished_flag_(false) , table_(create_table()) { - result_.definition_location = hlasm_ctx.processing_stack_top().get_location(); + result_.definition_location = hlasm_ctx.current_statement_location(); result_.external = start_.is_external; if (start_.is_external) result_.prototype.macro_name = start_.external_name; @@ -97,7 +97,7 @@ void macrodef_processor::end_processing() { if (!finished_flag_) add_diagnostic(diagnostic_op::error_E046( - result_.prototype.macro_name.to_string_view(), range(hlasm_ctx.processing_stack_top().pos))); + result_.prototype.macro_name.to_string_view(), range(hlasm_ctx.current_statement_position()))); hlasm_ctx.pop_statement_processing(); @@ -160,7 +160,7 @@ bool macrodef_processor::process_statement(const context::hlasm_statement& state if (expecting_MACRO_) { - result_.definition_location = hlasm_ctx.processing_stack_top().get_location(); + result_.definition_location = hlasm_ctx.current_statement_location(); if (!res_stmt || res_stmt->opcode_ref().value != context::id_storage::well_known::MACRO) { diff --git a/parser_library/test/context/address_test.cpp b/parser_library/test/context/address_test.cpp index 0a88c7476..069568359 100644 --- a/parser_library/test/context/address_test.cpp +++ b/parser_library/test/context/address_test.cpp @@ -28,7 +28,7 @@ using namespace ::testing; TEST(address, normalized_spaces) { hlasm_context ctx; - ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, location(), library_info_transitional::empty); + ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, library_info_transitional::empty); auto sp1 = ctx.ord_ctx.current_section()->current_location_counter().set_value_undefined(0, 0); auto sp2 = ctx.ord_ctx.current_section()->current_location_counter().register_ordinary_space(halfword); @@ -53,7 +53,7 @@ TEST(address, normalized_spaces) TEST(address, has_unresolved_spaces) { hlasm_context ctx; - ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, location(), library_info_transitional::empty); + ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, library_info_transitional::empty); auto sp1 = ctx.ord_ctx.current_section()->current_location_counter().set_value_undefined(0, 0); auto sp2 = ctx.ord_ctx.current_section()->current_location_counter().register_ordinary_space(halfword); @@ -72,7 +72,7 @@ TEST(address, has_unresolved_spaces) TEST(address, constructors) { hlasm_context ctx; - auto sect = ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, {}, library_info_transitional::empty); + auto sect = ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, library_info_transitional::empty); auto sp1 = ctx.ord_ctx.current_section()->current_location_counter().set_value_undefined(0, 0); auto sp2 = ctx.ord_ctx.current_section()->current_location_counter().register_ordinary_space(halfword); @@ -92,7 +92,7 @@ TEST(address, constructors) TEST(address, subtract_optimization) { hlasm_context ctx; - auto sect = ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, {}, library_info_transitional::empty); + auto sect = ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, library_info_transitional::empty); address addr2({ sect, id_index() }, 12345, {}); diff --git a/parser_library/test/context/dependency_collector_test.cpp b/parser_library/test/context/dependency_collector_test.cpp index 818400b64..9b84b38df 100644 --- a/parser_library/test/context/dependency_collector_test.cpp +++ b/parser_library/test/context/dependency_collector_test.cpp @@ -31,13 +31,12 @@ TEST(dependency_collector, uresolved_addresses) id_index name1("SYM1"); id_index name2("SYM2"); - ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, location(), library_info_transitional::empty); + ctx.ord_ctx.set_section(id_index("TEST"), section_kind::COMMON, library_info_transitional::empty); auto addr1 = ctx.ord_ctx.current_section()->current_location_counter().current_address(); (void)ctx.ord_ctx.create_symbol(name1, symbol_value(std::move(addr1)), symbol_attributes(symbol_origin::UNKNOWN), - location(), library_info_transitional::empty); auto sp = ctx.ord_ctx.current_section()->current_location_counter().register_ordinary_space(halfword); @@ -46,7 +45,6 @@ TEST(dependency_collector, uresolved_addresses) (void)ctx.ord_ctx.create_symbol(name2, symbol_value(std::move(addr2)), symbol_attributes(symbol_origin::UNKNOWN), - location(), library_info_transitional::empty); // ((SYM2-SYM1)/(SYM2-SYM1))+SYM2 diff --git a/parser_library/test/context/using_test.cpp b/parser_library/test/context/using_test.cpp index 34fc5f751..a5a3e6769 100644 --- a/parser_library/test/context/using_test.cpp +++ b/parser_library/test/context/using_test.cpp @@ -49,7 +49,7 @@ struct test_context : public dependency_solver } const section* create_section(const std::string& s) { - return asm_ctx.set_section(id(s), section_kind::COMMON, location(), library_info_transitional::empty); + return asm_ctx.set_section(id(s), section_kind::COMMON, library_info_transitional::empty); } address addr(const std::string& name, const std::string& sect, int offset) diff --git a/parser_library/test/expressions/ca_symbol_attribute_test.cpp b/parser_library/test/expressions/ca_symbol_attribute_test.cpp index 6f9e31fe8..c71a75e92 100644 --- a/parser_library/test/expressions/ca_symbol_attribute_test.cpp +++ b/parser_library/test/expressions/ca_symbol_attribute_test.cpp @@ -145,13 +145,11 @@ TEST_P(ca_attr, test) (void)hlasm_ctx->ord_ctx.create_symbol(id_index("C"), context::symbol_value(), context::symbol_attributes(context::symbol_origin::EQU, 'w'_ebcdic, 10), - location(), library_info_transitional::empty); (void)hlasm_ctx->ord_ctx.create_symbol(id_index("T"), context::symbol_value(), context::symbol_attributes(context::symbol_origin::EQU, 'w'_ebcdic, 10), - location(), library_info_transitional::empty); auto var = hlasm_ctx->create_local_variable(name, true); diff --git a/parser_library/test/processing/lookahead_test.cpp b/parser_library/test/processing/lookahead_test.cpp index fa6e775d4..eab463dd0 100644 --- a/parser_library/test/processing/lookahead_test.cpp +++ b/parser_library/test/processing/lookahead_test.cpp @@ -265,11 +265,8 @@ TEST(attribute_lookahead, lookup_not_triggered) evaluation_context eval_ctx { a.hlasm_ctx(), library_info_transitional::empty, diags }; // define symbol with undefined length - auto tmp = a.hlasm_ctx().ord_ctx.create_symbol(id_index("X"), - symbol_value(), - symbol_attributes(symbol_origin::DAT, 200), - {}, - library_info_transitional::empty); + auto tmp = a.hlasm_ctx().ord_ctx.create_symbol( + id_index("X"), symbol_value(), symbol_attributes(symbol_origin::DAT, 200), library_info_transitional::empty); ASSERT_TRUE(tmp); // although length is undefined the actual symbol is defined so no lookup should happen