From 7c5d26089c4ef14cf4c7c2d87160bea314b97f20 Mon Sep 17 00:00:00 2001 From: slavek-kucera <53339291+slavek-kucera@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:01:19 +0200 Subject: [PATCH] refactor: Hide diagnostic collection details --- parser_library/fuzzer/fuzzer.cpp | 1 - parser_library/src/analyzer.cpp | 33 ++++---- parser_library/src/analyzer.h | 16 ++-- parser_library/src/instruction_set_version.h | 4 - .../src/processing/opencode_provider.cpp | 5 +- parser_library/src/processing/preprocessor.h | 19 +++-- .../src/workspaces/parse_lib_provider.h | 2 +- parser_library/src/workspaces/workspace.cpp | 10 +-- parser_library/test/async_macro_parsing.cpp | 44 +++++------ .../test/checking/asm_instr_diag_test.cpp | 77 ------------------- .../data_definition_check_test.cpp | 4 - .../data_definition/data_definition_common.h | 1 + .../data_definition/data_definition_test.cpp | 13 ---- .../test/checking/mach_instr_check_test.cpp | 24 ------ parser_library/test/common_testing.h | 73 ++++++++++-------- parser_library/test/config/system_id_test.cpp | 2 - parser_library/test/context/context_test.cpp | 5 -- .../test/context/data_attribute_test.cpp | 43 ----------- .../test/context/instruction_test.cpp | 3 - parser_library/test/context/literals_test.cpp | 37 +-------- parser_library/test/context/macro_test.cpp | 44 ----------- parser_library/test/context/ord_sym_test.cpp | 25 ------ .../system_variable_subscripts_test.cpp | 1 - .../test/context/system_variable_test.cpp | 14 ---- parser_library/test/context/using_test.cpp | 43 +---------- .../debugging/debug_lib_provider_test.cpp | 1 - parser_library/test/diagnosable_ctx_test.cpp | 1 - .../test/diagnostics_check_test.cpp | 11 --- .../test/diagnostics_sysvar_test.cpp | 7 -- .../arithmetic_expression_test.cpp | 25 ------ .../test/expressions/ca_var_sym_test.cpp | 1 - .../expressions/character_expression_test.cpp | 21 ----- .../expressions/logical_expression_test.cpp | 34 -------- parser_library/test/lexing/lexer_test.cpp | 3 +- .../lsp_context_document_symbol_ord_test.cpp | 1 - .../test/lsp/lsp_context_instr_test.cpp | 1 - .../test/lsp/lsp_context_ord_sym_test.cpp | 7 -- parser_library/test/mock_parse_lib_provider.h | 2 +- .../test/parsing/deferred_statement_test.cpp | 6 -- .../test/parsing/label_parsing_test.cpp | 2 - parser_library/test/parsing/special_test.cpp | 27 +++---- parser_library/test/parsing/string_test.cpp | 6 -- .../test/processing/ainsert_test.cpp | 28 ++----- parser_library/test/processing/aread_test.cpp | 57 +++++--------- .../test/processing/asm_instr_test.cpp | 14 ---- .../test/processing/ca_instr_test.cpp | 27 ------- .../processing/cics_preprocessor_test.cpp | 6 -- parser_library/test/processing/copy_test.cpp | 19 ----- .../test/processing/db2_preprocessor_test.cpp | 31 +------- parser_library/test/processing/dc_test.cpp | 22 ------ .../test/processing/end_instr_test.cpp | 55 ++++++------- .../processing/endevor_preprocessor_test.cpp | 1 - parser_library/test/processing/equ_test.cpp | 15 ---- parser_library/test/processing/label_test.cpp | 3 - parser_library/test/processing/loctr_test.cpp | 3 - .../test/processing/lookahead_test.cpp | 52 ------------- .../test/processing/mach_instr_test.cpp | 23 +----- .../multiple_preprocessors_test.cpp | 2 - parser_library/test/processing/opsyn_test.cpp | 45 +++++------ parser_library/test/processing/org_test.cpp | 65 ---------------- parser_library/test/processing/punch_test.cpp | 5 -- parser_library/test/processing/start_test.cpp | 7 -- .../test/semantics/concatenation_test.cpp | 6 -- parser_library/test/semantics/fading_test.cpp | 1 + .../test/semantics/highlighting_test.cpp | 2 - .../test/semantics/operand_test.cpp | 1 - parser_library/test/stability_test.cpp | 5 -- parser_library/test/utf_conv_test.cpp | 3 - .../test/workspace/macro_cache_test.cpp | 1 - .../test/workspace/virtual_files_test.cpp | 5 +- 70 files changed, 194 insertions(+), 1009 deletions(-) diff --git a/parser_library/fuzzer/fuzzer.cpp b/parser_library/fuzzer/fuzzer.cpp index 7d3f7db0a..30fbd9116 100644 --- a/parser_library/fuzzer/fuzzer.cpp +++ b/parser_library/fuzzer/fuzzer.cpp @@ -67,7 +67,6 @@ class fuzzer_lib_provider : public parse_lib_provider analyzer a( files[lib.value()], analyzer_options(resource_location(std::move(library)), this, std::move(ctx), data)); co_await a.co_analyze(); - a.collect_diags(); co_return true; } diff --git a/parser_library/src/analyzer.cpp b/parser_library/src/analyzer.cpp index 59346efe6..e77dbfe13 100644 --- a/parser_library/src/analyzer.cpp +++ b/parser_library/src/analyzer.cpp @@ -14,6 +14,8 @@ #include "analyzer.h" +#include "context/id_storage.h" +#include "diagnosable_ctx.h" #include "lsp/lsp_context.h" #include "processing/opencode_provider.h" #include "processing/preprocessor.h" @@ -105,10 +107,11 @@ std::unique_ptr analyzer_options::get_preprocessor(pro return std::make_unique(std::move(tmp)); } -struct analyzer::impl +struct analyzer::impl : public diagnosable_ctx { - impl(std::string_view text, analyzer_options&& opts, diagnosable_ctx& diag_consumer) - : ctx(std::move(opts.get_context())) + impl(std::string_view text, analyzer_options&& opts) + : diagnosable_ctx(opts.get_hlasm_context()) + , ctx(std::move(opts.get_context())) , src_proc(opts.collect_hl_info == collect_highlighting_info::yes) , field_parser(ctx.hlasm_ctx.get()) , mngr(std::make_unique(text, @@ -117,10 +120,9 @@ struct analyzer::impl mngr, mngr, src_proc, - diag_consumer, - opts.get_preprocessor(std::bind_front(&parse_lib_provider::get_library, &opts.get_lib_provider()), - diag_consumer, - src_proc), + *this, + opts.get_preprocessor( + std::bind_front(&parse_lib_provider::get_library, &opts.get_lib_provider()), *this, src_proc), opts.parsing_opencode == file_is_opencode::yes ? processing::opencode_provider_options { true, 10 } : processing::opencode_provider_options {}, opts.vf_monitor, @@ -144,11 +146,16 @@ struct analyzer::impl std::vector> vf_handles; processing::processing_manager mngr; + + void collect_diags() const override + { + collect_diags_from_child(mngr); + collect_diags_from_child(field_parser); + } }; analyzer::analyzer(std::string_view text, analyzer_options opts) - : diagnosable_ctx(opts.get_hlasm_context()) - , m_impl(std::make_unique(text, std::move(opts), *this)) + : m_impl(std::make_unique(text, std::move(opts))) {} analyzer::~analyzer() = default; @@ -173,16 +180,14 @@ hlasm_plugin::utils::task analyzer::co_analyze() & co_await m_impl->mngr.co_step(); m_impl->src_proc.finish(); -} -void analyzer::collect_diags() const -{ - collect_diags_from_child(m_impl->mngr); - collect_diags_from_child(m_impl->field_parser); + m_impl->collect_diags(); } const performance_metrics& analyzer::get_metrics() const { return m_impl->ctx.hlasm_ctx->metrics; } +std::span analyzer::diags() const noexcept { return m_impl->diags(); } + void analyzer::register_stmt_analyzer(processing::statement_analyzer* stmt_analyzer) { m_impl->mngr.register_stmt_analyzer(stmt_analyzer); diff --git a/parser_library/src/analyzer.h b/parser_library/src/analyzer.h index 78e5e2b06..ae3632be6 100644 --- a/parser_library/src/analyzer.h +++ b/parser_library/src/analyzer.h @@ -15,9 +15,8 @@ #ifndef HLASMPARSER_PARSERLIBRARY_ANALYZER_H #define HLASMPARSER_PARSERLIBRARY_ANALYZER_H -#include #include -#include +#include #include #include #include @@ -25,7 +24,6 @@ #include "analyzing_context.h" #include "compiler_options.h" -#include "diagnosable_ctx.h" #include "preprocessor_options.h" #include "processing/preprocessor.h" #include "protocol.h" @@ -38,6 +36,7 @@ class task; namespace hlasm_plugin::parser_library::context { class hlasm_context; +class id_storage; } // namespace hlasm_plugin::parser_library::context namespace hlasm_plugin::parser_library::parsing { @@ -58,6 +57,10 @@ class output_handler; class virtual_file_monitor; class virtual_file_handle; +template +class diagnostic_consumer; +struct diagnostic_op; + enum class collect_highlighting_info : bool { no, @@ -102,7 +105,7 @@ class analyzer_options analyzing_context& get_context(); workspaces::parse_lib_provider& get_lib_provider() const; std::unique_ptr get_preprocessor( - processing::library_fetcher, diagnostic_op_consumer&, semantics::source_info_processor&) const; + processing::library_fetcher, diagnostic_consumer&, semantics::source_info_processor&) const; friend class analyzer; @@ -152,7 +155,7 @@ class analyzer_options }; // this class analyzes provided text and produces diagnostics and highlighting info with respect to provided context -class analyzer : public diagnosable_ctx +class analyzer { struct impl; @@ -171,9 +174,10 @@ class analyzer : public diagnosable_ctx void analyze(); [[nodiscard]] utils::task co_analyze() &; - void collect_diags() const override; const performance_metrics& get_metrics() const; + std::span diags() const noexcept; + void register_stmt_analyzer(processing::statement_analyzer* stmt_analyzer); parsing::hlasmparser_multiline& parser(); // for testing only diff --git a/parser_library/src/instruction_set_version.h b/parser_library/src/instruction_set_version.h index e35ea67ff..9f4a454ea 100644 --- a/parser_library/src/instruction_set_version.h +++ b/parser_library/src/instruction_set_version.h @@ -15,10 +15,6 @@ #ifndef HLASMPARSER_PARSERLIBRARY_INSTRUCTION_SET_VERSION_H #define HLASMPARSER_PARSERLIBRARY_INSTRUCTION_SET_VERSION_H -#include -#include -#include - // Available instruction sets versions namespace hlasm_plugin::parser_library { enum class instruction_set_version diff --git a/parser_library/src/processing/opencode_provider.cpp b/parser_library/src/processing/opencode_provider.cpp index 95fbc13e1..7db3d952f 100644 --- a/parser_library/src/processing/opencode_provider.cpp +++ b/parser_library/src/processing/opencode_provider.cpp @@ -576,7 +576,10 @@ utils::task opencode_provider::start_nested_parser( { analyzer a(text, std::move(opts)); co_await a.co_analyze(); - m_diagnoser->collect_diags_from_child(a); + + for (auto&& d : a.diags()) + m_diagnoser->add_diagnostic(std::move(d)); + m_ctx.hlasm_ctx->enter_copy_member(vf_name); } diff --git a/parser_library/src/processing/preprocessor.h b/parser_library/src/processing/preprocessor.h index 3c4da74c3..1aad260dc 100644 --- a/parser_library/src/processing/preprocessor.h +++ b/parser_library/src/processing/preprocessor.h @@ -24,7 +24,6 @@ #include #include -#include "diagnostic_consumer.h" #include "document.h" #include "utils/resource_location.h" @@ -33,6 +32,10 @@ struct cics_preprocessor_options; struct db2_preprocessor_options; struct endevor_preprocessor_options; +template +class diagnostic_consumer; +struct diagnostic_op; + namespace lexing { template struct logical_line; @@ -72,15 +75,19 @@ class preprocessor [[nodiscard]] virtual utils::value_task generate_replacement(document doc) = 0; - static std::unique_ptr create( - const cics_preprocessor_options&, library_fetcher, diagnostic_op_consumer*, semantics::source_info_processor&); + static std::unique_ptr create(const cics_preprocessor_options&, + library_fetcher, + diagnostic_consumer*, + semantics::source_info_processor&); - static std::unique_ptr create( - const db2_preprocessor_options&, library_fetcher, diagnostic_op_consumer*, semantics::source_info_processor&); + static std::unique_ptr create(const db2_preprocessor_options&, + library_fetcher, + diagnostic_consumer*, + semantics::source_info_processor&); static std::unique_ptr create(const endevor_preprocessor_options&, library_fetcher, - diagnostic_op_consumer*, + diagnostic_consumer*, semantics::source_info_processor&); virtual std::vector> take_statements(); diff --git a/parser_library/src/workspaces/parse_lib_provider.h b/parser_library/src/workspaces/parse_lib_provider.h index 9af1d740b..35489d3b5 100644 --- a/parser_library/src/workspaces/parse_lib_provider.h +++ b/parser_library/src/workspaces/parse_lib_provider.h @@ -23,7 +23,7 @@ #include #include "analyzing_context.h" -#include "context/id_storage.h" +#include "context/id_index.h" #include "processing/processing_format.h" #include "utils/resource_location.h" #include "utils/task.h" diff --git a/parser_library/src/workspaces/workspace.cpp b/parser_library/src/workspaces/workspace.cpp index 011219df8..ac7d90f29 100644 --- a/parser_library/src/workspaces/workspace.cpp +++ b/parser_library/src/workspaces/workspace.cpp @@ -95,11 +95,10 @@ struct parsing_results a.register_stmt_analyzer(&hc_analyzer); co_await a.co_analyze(); - - a.collect_diags(); + auto d = a.diags(); parsing_results result; - result.opencode_diagnostics = std::move(a.diags()); + result.opencode_diagnostics.assign(std::make_move_iterator(d.begin()), std::make_move_iterator(d.end())); result.hl_info = a.take_semantic_tokens(); result.lsp_context = a.context().lsp_ctx; result.fade_messages = std::move(fms); @@ -231,9 +230,10 @@ struct workspace_parse_lib_provider final : public parse_lib_provider a.register_stmt_analyzer(&hc_analyzer); co_await a.co_analyze(); - a.collect_diags(); + auto d = a.diags(); - macro_pfc.m_last_results->macro_diagnostics = std::move(a.diags()); + macro_pfc.m_last_results->macro_diagnostics.assign( + std::make_move_iterator(d.begin()), std::make_move_iterator(d.end())); mc.save_macro(cache_key, a); macro_pfc.m_last_macro_analyzer_with_lsp = collect_hl; diff --git a/parser_library/test/async_macro_parsing.cpp b/parser_library/test/async_macro_parsing.cpp index b70575699..9392f0946 100644 --- a/parser_library/test/async_macro_parsing.cpp +++ b/parser_library/test/async_macro_parsing.cpp @@ -25,7 +25,7 @@ using namespace ::testing; struct async_macro_parsing_fixture : ::testing::Test, parse_lib_provider { std::unordered_map> m_files; - analyzer* current = nullptr; + std::vector m_diags; // Inherited via parse_lib_provider value_task parse_library(std::string library, analyzing_context ctx, library_data data) override @@ -46,7 +46,8 @@ struct async_macro_parsing_fixture : ::testing::Test, parse_lib_provider }); co_await a.co_analyze(); - current->collect_diags_from_child(a); + auto d = a.diags(); + m_diags.insert(m_diags.end(), std::make_move_iterator(d.begin()), std::make_move_iterator(d.end())); co_return true; } } @@ -70,19 +71,20 @@ struct async_macro_parsing_fixture : ::testing::Test, parse_lib_provider void analyze(analyzer& a) { - current = &a; a.co_analyze().run(); - current = nullptr; + auto d = a.diags(); + m_diags.insert(m_diags.end(), std::make_move_iterator(d.begin()), std::make_move_iterator(d.end())); } + + std::span diags() const noexcept { return m_diags; } }; TEST_F(async_macro_parsing_fixture, macro_not_found) { analyzer a(" MAC", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "E049" })); + EXPECT_TRUE(matches_message_codes(diags(), { "E049" })); } TEST_F(async_macro_parsing_fixture, macro_not_found_twice) @@ -93,18 +95,16 @@ TEST_F(async_macro_parsing_fixture, macro_not_found_twice) )", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "E049", "E049" })); + EXPECT_TRUE(matches_message_codes(diags(), { "E049", "E049" })); } TEST_F(async_macro_parsing_fixture, copy_not_found) { analyzer a(" COPY MAC", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "E058" })); + EXPECT_TRUE(matches_message_codes(diags(), { "E058" })); } TEST_F(async_macro_parsing_fixture, copy_not_found_twice) @@ -115,9 +115,8 @@ TEST_F(async_macro_parsing_fixture, copy_not_found_twice) )", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "E058", "E058" })); + EXPECT_TRUE(matches_message_codes(diags(), { "E058", "E058" })); } TEST_F(async_macro_parsing_fixture, copy_not_found_in_macro) @@ -129,9 +128,8 @@ TEST_F(async_macro_parsing_fixture, copy_not_found_in_macro) )"); analyzer a(" MAC", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "E058" })); + EXPECT_TRUE(matches_message_codes(diags(), { "E058" })); } TEST_F(async_macro_parsing_fixture, copy_in_macro) @@ -144,9 +142,8 @@ TEST_F(async_macro_parsing_fixture, copy_in_macro) m_files.try_emplace("COPYBOOK", " MNOTE 'AAA'"); analyzer a(" MAC", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE" })); + EXPECT_TRUE(matches_message_codes(diags(), { "MNOTE" })); } TEST_F(async_macro_parsing_fixture, copy_from_ainsert) @@ -154,9 +151,8 @@ TEST_F(async_macro_parsing_fixture, copy_from_ainsert) m_files.try_emplace("COPYBOOK", " MNOTE 'AAA'"); analyzer a(" AINSERT ' COPY COPYBOOK',BACK", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE" })); + EXPECT_TRUE(matches_message_codes(diags(), { "MNOTE" })); } TEST_F(async_macro_parsing_fixture, self_calling_macro) @@ -169,9 +165,8 @@ TEST_F(async_macro_parsing_fixture, self_calling_macro) )"); analyzer a(" MAC 0", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(a.diags().empty()); + EXPECT_TRUE(diags().empty()); } TEST_F(async_macro_parsing_fixture, delete_macro) @@ -188,9 +183,8 @@ MAC OPSYN )", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE", "MNOTE" })); + EXPECT_TRUE(matches_message_codes(diags(), { "MNOTE", "MNOTE" })); } TEST_F(async_macro_parsing_fixture, delete_inline_macro) @@ -214,9 +208,8 @@ MAC OPSYN )", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_text(a.diags(), { "AAA", "BBB", "AAA" })); + EXPECT_TRUE(matches_message_text(diags(), { "AAA", "BBB", "AAA" })); } TEST_F(async_macro_parsing_fixture, unknown_instruction) @@ -246,7 +239,6 @@ TEST_F(async_macro_parsing_fixture, unknown_instruction) )", analyzer_options(this)); analyze(a); - a.collect_diags(); - EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE", "MNOTE" })); + EXPECT_TRUE(matches_message_codes(diags(), { "MNOTE", "MNOTE" })); } diff --git a/parser_library/test/checking/asm_instr_diag_test.cpp b/parser_library/test/checking/asm_instr_diag_test.cpp index 70d11d48e..68d3f305b 100644 --- a/parser_library/test/checking/asm_instr_diag_test.cpp +++ b/parser_library/test/checking/asm_instr_diag_test.cpp @@ -28,7 +28,6 @@ TEST(diagnostics, org_incorrect_second_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A115" })); } @@ -41,7 +40,6 @@ TEST(diagnostics, exitctl_op_incorrect_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A020" })); } @@ -54,7 +52,6 @@ TEST(diagnostics, exitctl_op_incorrect_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A131" })); } @@ -67,7 +64,6 @@ TEST(diagnostics, extrn_incorrect_part_operand) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A129" })); } @@ -80,7 +76,6 @@ TEST(diagnostics, extrn_incorrect_complex_operand) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A129" })); } @@ -93,7 +88,6 @@ TEST(diagnostics, extrn_incorrect_part_type) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A129" })); @@ -107,7 +101,6 @@ TEST(diagnostics, ictl_empty_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A021" })); } @@ -120,7 +113,6 @@ TEST(diagnostics, ictl_undefined_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A242" })); } @@ -133,7 +125,6 @@ TEST(diagnostics, ictl_incorrect_begin_val) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A123" })); } @@ -146,7 +137,6 @@ TEST(diagnostics, ictl_incorrect_continuation_val) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A126" })); } @@ -159,7 +149,6 @@ TEST(diagnostics, ictl_incorrect_end_begin_diff) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A125" })); } @@ -172,7 +161,6 @@ TEST(diagnostics, ictl_incorrect_continuation_begin_diff) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A127" })); } @@ -185,7 +173,6 @@ TEST(diagnostics, end_incorrect_first_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A243" })); } @@ -199,7 +186,6 @@ simple equ 2 )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A001" })); } @@ -213,7 +199,6 @@ TEST(diagnostics, end_incorrect_language_third_char) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A140" })); } @@ -226,7 +211,6 @@ TEST(diagnostics, end_incorrect_language_second_char) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A139" })); } @@ -239,7 +223,6 @@ TEST(diagnostics, end_incorrect_language_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A137" })); } @@ -252,7 +235,6 @@ TEST(diagnostics, drop_incorrect_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A141" })); } @@ -265,7 +247,6 @@ TEST(diagnostics, cnop_incorrect_first_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A143" })); } @@ -278,7 +259,6 @@ TEST(diagnostics, cnop_incorrect_second_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A143" })); } @@ -291,7 +271,6 @@ TEST(diagnostics, cnop_incorrect_boundary) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A145" })); } @@ -304,7 +283,6 @@ TEST(diagnostics, ccw_unspecified_operand) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A147" })); } @@ -317,7 +295,6 @@ TEST(diagnostics, ccw_incorrect_first_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A143" })); } @@ -330,7 +307,6 @@ TEST(diagnostics, ccw_incorrect_second_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A247" })); } @@ -343,7 +319,6 @@ TEST(diagnostics, space_incorrect_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A240" })); } @@ -356,7 +331,6 @@ TEST(diagnostics, space_incorrect_op_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A148" })); } @@ -369,7 +343,6 @@ TEST(diagnostics, cattr_incorrect_simple_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A149" })); } @@ -382,7 +355,6 @@ TEST(diagnostics, cattr_incorrect_complex_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A149" })); } @@ -395,7 +367,6 @@ TEST(diagnostics, cattr_incorrect_complex_params) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A016" })); } @@ -408,7 +379,6 @@ TEST(diagnostics, cattr_incorrect_rmode_param) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A204" })); } @@ -421,7 +391,6 @@ TEST(diagnostics, cattr_incorrect_align_param) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A205" })); } @@ -434,7 +403,6 @@ TEST(diagnostics, cattr_incorrect_fill_param) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A206" })); } @@ -447,7 +415,6 @@ TEST(diagnostics, cattr_incorrect_priority_param) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A208" })); } @@ -460,7 +427,6 @@ TEST(diagnostics, cattr_incorrect_part_param) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A207" })); } @@ -473,7 +439,6 @@ TEST(diagnostics, cattr_empty_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A021" })); } @@ -486,7 +451,6 @@ TEST(diagnostics, ainsert_incorrect_string) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A301" })); } @@ -499,7 +463,6 @@ TEST(diagnostics, ainsert_incorrect_second_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A156" })); } @@ -512,7 +475,6 @@ TEST(diagnostics, adata_incorrect_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A158" })); } @@ -525,7 +487,6 @@ TEST(diagnostics, adata_incorrect_last_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A239" })); } @@ -538,7 +499,6 @@ TEST(diagnostics, adata_string_not_enclosed) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A300" })); } @@ -556,7 +516,6 @@ TEST(diagnostics, adata_string_too_long) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A160" })); } @@ -569,7 +528,6 @@ TEST(diagnostics, acontrol_incorrect_simple_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A161" })); } @@ -582,7 +540,6 @@ TEST(diagnostics, acontrol_incorrect_complex_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A161" })); } @@ -595,7 +552,6 @@ TEST(diagnostics, acontrol_compat_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A209" })); } @@ -608,7 +564,6 @@ TEST(diagnostics, acontrol_flag_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A211" })); } @@ -621,7 +576,6 @@ TEST(diagnostics, acontrol_optable_params_size) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A018" })); } @@ -634,7 +588,6 @@ TEST(diagnostics, acontrol_optable_first_params_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A212" })); } @@ -647,7 +600,6 @@ TEST(diagnostics, acontrol_optable_second_params_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A213" })); } @@ -660,7 +612,6 @@ TEST(diagnostics, acontrol_typecheck_param) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A214" })); } @@ -673,7 +624,6 @@ TEST(diagnostics, acontrol_empty_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A021" })); } @@ -687,7 +637,6 @@ TEST(diagnostics, extrn_empty_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A021" })); } @@ -700,7 +649,6 @@ TEST(diagnostics, xattr_scope_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A200" })); } @@ -713,7 +661,6 @@ TEST(diagnostics, xattr_linkage_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A201" })); } @@ -726,7 +673,6 @@ TEST(diagnostics, xattr_reference_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A288" })); } @@ -739,7 +685,6 @@ TEST(diagnostics, xattr_reference_direct_indirect_options) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A202" })); } @@ -752,7 +697,6 @@ TEST(diagnostics, xattr_reference_number_of_params) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A018" })); } @@ -765,7 +709,6 @@ TEST(diagnostics, mnote_incorrect_message) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A119" })); } @@ -778,7 +721,6 @@ TEST(diagnostics, mnote_first_op_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A119" })); } @@ -791,7 +733,6 @@ TEST(diagnostics, mnote_first_op_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A300", "MNOTE" })); } @@ -822,7 +763,6 @@ TEST(diagnostics, mnote_long_message) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A117", "MNOTE" })); } @@ -835,7 +775,6 @@ TEST(diagnostics, iseq_number_of_operands) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A013" })); } @@ -848,7 +787,6 @@ TEST(diagnostics, iseq_incorrect_op_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A120" })); } @@ -861,7 +799,6 @@ TEST(diagnostics, push_print_specified) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A112" })); } @@ -874,7 +811,6 @@ TEST(diagnostics, push_acontrol_specified) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A112" })); } @@ -887,7 +823,6 @@ TEST(diagnostics, pop_noprint_first) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A113" })); } @@ -900,7 +835,6 @@ TEST(diagnostics, pop_incorrect_last_operand) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A110" })); } @@ -913,7 +847,6 @@ TEST(diagnostics, pop_only_noprint_specified) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A114" })); } @@ -926,7 +859,6 @@ TEST(diagnostics, push_incorrect_op_value) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A111" })); } @@ -939,7 +871,6 @@ TEST(diagnostics, org_incorrect_first_op) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "A245" })); } @@ -982,7 +913,6 @@ TEST_P(mnote_fixture, diagnostic_severity) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); @@ -1001,7 +931,6 @@ TEST(mnote, substitution_first) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); @@ -1021,7 +950,6 @@ TEST(mnote, substitution_both) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); @@ -1039,7 +967,6 @@ TEST(mnote, empty_first_arg) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); @@ -1057,7 +984,6 @@ TEST(mnote, three_args) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A012" })); } @@ -1070,7 +996,6 @@ TEST(mnote, emtpy_second_arg) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE", "A300" })); } @@ -1083,7 +1008,6 @@ TEST(mnote, missing_quotes) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE", "A300" })); } @@ -1097,7 +1021,6 @@ TEST(mnote, nonprintable_characters) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_TRUE(matches_message_codes(a.diags(), { "MNOTE" })); EXPECT_EQ(a.diags()[0].message, "<01><01>"); diff --git a/parser_library/test/checking/data_definition/data_definition_check_test.cpp b/parser_library/test/checking/data_definition/data_definition_check_test.cpp index 33ebd5d6e..8f4bf22d6 100644 --- a/parser_library/test/checking/data_definition/data_definition_check_test.cpp +++ b/parser_library/test/checking/data_definition/data_definition_check_test.cpp @@ -60,7 +60,6 @@ TEST(data_def_checker, unknown_extension_analyzer) std::string input = " DC BA'1'"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D006" })); } @@ -732,7 +731,6 @@ TEST(data_def_checker, V_ok) std::string input = " DC V(SYMBOL)"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -742,14 +740,12 @@ TEST(data_def_checker, V_single_symbol_expected) std::string input = " DC V(SYMBOL+5)"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D030" })); std::string input2 = " DC V(12(13))"; analyzer a2(input); a2.analyze(); - a2.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D030" })); } diff --git a/parser_library/test/checking/data_definition/data_definition_common.h b/parser_library/test/checking/data_definition/data_definition_common.h index 034297365..b9d3a77b0 100644 --- a/parser_library/test/checking/data_definition/data_definition_common.h +++ b/parser_library/test/checking/data_definition/data_definition_common.h @@ -22,6 +22,7 @@ #include "checking/data_definition/data_def_types.h" #include "checking/diagnostic_collector.h" #include "context/hlasm_context.h" +#include "diagnosable_ctx.h" using namespace hlasm_plugin::parser_library::checking; using namespace hlasm_plugin::parser_library; diff --git a/parser_library/test/checking/data_definition/data_definition_test.cpp b/parser_library/test/checking/data_definition/data_definition_test.cpp index 2fa73ab72..595316f90 100644 --- a/parser_library/test/checking/data_definition/data_definition_test.cpp +++ b/parser_library/test/checking/data_definition/data_definition_test.cpp @@ -24,7 +24,6 @@ void expect_no_errors(const std::string& text) std::string input = (text); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -33,7 +32,6 @@ void expect_errors(const std::string& text, std::initializer_list m std::string input = (text); analyzer a(input); a.analyze(); - a.collect_diags(); const auto& diags = a.diags(); EXPECT_GT(diags.size(), (size_t)0); @@ -393,7 +391,6 @@ TEST(data_definition, B_wrong_nominal_value) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -408,7 +405,6 @@ TEST(data_definition, suppres_syntax_errors_in_macro) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -426,7 +422,6 @@ TEST(data_definition, syntax_error_for_each_call) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D003", "D003" })); } @@ -440,7 +435,6 @@ TEST(data_definition, trim_labels) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -484,7 +478,6 @@ TEST(data_definition, externals_type_support) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), "$"); @@ -502,7 +495,6 @@ TEST(data_definition, externals_part_type_support) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), "$"); @@ -539,7 +531,6 @@ LZ EQU *-Z )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "LX"), 24); @@ -583,7 +574,6 @@ LEN EQU *-X )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "LEN"), 16); @@ -599,7 +589,6 @@ LEN EQU *-X )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "LEN"), 24); @@ -615,7 +604,6 @@ L EQU * )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -635,7 +623,6 @@ TEST EQU *-X )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "TEST"), 120); diff --git a/parser_library/test/checking/mach_instr_check_test.cpp b/parser_library/test/checking/mach_instr_check_test.cpp index e33c63dfd..f5506e58d 100644 --- a/parser_library/test/checking/mach_instr_check_test.cpp +++ b/parser_library/test/checking/mach_instr_check_test.cpp @@ -106,7 +106,6 @@ TEST(machine_instr_check_test, second_par_omitted) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M004" })); } @@ -119,7 +118,6 @@ TEST(machine_instr_check_test, displ_unsigned_size) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M130" })); } @@ -132,7 +130,6 @@ TEST(machine_instr_check_test, displ_signed_size) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -145,7 +142,6 @@ TEST(machine_instr_check_test, displ_signed_err) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M130" })); } @@ -158,7 +154,6 @@ TEST(machine_instr_check_test, db_incorrect_format) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M104" })); } @@ -171,7 +166,6 @@ TEST(machine_instr_check_test, db_not_corresponding) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M131" })); } @@ -184,7 +178,6 @@ TEST(machine_instr_check_test, dxb_second_par_incorrect) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M131" })); } @@ -197,7 +190,6 @@ TEST(machine_instr_check_test, length_not_corresponding) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M132" })); } @@ -210,7 +202,6 @@ TEST(machine_instr_check_test, dis_reg_not_corresponding) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M135" })); } @@ -223,7 +214,6 @@ TEST(machine_instr_check_test, reg_not_corresponding) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M133" })); } @@ -236,7 +226,6 @@ TEST(machine_instr_check_test, vec_reg_not_corresponding) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M134" })); } @@ -249,7 +238,6 @@ TEST(machine_instr_check_test, displ_as_simple_unsigned) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M130" })); } @@ -262,7 +250,6 @@ TEST(machine_instr_check_test, displ_as_simple_signed_correct) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -275,7 +262,6 @@ TEST(machine_instr_check_test, displ_as_simple_signed_err) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M130" })); } @@ -288,7 +274,6 @@ TEST(machine_instr_check_test, immS_out_of_range) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M137" })); } @@ -303,7 +288,6 @@ DISP MVC 0(1),1 )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M123" })); } @@ -318,7 +302,6 @@ DISP MVC 0(1),1 )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -331,7 +314,6 @@ TEST(machine_instr_check_test, mask_out_of_range) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M121" })); } @@ -344,7 +326,6 @@ TEST(machine_instr_check_test, immU_out_of_range) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M137" })); } @@ -357,7 +338,6 @@ TEST(machine_instr_check_test, vecReg_out_of_range) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M124" })); } @@ -370,7 +350,6 @@ TEST(machine_instr_check_test, mask_expected) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M111" })); } @@ -383,7 +362,6 @@ TEST(machine_instr_check_test, imm_expected) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M112" })); } @@ -396,7 +374,6 @@ TEST(machine_instr_check_test, vec_reg_limits) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -412,7 +389,6 @@ TEST(machine_instr_check_test, mnemonics_with_optional_args) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M001", "M001" })); } diff --git a/parser_library/test/common_testing.h b/parser_library/test/common_testing.h index 1fe698c18..167175665 100644 --- a/parser_library/test/common_testing.h +++ b/parser_library/test/common_testing.h @@ -32,6 +32,7 @@ #include "analyzer.h" #include "context/common_types.h" +#include "diagnostic.h" #include "ebcdic_encoding.h" namespace hlasm_plugin::utils { @@ -39,6 +40,9 @@ class task; } namespace hlasm_plugin::parser_library { class workspace_manager; +template +class diagnostic_consumer; +struct diagnostic_op; namespace context { struct address; class section; @@ -81,29 +85,32 @@ std::optional> get_var_vector(hlasm_context& ctx, std::string nam template std::optional> get_var_vector_map(hlasm_context& ctx, std::string name); -template>, - std::decay_t>> BinPred = std::equal_to<>, - typename C = std::initializer_list>>> -inline bool matches_message_properties(const std::vector& d, const C& c, Proj p, BinPred b = BinPred()) + std::predicate::value_type>&>, + std::decay_t::value_type&>>> BinPred = + std::equal_to<>, + typename C = + std::initializer_list::value_type&>>>> +inline bool matches_message_properties(CMsg&& d, const C& c, Proj p, BinPred b = BinPred()) { - std::vector>> properties; + std::vector::value_type&>>> properties; std::transform( d.begin(), d.end(), std::back_inserter(properties), [&p](const auto& d) { return std::invoke(p, d); }); return std::is_permutation(properties.begin(), properties.end(), c.begin(), c.end(), b); } -template>>> -inline bool contains_message_properties(const std::vector& d, const C& c, Proj p) + typename C = + std::initializer_list::value_type&>>>> +inline bool contains_message_properties(CMsg&& d, const C& c, Proj p) { if (d.size() < c.size()) return false; - std::vector>> properties; + std::vector::value_type&>>> properties; std::transform( d.begin(), d.end(), std::back_inserter(properties), [&p](const auto& d) { return std::invoke(p, d); }); @@ -115,51 +122,53 @@ inline bool contains_message_properties(const std::vector& d, const C& c, P return std::includes(properties.begin(), properties.end(), to_find.begin(), to_find.end()); } -template> -inline bool matches_message_codes(const std::vector& d, const C& c) +template> +inline bool matches_message_codes(CMsg&& d, const C& c) { - return matches_message_properties(d, c, &Msg::code); + return matches_message_properties(d, c, &std::decay_t::value_type::code); } -template> -inline bool contains_message_codes(const std::vector& d, const C& c) +template> +inline bool contains_message_codes(CMsg&& d, const C& c) { - return contains_message_properties(d, c, &Msg::code); + return contains_message_properties(d, c, &std::decay_t::value_type::code); } -template>> -inline bool matches_diagnosed_line_ranges(const std::vector& d, const C& c) +template>> +inline bool matches_diagnosed_line_ranges(CMsg&& d, const C& c) { return matches_message_properties( d, c, [](const auto& d) { return std::make_pair(d.diag_range.start.line, d.diag_range.end.line); }); } -template>> -inline bool contains_diagnosed_line_ranges(const std::vector& d, const C& c) +template>> +inline bool contains_diagnosed_line_ranges(CMsg&& d, const C& c) { return contains_message_properties( d, c, [](const auto& d) { return std::make_pair(d.diag_range.start.line, d.diag_range.end.line); }); } -template> -inline bool matches_message_text(const std::vector& d, const C& c) +template> +inline bool matches_message_text(CMsg&& d, const C& c) { - return matches_message_properties(d, c, &Msg::message); + return matches_message_properties(d, c, &std::decay_t::value_type::message); } -template> -inline bool contains_message_text(const std::vector& d, const C& c) +template> +inline bool contains_message_text(CMsg&& d, const C& c) { - return contains_message_properties(d, c, &Msg::message); + return contains_message_properties(d, c, &std::decay_t::value_type::message); } -template> -inline bool matches_partial_message_text(const std::vector& d, const C& c) +template> +inline bool matches_partial_message_text(CMsg&& d, const C& c) { - return matches_message_properties(d, c, &Msg::message, [](std::string_view a, std::string_view b) -> bool { - return a.find(b) != std::string_view::npos; - }); + return matches_message_properties( + d, c, &std::decay_t::value_type::message, [](std::string_view a, std::string_view b) -> bool { + return a.find(b) != std::string_view::npos; + }); } + bool matches_fade_messages(const std::vector& a, const std::vector& b); bool contains_fade_messages(const std::vector& a, const std::vector& b); @@ -177,6 +186,6 @@ std::optional> get_symbol_address(hlasm_context& ctx size_t get_syntax_errors(analyzer& a); std::unique_ptr parse_ca_expression(analyzer& a); -expressions::data_definition parse_data_definition(analyzer& a, diagnostic_op_consumer* diag = nullptr); +expressions::data_definition parse_data_definition(analyzer& a, diagnostic_consumer* diag = nullptr); #endif diff --git a/parser_library/test/config/system_id_test.cpp b/parser_library/test/config/system_id_test.cpp index 217766309..bf6f65b2c 100644 --- a/parser_library/test/config/system_id_test.cpp +++ b/parser_library/test/config/system_id_test.cpp @@ -27,7 +27,6 @@ TEST(system_id, basic_properties) analyzer a(input, analyzer_options { asm_option { "", "", instruction_set_version::UNI, "VSE" } }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), "VSE"); @@ -46,7 +45,6 @@ TEST(system_id, check_defaults) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), "z/OS 02.04.00"); diff --git a/parser_library/test/context/context_test.cpp b/parser_library/test/context/context_test.cpp index 7d3370eed..14cda5c3d 100644 --- a/parser_library/test/context/context_test.cpp +++ b/parser_library/test/context/context_test.cpp @@ -619,7 +619,6 @@ TEST(context, create_global_var_identical_types_macro) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -640,7 +639,6 @@ TEST(context, create_global_var_different_types_macro) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E078" })); } @@ -656,7 +654,6 @@ TEST(context, create_local_var_different_types) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E051" })); } @@ -702,7 +699,6 @@ TEST(context_system_variables, SYSNEST_SYSMAC) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -733,7 +729,6 @@ TEST(context_system_variables, SYSVER) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/context/data_attribute_test.cpp b/parser_library/test/context/data_attribute_test.cpp index d79400291..216907f16 100644 --- a/parser_library/test/context/data_attribute_test.cpp +++ b/parser_library/test/context/data_attribute_test.cpp @@ -150,7 +150,6 @@ TEST(data_attributes, N_var_syms) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "NN2"), 1); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "NN3"), 1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -186,7 +185,6 @@ TEST(data_attributes, N_var_syms_2) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR1"), 1); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR2"), 1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -219,7 +217,6 @@ TEST(data_attributes, K_var_syms_good) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "NN2"), 1); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "NN3"), 5); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -243,7 +240,6 @@ TEST(data_attributes, K_var_syms_unicode) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "K1"), 2); @@ -270,7 +266,6 @@ TEST(data_attributes, K_var_syms_unicode_array) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "K1"), 2); @@ -287,7 +282,6 @@ TEST(data_attributes, K_var_syms_bad) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -306,7 +300,6 @@ C LOCTR EXPECT_EQ(get_symbol(a.hlasm_ctx(), "B")->attributes().type(), 'J'_ebcdic); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "C")->attributes().type(), 'J'_ebcdic); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -338,7 +331,6 @@ TEST(data_attributes, T_var_syms) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T5"), "N"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T6"), "U"); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -363,7 +355,6 @@ TEST(data_attributes, T_macro_params) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T1"), "O"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T2"), "N"); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -390,7 +381,6 @@ SYMA DC A(0) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T2"), "C"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T3"), "A"); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -409,7 +399,6 @@ SYMA DC A(0) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E012" })); } @@ -438,7 +427,6 @@ B LR 1,1 EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V4"), true); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V5"), false); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -458,7 +446,6 @@ B EQU L'LBL EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -480,7 +467,6 @@ TEST EQU 11,10 EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V1"), 10); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V2"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -498,7 +484,6 @@ B EQU S'A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 12); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -516,7 +501,6 @@ A DC FS12'1' EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V1"), 12); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -539,7 +523,6 @@ EXTEND DC LS10'5.312' EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LONG")->attributes().integer(), (symbol_attributes::len_attr)9); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "EXTEND")->attributes().integer(), (symbol_attributes::len_attr)18); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -555,7 +538,6 @@ X EQU I'HALFCON EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 9); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -571,7 +553,6 @@ HALFCON DC HS6'-25.93' EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V"), 9); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -601,7 +582,6 @@ TEST(data_attributes, O_opencode_ord) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V5"), "M"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V6"), "U"); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -627,7 +607,6 @@ TEST(data_attributes, O_opencode_var) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V1"), "O"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V2"), "M"); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -656,7 +635,6 @@ TEST(data_attributes, O_libraries) EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V2"), "U"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V3"), "M"); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -677,7 +655,6 @@ B EQU T'W EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), symbol_attributes::undef_type); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -698,7 +675,6 @@ W EQU 4,5,6 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 2); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 6); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -719,7 +695,6 @@ B EQU 1,11 EXPECT_EQ(get_var_value(a.hlasm_ctx(), "V1"), 1); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "A")->attributes().length(), (symbol_attributes::len_attr)1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -732,7 +707,6 @@ A EQU L'Q analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -755,7 +729,6 @@ B EQU L'A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 11); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "B")->attributes().length(), (symbol_attributes::len_attr)1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -776,7 +749,6 @@ C EQU 1,12 ASSERT_EQ(get_symbol(a.hlasm_ctx(), "X")->kind(), symbol_value_kind::ABS); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -791,7 +763,6 @@ V EQU I'C analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -808,7 +779,6 @@ C EQU L'* analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); @@ -834,7 +804,6 @@ TEST(data_attributes, expression_without_spaces) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 0); @@ -863,7 +832,6 @@ TEST(data_attributes, attribute_after_paren) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "X"), true); @@ -904,7 +872,6 @@ A_ MAC A_ analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -965,7 +932,6 @@ A DS A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), errs)); @@ -993,7 +959,6 @@ A DS A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1017,7 +982,6 @@ TEST(data_attributes, delayed_literal_definition) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1043,7 +1007,6 @@ V6 EQU O'UNKNOWN analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1085,7 +1048,6 @@ A_ MAC A_ analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "L1"), 0xE4); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "E1"), 0xE4); @@ -1130,7 +1092,6 @@ V1 EQU T'W analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1159,7 +1120,6 @@ E4 EQU O'MAC analyzer a(input, analyzer_options(&lib)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1192,7 +1152,6 @@ X EQU 0 analyzer a(input, analyzer_options(&lib)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1228,7 +1187,6 @@ MAC OPSYN analyzer a(input, analyzer_options(&lib)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1254,7 +1212,6 @@ A USE analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "T"), "U"); diff --git a/parser_library/test/context/instruction_test.cpp b/parser_library/test/context/instruction_test.cpp index f7300dd2d..e11bbf0b2 100644 --- a/parser_library/test/context/instruction_test.cpp +++ b/parser_library/test/context/instruction_test.cpp @@ -131,7 +131,6 @@ TEST(instruction_sets_fixture, identical_macro_name_inline_definition) { analyzer a(input, analyzer_options { asm_option { "", "", c.instr_set } }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), 0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), c.expected_var_value); @@ -162,7 +161,6 @@ TEST(instruction_sets_fixture, identical_macro_name_linked_definition) { analyzer a(input, analyzer_options { asm_option { "", "", c.instr_set }, &lib_provider }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), 0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), c.expected_var_value); @@ -199,7 +197,6 @@ TEST(instruction_sets_fixture, identical_macro_name_inline_and_linked_definition { analyzer a(input, analyzer_options { asm_option { "", "", c.instr_set }, &lib_provider }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), 0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), c.expected_var_value); diff --git a/parser_library/test/context/literals_test.cpp b/parser_library/test/context/literals_test.cpp index fcab9b83e..7305564a4 100644 --- a/parser_library/test/context/literals_test.cpp +++ b/parser_library/test/context/literals_test.cpp @@ -34,7 +34,6 @@ TEST(literals, duplicate_when_loctr_references) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -55,7 +54,6 @@ TEST(literals, unique_when_no_loctr_references) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -72,7 +70,6 @@ TEST(literals, no_nested_literals) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0013", "S0013" })); } @@ -86,7 +83,6 @@ A EQU L'=A(0) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -108,7 +104,6 @@ TEST(literals, attribute_references_to_literals_in_ca) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -137,7 +132,6 @@ B DC A(0) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -161,7 +155,6 @@ B EQU *-A )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -186,7 +179,6 @@ TEST(literals, ltorg_repeating_literals) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -224,7 +216,6 @@ TEST(literals, similar) std::string input = "A EQU 1\nB EQU 2\nT1 EQU L'" + t.l + '\n' + "T2 EQU L'" + t.r; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -242,7 +233,6 @@ TEST(literals, in_machine_instructions) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -260,7 +250,6 @@ TEST(literals, strange_literals) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -272,7 +261,6 @@ TEST(literals, missing_label_in_literal) )"; analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_TRUE(matches_message_codes(a.diags(), { "E010" })); EXPECT_TRUE(a.diags()[0].message.ends_with(": LABEL")); @@ -289,9 +277,8 @@ TEST(literals, processing_stack_in_messages) )"; analyzer a(input); a.analyze(); - a.collect_diags(); - auto& d = a.diags(); + auto d = a.diags(); ASSERT_TRUE(matches_message_codes(d, { "E010" })); EXPECT_EQ(d.front().related.size(), 1); } @@ -304,7 +291,6 @@ TEST(literals, halfward_alignment) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -317,7 +303,6 @@ TEST(literals, halfward_alignment_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -332,7 +317,6 @@ TEST(literals, halfward_alignment_delayed) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -353,7 +337,6 @@ B CSECT )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -375,7 +358,6 @@ B CSECT )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M136" })); } @@ -388,7 +370,6 @@ TEST(literals, no_csect_available) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M136" })); } @@ -402,7 +383,6 @@ TEST(literals, ltorg_in_dsect) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -414,7 +394,6 @@ TEST(literals, bad_attribute) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W011" })); } @@ -426,7 +405,6 @@ TEST(literals, bad_nominal_value) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D017" })); } @@ -440,7 +418,6 @@ X DS 0H )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D018" })); } @@ -455,7 +432,6 @@ X DS 0H )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D017", "D018" })); } @@ -467,7 +443,6 @@ TEST(literals, zero_length) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D031" })); } @@ -480,7 +455,6 @@ TEST(literals, deduplicate_loctr_len_reference) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -500,7 +474,6 @@ TEST(literals, invalid_loctr_references) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0012", "S0012", "S0005", "S0005" })); } @@ -513,7 +486,6 @@ TEST(literals, part_of_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -525,7 +497,6 @@ TEST(literals, propagate_error_from_literals) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0003", "D031" })); } @@ -539,7 +510,6 @@ LEN EQU *-L )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "LEN"), 16); @@ -558,7 +528,6 @@ TEST(literals, attribute_references_to_substituted_literal) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -587,7 +556,6 @@ TEST(literals, defined_in_ca_expr) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -610,7 +578,6 @@ TEST(literals, in_ca_expr_previously_mentioned) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -626,7 +593,6 @@ TEST(literals, undefined_after_ltorg) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -651,7 +617,6 @@ TEST(literals, suppress_messages_from_DTO_attributes) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/context/macro_test.cpp b/parser_library/test/context/macro_test.cpp index 252fb7345..c03bfc99d 100644 --- a/parser_library/test/context/macro_test.cpp +++ b/parser_library/test/context/macro_test.cpp @@ -201,7 +201,6 @@ TEST(macro, macro_lookahead_fail) id = id_index("INNER_M"); EXPECT_TRUE(a.hlasm_ctx().find_macro(id)); - a.collect_diags(); ASSERT_EQ(a.diags().size(), 1U); EXPECT_EQ(a.diags()[0].code, "E047"); @@ -220,7 +219,6 @@ TEST(macro, macro_positional_param_subs) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -238,7 +236,6 @@ TEST(macro, macro_keyword_param) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -256,7 +253,6 @@ TEST(macro, macro_undefined_keyword_param) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(contains_message_properties(a.diags(), { diagnostic_severity::warning }, &diagnostic_s::severity)); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -277,7 +273,6 @@ TEST(macro, macro_param_expr) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)2); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -294,7 +289,6 @@ TEST(macro, macro_composite_param_no_err) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -311,7 +305,6 @@ TEST(macro, macro_composite_param_err) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -329,7 +322,6 @@ TEST(macro, macro_name_param) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -356,7 +348,6 @@ TEST(macro, macro_name_param_repetition) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)3); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -419,7 +410,6 @@ TEST(macro, MEXIT) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -438,7 +428,6 @@ TEST(macro, cyclic_call_infinite) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -460,7 +449,6 @@ TEST(macro, cyclic_call_finite) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)10); EXPECT_EQ(get_syntax_errors(a), (size_t)0); } @@ -481,7 +469,6 @@ TEST(macro, arguments_concatenation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_global_var_value(a.hlasm_ctx(), "V"), "(B-C)+(A-D)"); @@ -506,7 +493,6 @@ TEST(macro, arguments_continuation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_global_var_value(a.hlasm_ctx(), "Q"), "X"); EXPECT_EQ(get_global_var_value(a.hlasm_ctx(), "W"), "Y"); @@ -530,7 +516,6 @@ TEST(external_macro, bad_name) mock_parse_lib_provider lib_provider { { "MAC", content_bad_name } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); ASSERT_EQ(lib_provider.analyzers.count("MAC"), 1U); EXPECT_EQ(lib_provider.analyzers["MAC"]->diags().size(), 1U); EXPECT_EQ(a.diags().size(), 2U); @@ -554,7 +539,6 @@ TEST(external_macro, bad_begin) mock_parse_lib_provider lib_provider { { "MAC", content_bad_begin } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); ASSERT_EQ(lib_provider.analyzers.count("MAC"), 1U); EXPECT_EQ(lib_provider.analyzers["MAC"]->diags().size(), 1U); EXPECT_EQ(a.diags().size(), 2U); @@ -578,7 +562,6 @@ TEST(external_macro, library_with_begin_comment) mock_parse_lib_provider lib_provider { { "MAC", content_comment } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); ASSERT_EQ(lib_provider.analyzers.count("MAC"), 1U); EXPECT_EQ(lib_provider.analyzers["MAC"]->diags().size(), 0U); EXPECT_TRUE(a.diags().empty()); @@ -599,7 +582,6 @@ TEST(external_macro, process_ordinary_restart) mock_parse_lib_provider lib_provider { { "MAC", ext_macro } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -623,7 +605,6 @@ TEST(external_macro, deferred_macro_restart) mock_parse_lib_provider lib_provider { { "MAC", ext_macro1 }, { "MAC2", ext_macro2 } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -743,7 +724,6 @@ TEST(macro, parse_args) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -760,7 +740,6 @@ TEST(macro, seq_numbers) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -779,7 +758,6 @@ TEST(macro, apostrophe_in_substitution) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE" })); @@ -797,7 +775,6 @@ TEST(macro, macro_call_reparse_range) )"; analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), 1U); EXPECT_EQ(a.diags()[0].code, "S0003"); @@ -817,7 +794,6 @@ TEST(macro, skip_invalid) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -832,7 +808,6 @@ TEST(macro, invalid_not_invoked) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -848,7 +823,6 @@ TEST(macro, invalid_invoked) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E049" })); } @@ -863,7 +837,6 @@ TEST(macro, invalid_prototype) )"; analyzer a(input); a.analyze(); - a.collect_diags(); const auto& d = a.diags(); EXPECT_NE(std::find_if(d.begin(), d.end(), [](const auto& diag) { return diag.code == "E071"; }), d.end()); @@ -881,7 +854,6 @@ AAA )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E001", "S0003" })); } @@ -901,7 +873,6 @@ TEST(macro, missing_mend) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E001", "E046" })); } @@ -931,7 +902,6 @@ ALIAS OPSYN SAM64 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -950,7 +920,6 @@ TEST(macro, operand_string_substitution) )"; analyzer a(input, analyzer_options(asm_option { .sysparm = "ABC" })); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), "'test string ABC'"); @@ -982,7 +951,6 @@ TEST(macro, operand_string_substitution_continuation) input += std::move(suffix); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << i; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), "'test string ABC'") << i; @@ -1011,7 +979,6 @@ TEST(macro, operand_sublist_continuation) input += std::move(suffix); analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_TRUE(a.diags().empty()) << i; } @@ -1036,7 +1003,6 @@ TEST(macro, pass_empty_operand_components) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), 2); @@ -1061,7 +1027,6 @@ TEST(macro, pass_empty_concat_strings) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), ""); @@ -1079,7 +1044,6 @@ TEST(macro, multiline_comment) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1098,7 +1062,6 @@ LABEL DS CL80 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "TEST"), 0); @@ -1119,7 +1082,6 @@ LABEL DS A )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "TEST"), 4); @@ -1136,7 +1098,6 @@ TEST(macro, empty_parms) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1159,7 +1120,6 @@ TEST(macro, empty_parms_after_continuation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "RESULT"), true); @@ -1191,7 +1151,6 @@ T11 MAC ,, A )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1216,7 +1175,6 @@ TEST(macro, illegal_ampersand) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_TRUE(matches_message_codes(a.diags(), { "E064" })); EXPECT_EQ(a.diags()[0].diag_range, range({ 2, 9 }, { 2, 18 })); @@ -1238,7 +1196,6 @@ TEST(macro, multiple_apostrophes) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "STR"), "' TXT('''"); @@ -1258,7 +1215,6 @@ A EQU X analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); diff --git a/parser_library/test/context/ord_sym_test.cpp b/parser_library/test/context/ord_sym_test.cpp index 19b53f766..36559cf32 100644 --- a/parser_library/test/context/ord_sym_test.cpp +++ b/parser_library/test/context/ord_sym_test.cpp @@ -35,7 +35,6 @@ lbl lr 1,1 EXPECT_TRUE(a.hlasm_ctx().ord_ctx.symbol_defined(context::id_index("LBL"))); EXPECT_TRUE(a.hlasm_ctx().ord_ctx.symbol_defined(context::id_index("LCL"))); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -52,7 +51,6 @@ B DSECT EXPECT_TRUE(a.hlasm_ctx().ord_ctx.section_defined(context::id_index("A"), section_kind::EXECUTABLE)); EXPECT_TRUE(a.hlasm_ctx().ord_ctx.section_defined(context::id_index("B"), section_kind::DUMMY)); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -66,7 +64,6 @@ A DSECT a.analyze(); EXPECT_TRUE(a.hlasm_ctx().ord_ctx.section_defined(context::id_index("A"), section_kind::EXECUTABLE)); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -89,7 +86,6 @@ C EQU 10 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 11); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "C"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -113,7 +109,6 @@ Y LR 1,1 EXPECT_EQ(get_symbol(a.hlasm_ctx(), "X")->value().value_kind(), symbol_value_kind::RELOC); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "Y")->value().value_kind(), symbol_value_kind::RELOC); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -135,7 +130,6 @@ C EQU A EXPECT_TRUE(get_symbol(a.hlasm_ctx(), "B")->kind() == symbol_value_kind::ABS); EXPECT_TRUE(get_symbol(a.hlasm_ctx(), "C")->kind() == symbol_value_kind::ABS); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -155,7 +149,6 @@ B EQU 100 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 101); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 100); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -171,7 +164,6 @@ A LR 1,1 EXPECT_TRUE(a.hlasm_ctx().ord_ctx.symbol_defined(context::id_index("A"))); EXPECT_TRUE(get_symbol(a.hlasm_ctx(), "A")->kind() == symbol_value_kind::RELOC); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M110" })); } @@ -188,7 +180,6 @@ B LR A*2,1 EXPECT_TRUE(a.hlasm_ctx().ord_ctx.symbol_defined(context::id_index("B"))); EXPECT_TRUE(get_symbol(a.hlasm_ctx(), "A")->kind() == symbol_value_kind::RELOC); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)2); } @@ -207,7 +198,6 @@ Y LR 1,1 EXPECT_TRUE(get_symbol(a.hlasm_ctx(), "X")->kind() == symbol_value_kind::RELOC); EXPECT_TRUE(get_symbol(a.hlasm_ctx(), "Y")->kind() == symbol_value_kind::RELOC); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -243,7 +233,6 @@ F EQU V-U EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "F"), 4); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -276,7 +265,6 @@ X3 EQU F-E ASSERT_EQ(get_symbol_abs(a.hlasm_ctx(), "X2"), 0); ASSERT_EQ(get_symbol_abs(a.hlasm_ctx(), "X3"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -297,7 +285,6 @@ X EQU 1 mock_parse_lib_provider mock { { "COPYF", lib_data } }; analyzer a(input, analyzer_options { resource_location("test"), &mock }); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "X")->symbol_location(), location({ 6, 0 }, resource_location("test"))); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "XX")->symbol_location(), location({ 3, 0 }, resource_location("test"))); @@ -315,7 +302,6 @@ X EQU S2-S1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -331,7 +317,6 @@ X EQU S2-S1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -351,7 +336,6 @@ X EQU *-B analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 24); @@ -373,7 +357,6 @@ X EQU *-A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 24); @@ -394,7 +377,6 @@ C EQU B-A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -413,7 +395,6 @@ C EQU B-A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -439,7 +420,6 @@ YD DS 0C analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "TEST_AAA"), 36); @@ -455,7 +435,6 @@ TEST(ordinary_symbols, private_sections_valid) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0) << sect_type; } } @@ -472,7 +451,6 @@ TEST(ordinary_symbols, private_sections_invalid) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), t1 != t2) << t1 << t2; } } @@ -492,7 +470,6 @@ X EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "L"), 6); @@ -512,7 +489,6 @@ X EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(contains_message_codes(a.diags(), { "E033" })); } @@ -531,7 +507,6 @@ X EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "L"), 8); diff --git a/parser_library/test/context/system_variable_subscripts_test.cpp b/parser_library/test/context/system_variable_subscripts_test.cpp index cbe51d2bd..dbd5e9f43 100644 --- a/parser_library/test/context/system_variable_subscripts_test.cpp +++ b/parser_library/test/context/system_variable_subscripts_test.cpp @@ -173,7 +173,6 @@ TEST_P(sys_var_subscripts_standard_behavior_fixture, standard_behavior) analyzer a(input, analyzer_options { asm_option { "PAR" } }); a.analyze(); - a.collect_diags(); for (size_t i = 0; i < exp_behavior.size(); ++i) { diff --git a/parser_library/test/context/system_variable_test.cpp b/parser_library/test/context/system_variable_test.cpp index d68121307..6ecec2020 100644 --- a/parser_library/test/context/system_variable_test.cpp +++ b/parser_library/test/context/system_variable_test.cpp @@ -104,7 +104,6 @@ TEST_P(system_variable_standard_behavior_fixture, standard_behavior) analyzer a(input); a.analyze(); - a.collect_diags(); for (size_t i = 0; i < exp_behavior.size(); ++i) { @@ -122,7 +121,6 @@ TEST(system_variable, sysstmt) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "STRING"), "00000003"); @@ -153,7 +151,6 @@ TEST(system_variable, sysstmt_macros) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR1"), "00000027"); @@ -188,7 +185,6 @@ TEST(system_variable, sysstmt_copy) mock_parse_lib_provider lib_prov_instance { { copy1_filename, copy1_source }, { copy2_filename, copy2_source } }; analyzer a(input, analyzer_options { resource_location("ipnut"), &lib_prov_instance }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR1"), "00000006"); @@ -211,7 +207,6 @@ TEST(system_variable, sysstmt_aread) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 13); @@ -234,7 +229,6 @@ MAIN CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), "CSECT"); @@ -256,7 +250,6 @@ TEST(system_variable, sysstyp_empty) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), ""); @@ -274,7 +267,6 @@ TEST(system_variable, sysopt_xobject) { analyzer a(input, analyzer_options(asm_option { .sysopt_xobject = xobject })); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), expected); @@ -301,7 +293,6 @@ TEST(system_variable, sysin_empty) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), "O 0 O 0"); @@ -327,7 +318,6 @@ TEST(system_variable, sysin_nonempty) analyzer a(input, analyzer_options { asm_option { .sysin_dsn = "DATASET.NAME", .sysin_member = "MEMBER" } }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), "U 12 U 6"); @@ -342,7 +332,6 @@ TEST(system_variable, sysin_out_of_scope) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E010", "E010" })); } @@ -358,7 +347,6 @@ LEN EQU *-X analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -444,7 +432,6 @@ TEST(system_variable, mnote_sys_variables) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE", "MNOTE", "MNOTE" })); std::vector expected_res { "000", "000", "000", "000", "000", "008", "000", "000", "002", "004" }; @@ -484,7 +471,6 @@ TEST(system_variable, sysclock) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "VAR"), "U 26"); diff --git a/parser_library/test/context/using_test.cpp b/parser_library/test/context/using_test.cpp index 0aab72f82..88fdbc838 100644 --- a/parser_library/test/context/using_test.cpp +++ b/parser_library/test/context/using_test.cpp @@ -1013,7 +1013,6 @@ LABEL USING TEST,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1028,7 +1027,6 @@ LABEL USING , analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A164", "A104" })); } @@ -1043,7 +1041,6 @@ LABEL USING 'FAIL',1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A164", "A164", "A104" })); } @@ -1057,7 +1054,6 @@ TEST(using, push_pop) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1070,7 +1066,6 @@ TEST(using, pop_empty) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A165" })); } @@ -1085,7 +1080,6 @@ R1 EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1101,7 +1095,6 @@ LABEL DS F analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E031" })); } @@ -1117,7 +1110,6 @@ R1 EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E031" })); } @@ -1136,9 +1128,8 @@ TEST CSECT analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); @@ -1163,7 +1154,6 @@ LABEL MAC TEST1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1180,7 +1170,6 @@ TESTL EQU *-TEST analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1199,7 +1188,6 @@ TESTL EQU *-TEST analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1216,7 +1204,6 @@ LABEL2 DS 0H analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1229,7 +1216,6 @@ LABEL DROP analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A251" })); } @@ -1244,7 +1230,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME004" })); } @@ -1263,7 +1248,6 @@ L USING TEST1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME006", "ME009" })); } @@ -1279,7 +1263,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME005", "ME005" })); } @@ -1296,7 +1279,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME005", "ME005", "ME007" })); } @@ -1312,7 +1294,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME005" })); } @@ -1329,7 +1310,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1344,7 +1324,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1360,7 +1339,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1375,7 +1353,6 @@ L USING A,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME008" })); } @@ -1390,7 +1367,6 @@ L USING A,1,2 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1405,7 +1381,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME008" })); } @@ -1420,7 +1395,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME008" })); } @@ -1437,7 +1411,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1454,7 +1427,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1470,7 +1442,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME008", "ME008" })); } @@ -1486,7 +1457,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1501,7 +1471,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME008" })); } @@ -1516,7 +1485,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D033", "D034" })); } @@ -1531,7 +1499,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1545,7 +1512,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME007" })); } @@ -1560,7 +1526,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME008" })); } @@ -1577,7 +1542,6 @@ A DC S(L) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1592,7 +1556,6 @@ L DS F analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1607,7 +1570,6 @@ L DS F analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1622,7 +1584,6 @@ A DS A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1638,7 +1599,6 @@ B DS A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1656,7 +1616,6 @@ F DS F analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M113" })); } diff --git a/parser_library/test/debugging/debug_lib_provider_test.cpp b/parser_library/test/debugging/debug_lib_provider_test.cpp index 38e3a9b63..775700e9a 100644 --- a/parser_library/test/debugging/debug_lib_provider_test.cpp +++ b/parser_library/test/debugging/debug_lib_provider_test.cpp @@ -61,7 +61,6 @@ TEST_F(debug_lib_provider_test, parse_library) std::string input = " COPY AAA"; analyzer a(input, analyzer_options(&lib)); analyze(a); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE" })); } diff --git a/parser_library/test/diagnosable_ctx_test.cpp b/parser_library/test/diagnosable_ctx_test.cpp index 904795cf5..77d38751c 100644 --- a/parser_library/test/diagnosable_ctx_test.cpp +++ b/parser_library/test/diagnosable_ctx_test.cpp @@ -40,7 +40,6 @@ TEST(diagnosable_ctx, one_file_diag) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(a.diags()[0].diag_range.start.line, (size_t)2); diff --git a/parser_library/test/diagnostics_check_test.cpp b/parser_library/test/diagnostics_check_test.cpp index 4ea1b53b3..4bb56d3b2 100644 --- a/parser_library/test/diagnostics_check_test.cpp +++ b/parser_library/test/diagnostics_check_test.cpp @@ -32,7 +32,6 @@ LABEL EQU *+2 )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -58,7 +57,6 @@ TEST(diagnostics, string_substitution) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -85,7 +83,6 @@ TEST(diagnostics, division_by_zero) // test ok analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -106,7 +103,6 @@ TEST(diagnostics, instr_zero_op) // test ok analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -129,7 +125,6 @@ TEST(diagnostics, unkown_symbols) // to do? number of errors? analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -150,7 +145,6 @@ TEST(diagnostics, case_insensitivity) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -171,7 +165,6 @@ TEST(diagnostics, machine) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -234,7 +227,6 @@ LABEL2 equ *+79000 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -290,7 +282,6 @@ label1 RSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -309,7 +300,6 @@ TEST(diagnostics, parser_diagnostics_passing) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -324,7 +314,6 @@ PRINT EQU * analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } diff --git a/parser_library/test/diagnostics_sysvar_test.cpp b/parser_library/test/diagnostics_sysvar_test.cpp index bb7cbbe0a..b4c673871 100644 --- a/parser_library/test/diagnostics_sysvar_test.cpp +++ b/parser_library/test/diagnostics_sysvar_test.cpp @@ -261,7 +261,6 @@ TEST_P(diagnostics_sysvar_invalid_opcode_fixture, invalid_opcode) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E049" })); } @@ -272,7 +271,6 @@ TEST_P(diagnostics_sysvar_null_opcode_invalid_subscript_fixture, null_opcode_inv analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E012", "E074" })); } @@ -283,7 +281,6 @@ TEST_P(diagnostics_sysvar_null_opcode_fixture, null_opcode) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E074" })); } @@ -294,7 +291,6 @@ TEST_P(diagnostics_sysvar_bad_symbol_fixture, bad_symbol) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E067" })); } @@ -305,7 +301,6 @@ TEST_P(diagnostics_sysvar_non_alpha_char_fixture, non_alpha_char) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E075" })); } @@ -316,7 +311,6 @@ TEST_P(diagnostics_sysvar_unsubscripted_syslist_invalid_opcode_fixture, unsubscr analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E049", "E076" })); } @@ -327,7 +321,6 @@ TEST_P(diagnostics_sysvar_too_many_nested_macro_calls_fixture, too_many_macro_ca analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E055" })); } diff --git a/parser_library/test/expressions/arithmetic_expression_test.cpp b/parser_library/test/expressions/arithmetic_expression_test.cpp index 72a924913..9ce47963d 100644 --- a/parser_library/test/expressions/arithmetic_expression_test.cpp +++ b/parser_library/test/expressions/arithmetic_expression_test.cpp @@ -36,7 +36,6 @@ TEST(arithmetic_expressions, valid_self_defining_term) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); @@ -62,7 +61,6 @@ TEST(arithmetic_expressions, valid_expressions) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); @@ -81,7 +79,6 @@ TEST(arithmetic_expressions, empty_string_conversion) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 0); @@ -103,7 +100,6 @@ TEST(arithmetic_expressions, invalid_self_defining_term) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes( a.diags(), { "S0002", "S0002", "CE012", "CE012", "CE007", "CE007", "CE007", "CE007", "CE007", "CE007" })); @@ -121,7 +117,6 @@ TEST(arithmetic_expressions, substitution_to_character_expression) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "5-10*10"); @@ -138,7 +133,6 @@ TEST(arithmetic_expressions, subscript_use) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0002", "E013" })); } @@ -154,7 +148,6 @@ TEST(arithmetic_expressions, unary_operators) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C"), -24); @@ -169,7 +162,6 @@ TEST(arithmetic_expressions, binary_space_separated_operator) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 2); @@ -191,7 +183,6 @@ TEST(arithmetic_expressions, limits) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)3); } #endif @@ -209,7 +200,6 @@ TEST(arithmetic_expressions, division) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B1"), 0); @@ -232,7 +222,6 @@ TEST(arithmetic_expressions, operator_priorities) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), -1); @@ -253,7 +242,6 @@ TEST(arithmetic_expressions, operator_priorities_invalid) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_NE(a.diags().size(), (size_t)0); } @@ -271,7 +259,6 @@ TEST(arithmetic_expressions, not_operator) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), -81); @@ -292,7 +279,6 @@ TEST(arithmetic_expressions, not_operator_precedence) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), -1); @@ -312,7 +298,6 @@ TEST(arithmetic_expressions, not_operator_continuation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -326,7 +311,6 @@ TEST(arithmetic_expressions, invalid_operator) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE002" })); } @@ -339,7 +323,6 @@ TEST(arithmetic_expressions, illegal_dupl_factor) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE005" })); } @@ -354,7 +337,6 @@ TEST(arithmetic_expressions, multiple_operand_with_spaces) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0002", "S0002", "S0002", "CE012", "CE012" })); } @@ -369,7 +351,6 @@ TEST(arithmetic_expressions, conversion_from_binary) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 1); @@ -389,7 +370,6 @@ TEST(arithmetic_expressions, dots) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().empty(), ok); } } @@ -404,7 +384,6 @@ TEST(arithmetic_expressions, limits) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), SET_t(2147483647)); @@ -421,7 +400,6 @@ TEST(arithmetic_expressions, bit_shift) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 10); @@ -441,7 +419,6 @@ TEST(arithmetic_expressions, subscript_evaluation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "X"), 1); @@ -459,7 +436,6 @@ TEST(arithmetic_expressions, subscripted_concat_evaluation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "X"), 61936); // C2A('10') = 61936 @@ -474,7 +450,6 @@ TEST(arithmetic_expressions, different_var_types) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004" })); } diff --git a/parser_library/test/expressions/ca_var_sym_test.cpp b/parser_library/test/expressions/ca_var_sym_test.cpp index bc23c4b9b..78f332e1a 100644 --- a/parser_library/test/expressions/ca_var_sym_test.cpp +++ b/parser_library/test/expressions/ca_var_sym_test.cpp @@ -78,7 +78,6 @@ TEST(ca_var_sym, invalid_definitions) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0002", "S0002" })); } diff --git a/parser_library/test/expressions/character_expression_test.cpp b/parser_library/test/expressions/character_expression_test.cpp index 2363cc518..80993c3fc 100644 --- a/parser_library/test/expressions/character_expression_test.cpp +++ b/parser_library/test/expressions/character_expression_test.cpp @@ -29,7 +29,6 @@ TEST(character_expression, operator_priority) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "ABCDEFDEFDEF"); @@ -50,7 +49,6 @@ TEST(character_expression, substring_notation) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "ABC"); @@ -72,7 +70,6 @@ TEST(character_expression, invalid_substring_notation) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)3); } @@ -86,7 +83,6 @@ TEST(character_expression, exceeds_warning) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(a.diags().front().severity, diagnostic_severity::warning); }*/ @@ -100,7 +96,6 @@ TEST(character_expression, invalid_string) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0008", "CE004", "CE011" })); // CE004 is artifact of S0008 } @@ -120,7 +115,6 @@ TEST(character_expression, escaping) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "L'SYMBOL"); @@ -144,7 +138,6 @@ TEST(character_expression, single_operand_with_spaces) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "A"); @@ -164,7 +157,6 @@ TEST(character_expression, single_operand_fail) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_FALSE(a.diags().empty()); } } @@ -181,7 +173,6 @@ TEST(character_expression, zero_length_substring) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -199,7 +190,6 @@ TEST(character_expression, dots) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().empty(), ok); } } @@ -214,7 +204,6 @@ TEST(character_expression, valid_subscript_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "X"), "XZ"); @@ -229,7 +218,6 @@ TEST(character_expression, invalid_subscript_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004" })); } @@ -247,7 +235,6 @@ TEST(character_expression, valid_dupl_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "ABC"); @@ -266,7 +253,6 @@ TEST(character_expression, invalid_dupl_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE005" })); } @@ -282,7 +268,6 @@ TEST(character_expression, subscripted_concat_evaluation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "X"), "10"); @@ -296,7 +281,6 @@ TEST(character_expression, invalid_expression) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004" })); } @@ -311,7 +295,6 @@ TEST(character_expression, invalid_expression) //)"; // analyzer a(input); // a.analyze(); -// a.collect_diags(); // // EXPECT_TRUE(a.diags().empty()); // EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C"), "VENFG"); @@ -326,7 +309,6 @@ TEST(character_expression, valid_function) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C"), "K"); @@ -341,7 +323,6 @@ TEST(character_expression, invalid_function) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE012" })); } @@ -352,7 +333,6 @@ TEST(character_expression, multi_byte_substr) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -378,7 +358,6 @@ TEST(character_expression, bounds) analyzer a(input); a.analyze(); - a.collect_diags(); if (err.empty()) EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/expressions/logical_expression_test.cpp b/parser_library/test/expressions/logical_expression_test.cpp index 72d4eb80b..f4c7042fc 100644 --- a/parser_library/test/expressions/logical_expression_test.cpp +++ b/parser_library/test/expressions/logical_expression_test.cpp @@ -33,7 +33,6 @@ TEST(logical_expressions, valid_assignment) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); @@ -52,7 +51,6 @@ TEST(logical_expressions, empty_string_conversion) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B1"), false); @@ -73,7 +71,6 @@ TEST(logical_expressions, invalid_assignment) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE016", "CE004", "CE004", "CE004", "CE004", "CE004", "CE004" })); } @@ -89,7 +86,6 @@ NOT EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE012", "CE003", "CE003" })); } TEST(logical_expressions, valid_expression) @@ -105,7 +101,6 @@ AND EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); @@ -129,7 +124,6 @@ TEST(logical_expressions, valid_relational_expression) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 0); @@ -155,7 +149,6 @@ TEST(logical_expressions, invalid_relational_expression) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004", "CE004", "CE004", "CE004", "CE004", "CE004", "CE002" })); } @@ -174,7 +167,6 @@ TEST(logical_expressions, priority) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); @@ -198,7 +190,6 @@ TEST(logical_expressions, arithmetic_logical_clash) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 0); @@ -219,7 +210,6 @@ TEST(logical_expressions, signs_in_arithmetic_expressions) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A2"), 1); @@ -240,7 +230,6 @@ TEST(logical_expressions, signs_in_logical_expressions) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004", "CE004", "CE004", "CE004" })); } @@ -254,7 +243,6 @@ TEST(logical_expressions, no_parenthesis) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE016", "CE016" })); } @@ -269,7 +257,6 @@ TEST(logical_expressions, no_spaces) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), 1); @@ -286,7 +273,6 @@ TEST(logical_expressions, bad_number_of_operands) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE006" })); } @@ -302,7 +288,6 @@ TEST(logical_expressions, is_functions) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 1); @@ -323,7 +308,6 @@ TEST(logical_expressions, parenthesis_around_expressions) analyzer a(input); a.analyze(); - a.collect_diags(); const auto& diags = a.diags(); EXPECT_EQ(diags.size(), (size_t)2); EXPECT_TRUE(std::all_of(diags.begin(), diags.end(), [](const auto& d) { return d.code == "CE016"; })); @@ -341,7 +325,6 @@ TEST(logical_expressions, not_operator_valid) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B1"), false); @@ -361,7 +344,6 @@ TEST(logical_expressions, not_operator_valid_logical_expr) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B1"), false); @@ -380,7 +362,6 @@ TEST(logical_expressions, not_operator_valid_relational_expr) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B1"), false); @@ -410,7 +391,6 @@ TEST(logical_expressions, operator_precedence) + args; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().empty(), expected) << args; } @@ -425,7 +405,6 @@ TEST(logical_expressions, operator_precedence_not) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B1"), false); @@ -455,7 +434,6 @@ TEST(logical_expressions, relational_operator_eq) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << input; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), res) << input; } @@ -485,7 +463,6 @@ TEST(logical_expressions, relational_operator_ne) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << input; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), res) << input; } @@ -515,7 +492,6 @@ TEST(logical_expressions, relational_operator_le) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << input; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), res) << input; } @@ -545,7 +521,6 @@ TEST(logical_expressions, relational_operator_lt) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << input; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), res) << input; } @@ -575,7 +550,6 @@ TEST(logical_expressions, relational_operator_ge) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << input; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), res) << input; } @@ -605,7 +579,6 @@ TEST(logical_expressions, relational_operator_gt) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << input; EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), res) << input; } @@ -621,7 +594,6 @@ AAA EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), true); @@ -637,7 +609,6 @@ AAA EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004" })); } @@ -652,7 +623,6 @@ AAA EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE017" })); } @@ -666,7 +636,6 @@ TEST(logical_expressions, simple_string_equality) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), true); @@ -681,7 +650,6 @@ TEST(logical_expressions, logical_expr_and_string_function) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A1"), true); @@ -701,7 +669,6 @@ TEST(logical_expressions, subscript_evaluation) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "X"), false); @@ -719,7 +686,6 @@ TEST(logical_expressions, evaluation_mix) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "RES1"), true); diff --git a/parser_library/test/lexing/lexer_test.cpp b/parser_library/test/lexing/lexer_test.cpp index a0a0e6360..d517b0506 100644 --- a/parser_library/test/lexing/lexer_test.cpp +++ b/parser_library/test/lexing/lexer_test.cpp @@ -182,8 +182,7 @@ TEST(lexer_test, bad_continuation) analyzer a(in); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), (size_t)1); EXPECT_EQ(diags[0].code, "E001"); diff --git a/parser_library/test/lsp/lsp_context_document_symbol_ord_test.cpp b/parser_library/test/lsp/lsp_context_document_symbol_ord_test.cpp index 267f44c48..165e9db2c 100644 --- a/parser_library/test/lsp/lsp_context_document_symbol_ord_test.cpp +++ b/parser_library/test/lsp/lsp_context_document_symbol_ord_test.cpp @@ -90,7 +90,6 @@ MACFLD1 DS F }); analyzer a(opencode, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/lsp/lsp_context_instr_test.cpp b/parser_library/test/lsp/lsp_context_instr_test.cpp index 660e92579..db1ed5d39 100644 --- a/parser_library/test/lsp/lsp_context_instr_test.cpp +++ b/parser_library/test/lsp/lsp_context_instr_test.cpp @@ -104,7 +104,6 @@ TEST(lsp_completion_instr, consistency) )"; analyzer a(input); a.analyze(); - a.collect_diags(); for (size_t l = 1; l <= 3; ++l) { diff --git a/parser_library/test/lsp/lsp_context_ord_sym_test.cpp b/parser_library/test/lsp/lsp_context_ord_sym_test.cpp index 71c97a7a2..5353814ae 100644 --- a/parser_library/test/lsp/lsp_context_ord_sym_test.cpp +++ b/parser_library/test/lsp/lsp_context_ord_sym_test.cpp @@ -74,7 +74,6 @@ R1 EQU 1 R1 comment X )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -106,7 +105,6 @@ R DS H comment )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -143,7 +141,6 @@ D EQU 0-C1-C1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -162,7 +159,6 @@ R1 EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -179,7 +175,6 @@ R1 EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_TRUE(a.context().lsp_ctx->hover(empty_loc, { 2, 70 }).starts_with("X'1'")); @@ -208,7 +203,6 @@ B DS F )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -235,7 +229,6 @@ TEST(hover, using) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/mock_parse_lib_provider.h b/parser_library/test/mock_parse_lib_provider.h index f5d883f6c..e8b709c7f 100644 --- a/parser_library/test/mock_parse_lib_provider.h +++ b/parser_library/test/mock_parse_lib_provider.h @@ -70,7 +70,7 @@ class mock_parse_lib_provider : public workspaces::parse_lib_provider auto a = std::make_unique(it->second.content, analyzer_options { hlasm_plugin::utils::resource::resource_location(library), this, std::move(ctx), data }); co_await a->co_analyze(); - a->collect_diags(); + analyzers.insert_or_assign(std::move(library), std::move(a)); co_return true; diff --git a/parser_library/test/parsing/deferred_statement_test.cpp b/parser_library/test/parsing/deferred_statement_test.cpp index 7ae149e92..895982f28 100644 --- a/parser_library/test/parsing/deferred_statement_test.cpp +++ b/parser_library/test/parsing/deferred_statement_test.cpp @@ -33,7 +33,6 @@ TEST(deferred_statement, split_var) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); auto aa1 = a.context().lsp_ctx->hover(resource_location(""), { 3, 71 }); @@ -64,7 +63,6 @@ TEST(deferred_statement, nested_macro_def_with_continuation) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -97,7 +95,6 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA DS H analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -115,7 +112,6 @@ TEST(deferred_statement, recognize_comment) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -136,7 +132,6 @@ TEST(deferred_statement, navigation_for_nonexecuted) analyzer a(input, analyzer_options(&libs, opencode)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(a.context().lsp_ctx->definition(opencode, position(4, 10)).get_uri(), "INNER"); @@ -163,7 +158,6 @@ TEST(deferred_statement, share_references_for_nonexecuted) analyzer a(input, analyzer_options(&libs, opencode)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); std::vector expected_positions { position(1, 1), position(4, 9), position(9, 9) }; diff --git a/parser_library/test/parsing/label_parsing_test.cpp b/parser_library/test/parsing/label_parsing_test.cpp index ab8a727cb..5d7c986b9 100644 --- a/parser_library/test/parsing/label_parsing_test.cpp +++ b/parser_library/test/parsing/label_parsing_test.cpp @@ -52,7 +52,6 @@ TEST(label_parsing, pass) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()) << p; } @@ -92,7 +91,6 @@ TEST(label_parsing, fail) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_FALSE(a.diags().empty()) << p; } diff --git a/parser_library/test/parsing/special_test.cpp b/parser_library/test/parsing/special_test.cpp index 5bfd62ab6..7a58ff83e 100644 --- a/parser_library/test/parsing/special_test.cpp +++ b/parser_library/test/parsing/special_test.cpp @@ -25,8 +25,7 @@ TEST(special_lines, process) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); EXPECT_TRUE(std::any_of(diags.begin(), diags.end(), [](const auto& msg) { return msg.code == "A010"; })); @@ -38,8 +37,7 @@ TEST(special_lines, process_in_macro) analyzer a(input, analyzer_options { file_is_opencode::no }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); } @@ -51,8 +49,7 @@ TEST(special_lines, process_after_code_encountered) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); } @@ -64,8 +61,7 @@ TEST(special_lines, process_multiple) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); EXPECT_TRUE(std::any_of(diags.begin(), diags.end(), [](const auto& msg) { return msg.code == "A010"; })); @@ -87,8 +83,7 @@ TEST(special_lines, process_after_limit) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); } @@ -109,8 +104,7 @@ TEST(special_lines, process_after_ictl) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); EXPECT_TRUE(std::any_of(diags.begin(), diags.end(), [](const auto& msg) { return msg.code == "A010"; })); @@ -133,8 +127,7 @@ TEST(special_lines, process_after_limit_and_ictl) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); } @@ -145,8 +138,7 @@ TEST(special_lines, single_op) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); EXPECT_TRUE(diags.empty()); } @@ -157,8 +149,7 @@ TEST(special_lines, mix_op_and_override) analyzer a(input, analyzer_options { file_is_opencode::yes }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); EXPECT_TRUE(diags.empty()); } diff --git a/parser_library/test/parsing/string_test.cpp b/parser_library/test/parsing/string_test.cpp index cf25d45e1..125942691 100644 --- a/parser_library/test/parsing/string_test.cpp +++ b/parser_library/test/parsing/string_test.cpp @@ -61,7 +61,6 @@ TEST(parser, preconstructed_string) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "NL"), "L'=C'STG'"); @@ -86,7 +85,6 @@ TEST(parser, preconstructed_string_2) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -118,7 +116,6 @@ TEST(parser, string_evaluation) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -173,7 +170,6 @@ TEST_P(parser_string_fixture, basic) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "PAR"), GetParam().expected); @@ -192,7 +188,6 @@ TEST(parser, incomplete_string) MAC 'A 93)"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0005" })); @@ -296,7 +291,6 @@ std::unique_ptr analyze(std::string s, std::string attr) auto a = std::make_unique(s, analyzer_options { &lib_provider }); a->analyze(); - a->collect_diags(); return a; } diff --git a/parser_library/test/processing/ainsert_test.cpp b/parser_library/test/processing/ainsert_test.cpp index bec435957..dfe9810ac 100644 --- a/parser_library/test/processing/ainsert_test.cpp +++ b/parser_library/test/processing/ainsert_test.cpp @@ -28,8 +28,7 @@ TEST(ainsert, ainsert_with_substitution) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -43,8 +42,7 @@ TEST(ainsert, empty_ainsert_record) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); EXPECT_EQ(diags.front().code, "A021"); } @@ -63,8 +61,7 @@ TEST(ainsert, lookahead_in_ainsert) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); EXPECT_TRUE(diags.empty()); } @@ -87,8 +84,7 @@ A DS C analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); EXPECT_TRUE(diags.empty()); } @@ -116,9 +112,8 @@ A DC C analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - const auto& diags = a.diags(); + const auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); @@ -144,7 +139,6 @@ TEST(ainsert, argument_limit) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_TRUE(a.diags().empty()); } @@ -163,7 +157,6 @@ TEST(ainsert, argument_limit_over) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_TRUE(matches_message_codes(a.diags(), { "A157" })); } @@ -193,7 +186,6 @@ TEST(ainsert, postponed_variable_evaluation) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 40); @@ -227,7 +219,6 @@ TEST(ainsert, immediate_variable_evaluation) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 22); @@ -258,7 +249,6 @@ TEST(ainsert, grammar_valid_01) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "STR12"), "00000032"); @@ -291,7 +281,6 @@ TEST(ainsert, grammar_valid_02) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "C1"), "9"); @@ -321,7 +310,6 @@ TEST(ainsert, grammar_unknown_label) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A011", @@ -357,7 +345,6 @@ TEST(ainsert, grammar_unknown_variable) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E010", @@ -388,7 +375,6 @@ TEST(ainsert, grammar_invalid_string) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0005", @@ -431,7 +417,6 @@ TEST(ainsert, grammar_non_matching_apostrophes_by_two_01) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0002" })); } @@ -456,7 +441,6 @@ TEST(ainsert, grammar_non_matching_apostrophes_by_two_02) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0005" })); } @@ -485,7 +469,6 @@ TEST(ainsert, grammar_non_matching_apostrophes_by_one_01) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A011", "S0005", "S0005" })); } @@ -511,7 +494,6 @@ TEST(ainsert, grammar_non_matching_apostrophes_by_one_02) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0002", "S0005", "S0005", "A011" })); } diff --git a/parser_library/test/processing/aread_test.cpp b/parser_library/test/processing/aread_test.cpp index c6b3f2e30..0df890400 100644 --- a/parser_library/test/processing/aread_test.cpp +++ b/parser_library/test/processing/aread_test.cpp @@ -34,8 +34,7 @@ TEST(aread, only_from_macro) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); EXPECT_TRUE(std::any_of(diags.begin(), diags.end(), [](const auto& msg) { return msg.code == "E069"; })); @@ -57,8 +56,7 @@ This is a raw text analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -85,8 +83,7 @@ This is a raw text 2 analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -120,8 +117,7 @@ This is a raw text 2 analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -150,8 +146,7 @@ TEST(aread, empty_input) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -180,8 +175,7 @@ TEST(aread, invalid_operands) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 4); EXPECT_TRUE(std::all_of(diags.begin(), diags.end(), [](const auto& d) { return d.code == "E070"; })); @@ -214,8 +208,7 @@ TEST(aread, from_ainsert_buffer) analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -247,8 +240,7 @@ Line5 analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); } @@ -274,8 +266,7 @@ Line5 analyzer a(input); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 1); EXPECT_EQ(diags[0].diag_range.start.line, 15); } @@ -298,8 +289,7 @@ TEST(aread, macro_called_in_copybook) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -332,8 +322,7 @@ TEST(aread, aread_from_source_stack) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -365,8 +354,7 @@ TEST(aread, aread_from_opencode) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -407,8 +395,7 @@ removed by aread analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -449,8 +436,7 @@ removed by aread analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -483,8 +469,7 @@ TEST(aread, last_statements_in_copy) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -520,8 +505,7 @@ removed on first call X analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -554,8 +538,7 @@ TEST(aread, copy_in_macro) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -587,8 +570,7 @@ TEST(aread, normal_processing_recovery) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); @@ -621,8 +603,7 @@ TEST(aread, normal_processing_recovery_line_skipped) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); - auto& diags = a.diags(); + auto diags = a.diags(); ASSERT_EQ(diags.size(), 0); auto& ctx = a.hlasm_ctx(); diff --git a/parser_library/test/processing/asm_instr_test.cpp b/parser_library/test/processing/asm_instr_test.cpp index 5d1a74857..ef3beb293 100644 --- a/parser_library/test/processing/asm_instr_test.cpp +++ b/parser_library/test/processing/asm_instr_test.cpp @@ -32,7 +32,6 @@ ADDR DS CL4 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); auto& ctx = *a.context().hlasm_ctx; @@ -53,7 +52,6 @@ SYM DS CL249 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M122" })); } @@ -69,7 +67,6 @@ A LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); auto& ctx = *a.context().hlasm_ctx; @@ -97,7 +94,6 @@ A LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); auto& ctx = *a.context().hlasm_ctx; @@ -121,7 +117,6 @@ CNOPSYM CNOP ADDR,16 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -145,7 +140,6 @@ TEST(asm_instr_processing, ALIAS_mandatory_label) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A163", "A163" })); } @@ -159,7 +153,6 @@ A ALIAS C'SOMESTRING' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "????" })); */ @@ -194,7 +187,6 @@ J ALIAS C'STRING' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -209,7 +201,6 @@ L X C'SOMESTRING' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -229,7 +220,6 @@ L EQU *-C analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E066", "E066" })); // S, I attributes @@ -258,7 +248,6 @@ C CXD analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E066", "E066" })); // S, I attributes @@ -277,7 +266,6 @@ TEST(asm_instr_processing, TITLE_text_label) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -293,7 +281,6 @@ TEST(asm_instr_processing, TITLE_multiple_labels) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W016" })); @@ -309,7 +296,6 @@ TEST(asm_instr_processing, TITLE_sequence_does_not_count) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/processing/ca_instr_test.cpp b/parser_library/test/processing/ca_instr_test.cpp index 62fda63de..a4f835719 100644 --- a/parser_library/test/processing/ca_instr_test.cpp +++ b/parser_library/test/processing/ca_instr_test.cpp @@ -138,7 +138,6 @@ TEST(var_subs, instruction_substitution_space_at_end) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -151,7 +150,6 @@ TEST(var_subs, instruction_substitution_space_in_middle) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E075" })); } @@ -237,7 +235,6 @@ TEST(AGO, bad_arguments_1) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E022" })); } @@ -249,7 +246,6 @@ TEST(AGO, bad_arguments_2) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E015" })); } @@ -261,7 +257,6 @@ TEST(AGO, bad_arguments_3) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E015" })); } @@ -273,7 +268,6 @@ TEST(AGO, bad_arguments_4) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E015" })); } @@ -285,7 +279,6 @@ TEST(AIF, bad_arguments_1) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E022" })); } @@ -297,7 +290,6 @@ TEST(AIF, bad_arguments_2) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E015" })); } @@ -309,7 +301,6 @@ TEST(AIF, bad_arguments_3) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E015" })); } @@ -341,7 +332,6 @@ TEST(AIF, missing_comma) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0002" })); } @@ -374,7 +364,6 @@ TEST(ACTR, exceeded) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E056" })); } @@ -389,7 +378,6 @@ TEST(ACTR, infinite_ACTR) )"); analyzer a(input, analyzer_options(asm_option { .statement_count_limit = 10000 })); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W063", "E077" })); } @@ -405,7 +393,6 @@ TEST(ACTR, negative) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E056" })); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), std::nullopt); @@ -418,7 +405,6 @@ TEST(ACTR, bad_arguments_1) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E020" })); } @@ -430,7 +416,6 @@ TEST(ACTR, bad_arguments_2) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E020" })); } @@ -455,7 +440,6 @@ TEST(MHELP, SYSNDX_limit) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E072" })); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "LASTNDX"), "0256"); @@ -473,7 +457,6 @@ ABC EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E021", "E020", "E020", "CE012", "CE004", "CE012" })); } @@ -494,7 +477,6 @@ ABC EQU 1 )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -514,7 +496,6 @@ TEST(SET, conversions_valid) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -534,7 +515,6 @@ TEST(SET, conversions_invalid) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE004", "CE004", "CE017", "CE017" })); } @@ -553,7 +533,6 @@ B EQU 1 )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE012", "CE012", "CE012" })); } @@ -563,7 +542,6 @@ TEST(var_subs, defined_by_self_ref) std::string input("&VAR(N'&VAR+1) SETA N'&VAR+1"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -585,7 +563,6 @@ TEST(SET, empty_args_in_arrays) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -607,7 +584,6 @@ TEST(SET, single_comma) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -629,7 +605,6 @@ TEST(SET, empty_args_in_arrays_no_overwrite) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -645,7 +620,6 @@ TEST(var_subs, expr_list_as_index) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -658,7 +632,6 @@ TEST(SET, missing_var_name) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "S0008", "E010" })); } diff --git a/parser_library/test/processing/cics_preprocessor_test.cpp b/parser_library/test/processing/cics_preprocessor_test.cpp index 5f2701cf0..647749215 100644 --- a/parser_library/test/processing/cics_preprocessor_test.cpp +++ b/parser_library/test/processing/cics_preprocessor_test.cpp @@ -476,7 +476,6 @@ AAAAAA SAM31 analyzer a(input, analyzer_options(cics_preprocessor_options(false, false, false))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CIC001" })); } @@ -496,7 +495,6 @@ NOSPACE EXEC CICS)"; analyzer a(input, analyzer_options(cics_preprocessor_options(false, false, false))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CIC003", "CIC003" })); } @@ -515,7 +513,6 @@ TEST(cics_preprocessor, check_null_argument_message) analyzer a(input, analyzer_options(cics_preprocessor_options(false, false, false))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(contains_message_codes(a.diags(), { "CIC002", "CIC002" })); } @@ -529,7 +526,6 @@ TEST(cics_preprocessor, dfhresp_substitution) analyzer a(input, analyzer_options(cics_preprocessor_options(false, false, false))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -543,7 +539,6 @@ TEST(cics_preprocessor, dfhvalue_substitution) analyzer a(input, analyzer_options(cics_preprocessor_options(false, false, false))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -562,7 +557,6 @@ TEST(cics_preprocessor, substitution_in_macros) analyzer a(input, analyzer_options(cics_preprocessor_options(false, false, false))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } diff --git a/parser_library/test/processing/copy_test.cpp b/parser_library/test/processing/copy_test.cpp index 7f1f2f42b..ff41234b4 100644 --- a/parser_library/test/processing/copy_test.cpp +++ b/parser_library/test/processing/copy_test.cpp @@ -207,7 +207,6 @@ TEST(copy, copy_enter_fail) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)0); EXPECT_EQ(a.hlasm_ctx().whole_copy_stack().size(), (size_t)0); @@ -224,7 +223,6 @@ TEST(copy, copy_enter_success) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -244,7 +242,6 @@ TEST(copy, copy_enter_diag_test) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -269,7 +266,6 @@ TEST(copy, copy_jump) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)2); @@ -289,7 +285,6 @@ TEST(copy, copy_unbalanced_macro) analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -309,7 +304,6 @@ TEST(copy, copy_twice) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -327,7 +321,6 @@ TEST(copy, macro_call_from_copy_enter) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -352,7 +345,6 @@ TEST(copy, copy_enter_from_macro_call) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -388,7 +380,6 @@ TEST(copy, copy_enter_from_lookahead) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -407,7 +398,6 @@ TEST(copy, nested_macro_copy_call) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)2); ASSERT_EQ(a.hlasm_ctx().macros().size(), (size_t)1); @@ -433,7 +423,6 @@ TEST(copy, macro_from_copy_call) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); ASSERT_EQ(a.hlasm_ctx().macros().size(), (size_t)1); @@ -457,7 +446,6 @@ TEST(copy, inner_copy_jump) auto a = get_analyzer(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -474,7 +462,6 @@ TEST(copy, jump_from_copy_fail) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -504,7 +491,6 @@ TEST(copy, jump_in_macro_from_copy_fail) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -532,7 +518,6 @@ TEST(copy, macro_nested_diagnostics) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)2); @@ -557,7 +542,6 @@ TEST(copy, copy_call_with_jump_before_comment) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)1); @@ -582,7 +566,6 @@ TEST(copy, copy_empty_file) auto a = get_analyzer(input, "start"); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.hlasm_ctx().copy_members().size(), (size_t)2); @@ -620,7 +603,6 @@ aaaaaaaaa analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -637,7 +619,6 @@ TEST(copy, invalid_quotes_on_operandless) analyzer a(input, analyzer_options(&libs)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } diff --git a/parser_library/test/processing/db2_preprocessor_test.cpp b/parser_library/test/processing/db2_preprocessor_test.cpp index ed04cec32..003dee366 100644 --- a/parser_library/test/processing/db2_preprocessor_test.cpp +++ b/parser_library/test/processing/db2_preprocessor_test.cpp @@ -13,6 +13,7 @@ */ #include +#include #include #include #include @@ -253,7 +254,6 @@ TEST(db2_preprocessor, sqlsect_available) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -267,7 +267,6 @@ TEST(db2_preprocessor, instruction_not_recognized) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E049" })); } @@ -288,7 +287,6 @@ TEST(db2_preprocessor, aread_from_preprocessor) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "RES"), std::string("***$$$").append(74, ' ')); @@ -316,7 +314,6 @@ TEST(db2_preprocessor, aread_from_two_preprocessor_outputs) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); std::array expected { std::string { "***$$$" }, @@ -354,7 +351,6 @@ TEST(db2_preprocessor, ignore_comments) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -376,7 +372,6 @@ TEST(db2_preprocessor, continuation_in_buffer) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -409,7 +404,6 @@ TEST(db2_preprocessor, include_valid) { analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -437,7 +431,6 @@ TEST(db2_preprocessor, include_double) { analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "DB002" })); EXPECT_EQ(libs.get_stats("MEMBER").value_or(invalid_stats).content_requests, 0); @@ -457,7 +450,6 @@ TEST(db2_preprocessor, include_member_not_present) { analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "DB007" })); EXPECT_EQ(libs.get_stats("MEMBER").value_or(invalid_stats).content_requests, 0); @@ -473,7 +465,6 @@ TEST(db2_preprocessor, include_insensitive) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_NE(libs.get_stats("MEMBER").value_or(invalid_stats).content_requests, -1); @@ -485,7 +476,6 @@ TEST(db2_preprocessor, include_nonexistent) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "DB002" })); } @@ -499,7 +489,6 @@ TEST(db2_preprocessor, include_invalid) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(libs.get_stats("MEMBER").value_or(invalid_stats).content_requests, 0); } @@ -517,7 +506,6 @@ TEST(db2_preprocessor, ago_in_include) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -541,7 +529,6 @@ TEST(db2_preprocessor, ago_into_include) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -566,7 +553,6 @@ TEST(db2_preprocessor, ago_from_include) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -595,7 +581,6 @@ TEST(db2_preprocessor, ago_around_include) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -622,7 +607,6 @@ TEST(db2_preprocessor, copy_in_include) analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); @@ -740,7 +724,6 @@ A mock_parse_lib_provider libs(t.deps); analyzer a(t.opencode, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(a.diags()[0].diag_range.start.line, t.lineno); @@ -756,7 +739,6 @@ TEST(db2_preprocessor, multiline_exec_sql) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -767,7 +749,6 @@ TEST(db2_preprocessor, end_sqldsect_injection) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -921,7 +902,6 @@ DFILE SQL TYPE IS DBCLOB_FILE analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -949,7 +929,6 @@ DFILE SQL TYPE IS DBCLOB_FILE comment analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1065,7 +1044,6 @@ TEST(db2_preprocessor, no_codegen_for_unacceptable_sql_statement) analyzer a(input, analyzer_options(db2_preprocessor_options())); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); // TODO(optional): original warns } @@ -1079,7 +1057,6 @@ TEST(db2_preprocessor, package_info_missing) analyzer a(input, analyzer_options(db2_preprocessor_options())); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E010" })); } @@ -1094,7 +1071,6 @@ TEST(db2_preprocessor, package_info_short) analyzer a(input, analyzer_options(db2_preprocessor_options("AAA"))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1111,7 +1087,6 @@ TEST(db2_preprocessor, package_info_long) analyzer a(input, analyzer_options(db2_preprocessor_options(std::string(48, 'A')))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1131,7 +1106,6 @@ RO_LEN EQU *-RO analyzer a(input, analyzer_options { &libs, db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1158,7 +1132,6 @@ TEST(db2_preprocessor, preprocessor_continuation_overflow) analyzer a(input, analyzer_options { db2_preprocessor_options {} }); EXPECT_NO_FATAL_FAILURE(a.analyze()); - a.collect_diags(); EXPECT_FALSE(a.diags().empty()); } @@ -1178,7 +1151,6 @@ LEN EQU E-B analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "LEN"), 0); @@ -1203,7 +1175,6 @@ A DS F analyzer a(input, analyzer_options { db2_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); auto l1 = get_symbol_abs(a.hlasm_ctx(), "L1"); diff --git a/parser_library/test/processing/dc_test.cpp b/parser_library/test/processing/dc_test.cpp index 39e7e2f35..0775685f5 100644 --- a/parser_library/test/processing/dc_test.cpp +++ b/parser_library/test/processing/dc_test.cpp @@ -32,7 +32,6 @@ R EQU B-A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -48,7 +47,6 @@ R EQU B-A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "R"), 2); @@ -67,7 +65,6 @@ R EQU C-B analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "R"), 4); @@ -85,7 +82,6 @@ R EQU C-B analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "R"), 4); @@ -103,7 +99,6 @@ R EQU C-B analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D022" })); } @@ -118,7 +113,6 @@ B LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -133,7 +127,6 @@ D LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -146,7 +139,6 @@ A DC CL(X+14)'A' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "a")->attributes().length(), (symbol_attributes::len_attr)2); @@ -162,7 +154,6 @@ A DC FS(X+14)'1' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "a")->attributes().scale(), (symbol_attributes::scale_attr)36); @@ -178,7 +169,6 @@ M DC FS-12'1' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "P")->attributes().scale(), (symbol_attributes::scale_attr)12); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "M")->attributes().scale(), (symbol_attributes::scale_attr)-12); @@ -195,7 +185,6 @@ A EQU L'X analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 0); @@ -211,7 +200,6 @@ X DC CL(A+1)'X' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); @@ -228,7 +216,6 @@ Y EQU L'A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "X")->attributes().length(), (symbol_attributes::len_attr)1); @@ -247,7 +234,6 @@ Y EQU A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "X")->attributes().length(), (symbol_attributes::len_attr)1); @@ -264,7 +250,6 @@ X DC CL(L'X)'X' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -280,7 +265,6 @@ T EQU * analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -300,7 +284,6 @@ TEST(DC, tolerate_incorrect_nominal_value) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D018", "D017" })); } @@ -317,7 +300,6 @@ TEST CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D034", "D034", "D034", "D034" })); } @@ -335,7 +317,6 @@ TEST(DC, correctly_count_long_utf8_chars) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -353,7 +334,6 @@ TEST(DC, validate_attribute_in_nominal) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E010" })); } @@ -369,7 +349,6 @@ H DS CL(H-C) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -382,7 +361,6 @@ H DS CL(L'H) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E033" })); } diff --git a/parser_library/test/processing/end_instr_test.cpp b/parser_library/test/processing/end_instr_test.cpp index ce6cdb295..09cf8fadc 100644 --- a/parser_library/test/processing/end_instr_test.cpp +++ b/parser_library/test/processing/end_instr_test.cpp @@ -25,7 +25,6 @@ TEST CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } TEST(END, relocatable_expression) @@ -37,7 +36,6 @@ TEST CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } TEST(END, external_symbol) @@ -50,7 +48,6 @@ TEST(END, external_symbol) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } TEST(END, multiple_ends) @@ -61,7 +58,7 @@ TEST(END, multiple_ends) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } TEST(END, no_operands) @@ -71,7 +68,7 @@ TEST(END, no_operands) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, undefined_symbol) @@ -81,7 +78,7 @@ TEST(END, undefined_symbol) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + ASSERT_TRUE(matches_message_codes(a.diags(), { "E010" })); EXPECT_TRUE(a.diags()[0].message.ends_with(": UNDEF")); } @@ -93,7 +90,7 @@ UNDEF EQU 12 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "E032" })); } TEST(END, no_operand) @@ -103,7 +100,7 @@ TEST(END, no_operand) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, two_operands_true) @@ -116,7 +113,7 @@ ENTRYPT BALR 2,0 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, two_operands_with_operand_identifier_false) @@ -129,7 +126,7 @@ ENTRYPT BALR 2,0 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "A137" })); } TEST(END, three_operands_empty_false) @@ -142,7 +139,7 @@ ENTRYPT BALR 2,0 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "A012" })); } @@ -153,7 +150,7 @@ TEST(END, strange_operands) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, label_sequenceSymbol_true) @@ -163,7 +160,6 @@ TEST(END, label_sequenceSymbol_true) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } TEST(END, label_sequenceSymbol_false) @@ -173,7 +169,7 @@ NAME END )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "A249" })); } TEST(END, three_operands_false) @@ -186,7 +182,7 @@ ENTRYPT BALR 2,0 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "E010" })); } @@ -202,7 +198,7 @@ TEST CSECT )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -219,7 +215,7 @@ TEST CSECT )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } @@ -241,7 +237,7 @@ X DS C )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } @@ -261,9 +257,8 @@ TEST(END, end_called_from_macro_inside_copy_book_one_with_warning_after_end) )"; mock_parse_lib_provider lib_provider { { "COPYBOOK_TWO", copybook_content } }; analyzer a(input, analyzer_options { &lib_provider }); - a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } TEST(END, end_called_from_copybook) @@ -279,9 +274,8 @@ TEST(END, end_called_from_copybook) )"; mock_parse_lib_provider lib_provider { { "COPYBOOK_TWO", copybook_content } }; analyzer a(input, analyzer_options { &lib_provider }); - a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, end_called_from_copybook_with_warning_after_EndStatement) @@ -298,9 +292,8 @@ TEST(END, end_called_from_copybook_with_warning_after_EndStatement) )"; mock_parse_lib_provider lib_provider { { "COPYBOOK_TWO", copybook_content } }; analyzer a(input, analyzer_options { &lib_provider }); - a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } @@ -321,9 +314,8 @@ TEST(END, end_called_from_macro_inside_copybook_two) )"; mock_parse_lib_provider lib_provider { { "COPYBOOK", copybook_content } }; analyzer a(input, analyzer_options { &lib_provider }); - a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, end_called_from_nested_macro) @@ -341,9 +333,8 @@ TEST(END, end_called_from_nested_macro) OUTER_MACRO )"; analyzer a(input); - a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, end_called_from_nested_macro_with_warning_issued) @@ -362,9 +353,8 @@ TEST(END, end_called_from_nested_macro_with_warning_issued) UNDEF )"; analyzer a(input); - a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } TEST(END, end_called_from_copy_book_inside_macro_with_warning) @@ -384,7 +374,7 @@ TEST(END, end_called_from_copy_book_inside_macro_with_warning) mock_parse_lib_provider lib_provider { { "COPYBOOK", copybook_content } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(matches_message_codes(a.diags(), { "W015" })); } TEST(END, end_called_from_copy_book_inside_macro) @@ -404,7 +394,7 @@ TEST(END, end_called_from_copy_book_inside_macro) mock_parse_lib_provider lib_provider { { "COPYBOOK", copybook_content } }; analyzer a(input, analyzer_options { &lib_provider }); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } TEST(END, stops_lookahead) @@ -417,7 +407,6 @@ TEST(END, stops_lookahead) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(0, std::count_if(a.diags().begin(), a.diags().end(), [](const auto& d) { return d.code == "E045"; })); } diff --git a/parser_library/test/processing/endevor_preprocessor_test.cpp b/parser_library/test/processing/endevor_preprocessor_test.cpp index 96c7d765f..a84baf770 100644 --- a/parser_library/test/processing/endevor_preprocessor_test.cpp +++ b/parser_library/test/processing/endevor_preprocessor_test.cpp @@ -158,7 +158,6 @@ TESTVAL EQU 42 analyzer a(input, analyzer_options { &libs, endevor_preprocessor_options {} }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/processing/equ_test.cpp b/parser_library/test/processing/equ_test.cpp index 890fe84f3..7012ea63e 100644 --- a/parser_library/test/processing/equ_test.cpp +++ b/parser_library/test/processing/equ_test.cpp @@ -31,7 +31,6 @@ A EQU 1 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "A"), 1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -49,7 +48,6 @@ B EQU A+A-10 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), -8); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -69,7 +67,6 @@ X EQU 5,2 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 5); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "Y")->attributes().length(), (symbol_attributes::len_attr)12); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -89,7 +86,6 @@ ZZ EQU *+X EXPECT_EQ(get_symbol(a.hlasm_ctx(), "Z")->attributes().length(), (symbol_attributes::len_attr)1); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "ZZ")->attributes().length(), (symbol_attributes::len_attr)1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -106,7 +102,6 @@ UNKNOWN EQU L'X EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 11); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -124,7 +119,6 @@ LEM EQU A+1,100000 EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LEN")->attributes().length(), (symbol_attributes::len_attr)1); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LEM")->attributes().length(), (symbol_attributes::len_attr)12); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)2); } @@ -139,7 +133,6 @@ LEN EQU 11,3,4 EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LEN")->attributes().type(), 4); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -154,7 +147,6 @@ LEN EQU 11,3 EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LEN")->attributes().type(), symbol_attributes::undef_type); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -171,7 +163,6 @@ LEM EQU 11,1,300 EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LEN")->attributes().type(), symbol_attributes::undef_type); EXPECT_EQ(get_symbol(a.hlasm_ctx(), "LEM")->attributes().type(), symbol_attributes::undef_type); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)2); } @@ -186,7 +177,6 @@ C EQU B-*+A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -204,7 +194,6 @@ RES EQU *-TEST analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "RES"), 24); @@ -224,7 +213,6 @@ RES EQU *-TEST analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "RES"), 24); @@ -239,7 +227,6 @@ B EQU 0,0,C'X',0,GR,0 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A012", "A012" })); } @@ -252,7 +239,6 @@ A EQU ,0 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A132" })); } @@ -266,7 +252,6 @@ B EQU A,*-A,T'TYPO analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); auto b = get_symbol(a.hlasm_ctx(), "B"); diff --git a/parser_library/test/processing/label_test.cpp b/parser_library/test/processing/label_test.cpp index eed54cc69..827476fcf 100644 --- a/parser_library/test/processing/label_test.cpp +++ b/parser_library/test/processing/label_test.cpp @@ -30,7 +30,6 @@ TEST(instruction_label, empty_concatenation) analyzer a(input); a.analyze(); - a.collect_diags(); const auto& diags = a.diags(); EXPECT_EQ(diags.size(), 0); @@ -47,7 +46,6 @@ TEST(instruction_label, invalid_concatenation) analyzer a(input); a.analyze(); - a.collect_diags(); const auto& diags = a.diags(); EXPECT_EQ(diags.size(), 2); @@ -69,7 +67,6 @@ MixedCase TEST analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } diff --git a/parser_library/test/processing/loctr_test.cpp b/parser_library/test/processing/loctr_test.cpp index 022fee8c3..ef285f9ae 100644 --- a/parser_library/test/processing/loctr_test.cpp +++ b/parser_library/test/processing/loctr_test.cpp @@ -46,7 +46,6 @@ Z EQU Y-X ASSERT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 16); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)2); } @@ -73,7 +72,6 @@ Z EQU Y-X ASSERT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -88,7 +86,6 @@ X2 DS 0H analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } diff --git a/parser_library/test/processing/lookahead_test.cpp b/parser_library/test/processing/lookahead_test.cpp index e2bbe2bd8..c9fc5bd65 100644 --- a/parser_library/test/processing/lookahead_test.cpp +++ b/parser_library/test/processing/lookahead_test.cpp @@ -58,7 +58,6 @@ TEST(lookahead, forward_jump_to_continued) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -81,7 +80,6 @@ TEST(lookahead, forward_jump_from_continued) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); EXPECT_EQ(get_syntax_errors(a), (size_t)0); @@ -136,7 +134,6 @@ TEST(lookahead, rewinding_from_last_line) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -152,7 +149,6 @@ TEST(lookahead, rewinding_from_one_from_last_line) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -169,7 +165,6 @@ TEST(lookahead, forward_jump_before_comment) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -187,7 +182,6 @@ TEST(lookahead, forward_jump_before_continued_comment) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -206,7 +200,6 @@ TEST(lookahead, jump_to_incomplete_instruction) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -332,7 +325,6 @@ Y EQU X+1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), "T"); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), 10); @@ -351,7 +343,6 @@ X EQU 1,10,C'T' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 0); @@ -368,7 +359,6 @@ X EQU 1,Y+11,C'T' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 1); @@ -388,7 +378,6 @@ X EQU 1,2,**& analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 2); @@ -407,7 +396,6 @@ X EQU 1,2,&a analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 2); @@ -426,7 +414,6 @@ X EQU &a,2 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 1); @@ -445,7 +432,6 @@ X EQU =**)-,2 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 1); @@ -470,7 +456,6 @@ X EQU 1,2,C'X' mock_parse_lib_provider mock { { "LIB", LIB } }; analyzer a(input, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 2); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "WAS_BEFORE"), true); @@ -499,7 +484,6 @@ X EQU 1,2 mock_parse_lib_provider mock { { "LIB2", LIB2 } }; analyzer a(input, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 2); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "WAS_BEFORE"), true); @@ -532,7 +516,6 @@ X EQU 1,2 mock_parse_lib_provider mock { { "LIB3", LIB3 } }; analyzer a(input, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_global_var_value(a.hlasm_ctx(), "A"), 2); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "AFTER_MAC"), true); @@ -551,7 +534,6 @@ TEST(attribute_lookahead, lookup_from_macro_last_line) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -568,7 +550,6 @@ TEST(attribute_lookahead, lookup_from_macro_one_to_last_line) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -584,7 +565,6 @@ Y EQU 2,11 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 21); @@ -602,7 +582,6 @@ X LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 2); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), "I"); @@ -621,7 +600,6 @@ X CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 1); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), "J"); @@ -640,7 +618,6 @@ X DS F analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "D"), "D"); @@ -658,7 +635,6 @@ X DC FS24'6' remark analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 4); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), "F"); @@ -677,7 +653,6 @@ X DC C'A' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 0); @@ -695,7 +670,6 @@ Y EQU 2,11 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 21); @@ -712,7 +686,6 @@ X EQU 1,10 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 11); @@ -731,7 +704,6 @@ B EQU 2,22 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), 22); @@ -756,7 +728,6 @@ A EQU 1,1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -772,7 +743,6 @@ A EQU 1,2,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -792,7 +762,6 @@ A EQU 1,2,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -807,7 +776,6 @@ C DC C'STH' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); auto var = a.context().hlasm_ctx->get_var_sym(id_index("VAR")); @@ -833,7 +801,6 @@ A DC AL(*-B+2)(*) analyzer a(input); a.analyze(); - a.collect_diags(); ASSERT_EQ(a.diags().size(), (size_t)1); EXPECT_EQ(a.diags().front().severity, diagnostic_severity::warning); @@ -851,7 +818,6 @@ C DC C'STH' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)0); } @@ -888,7 +854,6 @@ LABEL DC C'&S' mock_parse_lib_provider mock { { "LIB", LIB }, { "MAC", MAC } }; analyzer a(input, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W013" })); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "RESULT"), "1 U"); @@ -923,7 +888,6 @@ LABEL LLILF 0,C'&S' mock_parse_lib_provider mock { { "LIB", LIB }, { "MAC", MAC } }; analyzer a(input, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "RESULT"), "6 I"); @@ -939,7 +903,6 @@ A DS C analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -958,7 +921,6 @@ TEST(lookahead, unused_duplicate_seq) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -981,7 +943,6 @@ TEST(lookahead, hidden_duplicate_seq) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1006,7 +967,6 @@ TEST(lookahead, used_duplicate_seq) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E045", "E045" })); } @@ -1029,7 +989,6 @@ TEST(lookahead, unconditional_redefinition) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E045" })); } @@ -1053,7 +1012,6 @@ TEST(lookahead, unconditional_redefinition_2) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E045" })); } @@ -1079,7 +1037,6 @@ TEST(lookahead, combined_redefinition) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E045", "E045", "E045" })); } @@ -1105,7 +1062,6 @@ X DS C analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "MNOTE" })); } @@ -1133,7 +1089,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1161,7 +1116,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1190,7 +1144,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1218,7 +1171,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W013" })); } @@ -1247,7 +1199,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W013" })); } @@ -1276,7 +1227,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W013", "W013" })); } @@ -1305,7 +1255,6 @@ TEST DS CL(X) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W013", "W013" })); } @@ -1348,7 +1297,6 @@ Y DS C analyzer a(input, analyzer_options(opencode, &libs)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/processing/mach_instr_test.cpp b/parser_library/test/processing/mach_instr_test.cpp index 9c744f9bd..b783e7007 100644 --- a/parser_library/test/processing/mach_instr_test.cpp +++ b/parser_library/test/processing/mach_instr_test.cpp @@ -26,7 +26,7 @@ TEST(mach_instr_processing, reloc_imm_expected) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M113" })); } @@ -42,7 +42,6 @@ LENGTH DS CL(SIZE) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M113" })); } @@ -58,7 +57,6 @@ LENGTH DS CL(SIZE) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -74,7 +72,6 @@ LEN120 DS CL1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME003" })); } @@ -86,7 +83,6 @@ TEST(mach_instr_processing, vec_reg_expected) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(matches_message_codes(a.diags(), { "M114" })); } @@ -98,7 +94,6 @@ TEST(mach_instr_processing, reloc_symbol_expected) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D032" })); } TEST(mach_instr_processing, setc_variable_mnemonic_reloc_operand) @@ -112,7 +107,6 @@ TEST(mach_instr_processing, setc_variable_mnemonic_reloc_operand) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -128,7 +122,6 @@ TEST CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -144,7 +137,6 @@ TEST CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D032" })); } TEST(mach_instr_processing, reloc_parsed_in_macro_valid) @@ -160,7 +152,6 @@ LABEL BRAS 0,*+12 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(get_syntax_errors(a), (size_t)0); EXPECT_TRUE(a.diags().empty()); } @@ -177,7 +168,6 @@ LABEL BRAS 0,12 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "D032" })); } TEST(mach_instr_processing, reloc_parsed_in_macro_alignment_error) @@ -195,7 +185,6 @@ LEN120 DS CL1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME003" })); } @@ -209,7 +198,6 @@ SYM DS CL15 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "M120" })); } @@ -223,7 +211,6 @@ SYM DS CL1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -271,7 +258,6 @@ A DS 0H )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -286,7 +272,6 @@ LABEL DS 0H analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -300,7 +285,6 @@ LABEL DS 0H analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME005" })); } @@ -314,7 +298,6 @@ TEST(mach_instr_processing, literals_with_index_register) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -331,7 +314,6 @@ TEST(mach_instr_processing, mach_expr_limits) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -344,7 +326,6 @@ TEST(mach_instr_processing, mach_expr_out_of_bounds) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE007" })); } @@ -363,7 +344,6 @@ A MVI 0,X'0000000000' analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -377,7 +357,6 @@ A LARL 0,A+-00000000000 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "CE007" })); } diff --git a/parser_library/test/processing/multiple_preprocessors_test.cpp b/parser_library/test/processing/multiple_preprocessors_test.cpp index ed54c4b29..58fe64f8c 100644 --- a/parser_library/test/processing/multiple_preprocessors_test.cpp +++ b/parser_library/test/processing/multiple_preprocessors_test.cpp @@ -31,7 +31,6 @@ RO SQL TYPE IS ROWID })); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -58,7 +57,6 @@ TESTLEN EQU *-TEST preprocessor_options(cics_preprocessor_options(false, false, false)), } }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/processing/opsyn_test.cpp b/parser_library/test/processing/opsyn_test.cpp index 9685b53f4..cd6071685 100644 --- a/parser_library/test/processing/opsyn_test.cpp +++ b/parser_library/test/processing/opsyn_test.cpp @@ -29,7 +29,7 @@ OP2 OPSYN OP1 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -40,7 +40,7 @@ OP2 OPSYN OP1 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -51,7 +51,7 @@ OP2 OPSYN )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -63,7 +63,7 @@ TEST(OPSYN, missing_name) )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -74,7 +74,7 @@ LR OPSYN A,B )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -86,7 +86,7 @@ LR OPSYN )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -99,7 +99,7 @@ LR OPSYN )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -115,7 +115,7 @@ OPSYN_THIS OPSYN SAM31 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -131,7 +131,7 @@ OPSYN_THIS OPSYN SAM31 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -147,7 +147,7 @@ OPSYN_THIS OPSYN SAM31 )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -168,7 +168,7 @@ AGO OPSYN ACTR )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -187,7 +187,7 @@ MENDX OPSYN MEND )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -210,7 +210,7 @@ M_ OPSYN M )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -228,7 +228,7 @@ LR_ OPSYN LR )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -246,7 +246,7 @@ LRX OPSYN LR )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -258,7 +258,7 @@ X OPSYN LR )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -276,7 +276,7 @@ LR OPSYN mock_parse_lib_provider mock { { "LR", LIB } }; analyzer a(input, analyzer_options { &mock }); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -287,7 +287,7 @@ LR OPSYN , )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); } @@ -313,7 +313,7 @@ B DS C )"); analyzer a(input); a.analyze(); - a.collect_diags(); + EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "CNT"), 1); } @@ -336,7 +336,6 @@ A DS 0H )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -357,7 +356,6 @@ BCT_ OPSYN BCT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -377,7 +375,6 @@ JCT_ OPSYN JCT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME007" })); } @@ -395,7 +392,6 @@ TEST(OPSYN, macro_replacement_3) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -412,7 +408,6 @@ TEST(OPSYN, macro_replacement_4) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "ME007" })); } @@ -434,7 +429,6 @@ SETA OPSYN SETB analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_vector(a.hlasm_ctx(), "VAR"), std::vector(2, 2)); @@ -456,7 +450,6 @@ SETA OPSYN SETB analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E013" })); } diff --git a/parser_library/test/processing/org_test.cpp b/parser_library/test/processing/org_test.cpp index c3516f7cf..85e69e503 100644 --- a/parser_library/test/processing/org_test.cpp +++ b/parser_library/test/processing/org_test.cpp @@ -27,7 +27,6 @@ A ORG , analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -39,7 +38,6 @@ TEST(org, non_reloc) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A245" })); } @@ -52,7 +50,6 @@ X EQU * analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A245" })); } @@ -65,7 +62,6 @@ S LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E033" })); } @@ -82,7 +78,6 @@ A LOCTR analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -98,7 +93,6 @@ B1 LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -112,7 +106,6 @@ A CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -127,7 +120,6 @@ B LOCTR analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -144,7 +136,6 @@ B EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 15); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -161,7 +152,6 @@ B EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 16); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -175,7 +165,6 @@ X EQU 1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -192,7 +181,6 @@ B EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 3); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -210,7 +198,6 @@ X EQU S-* EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -229,7 +216,6 @@ Y EQU S EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -245,7 +231,6 @@ X EQU S-* analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -264,7 +249,6 @@ X EQU *-S2 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -281,7 +265,6 @@ X EQU *-S2 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -301,7 +284,6 @@ X EQU 3 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 16); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -316,7 +298,6 @@ X EQU S-* analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -333,7 +314,6 @@ X EQU D-* analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -349,7 +329,6 @@ TEST(org, second_param_invalid) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)4); } @@ -363,7 +342,6 @@ B EQU *-A )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -386,7 +364,6 @@ X EQU 1 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 4); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -402,7 +379,6 @@ X EQU *-C )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -422,7 +398,6 @@ X EQU *-B analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -439,7 +414,6 @@ S EQU *+1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)3); } @@ -455,7 +429,6 @@ B EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 20); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -468,7 +441,6 @@ A DS 1C analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -485,7 +457,6 @@ X EQU A-* EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 3); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -501,7 +472,6 @@ X EQU *-B EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 4); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -516,7 +486,6 @@ X EQU A-* analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -534,7 +503,6 @@ Y EQU *-B EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 4); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 0); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -553,7 +521,6 @@ Y EQU *-B EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 4); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 0); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -573,7 +540,6 @@ Y EQU *-B EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 4); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 0); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -588,7 +554,6 @@ X EQU *-B analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -608,7 +573,6 @@ X EQU 2 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 4); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); std::string input2(R"( @@ -625,7 +589,6 @@ X EQU 5 EXPECT_EQ(get_symbol_abs(a2.hlasm_ctx(), "Y"), 5); - a2.collect_diags(); ASSERT_EQ(a2.diags().size(), (size_t)0); } @@ -647,7 +610,6 @@ Z EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -667,7 +629,6 @@ X EQU 2 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Y"), 6); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -684,7 +645,6 @@ Z EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -703,7 +663,6 @@ Z EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 5); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -722,7 +681,6 @@ Z EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "X"), 8); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 13); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -738,7 +696,6 @@ Z EQU *-A analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)1); } @@ -763,7 +720,6 @@ Z2 EQU B-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 20); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z2"), 20); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -786,7 +742,6 @@ Z EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 48); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -809,7 +764,6 @@ Z EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "Z"), 48); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -827,7 +781,6 @@ X EQU 10 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 6); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); std::string input2(R"( @@ -842,7 +795,6 @@ Y EQU 4 EXPECT_EQ(get_symbol_abs(a2.hlasm_ctx(), "B"), 6); - a2.collect_diags(); ASSERT_EQ(a2.diags().size(), (size_t)0); } @@ -861,7 +813,6 @@ X EQU 10 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 6); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -882,7 +833,6 @@ Y EQU 4 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 6); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "C"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -904,7 +854,6 @@ Y1 EQU 4 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 6); EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "C"), 2); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -923,7 +872,6 @@ X EQU 10 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); std::string input2(R"( @@ -939,7 +887,6 @@ X EQU 10 EXPECT_EQ(get_symbol_abs(a2.hlasm_ctx(), "B"), 14); - a2.collect_diags(); ASSERT_EQ(a2.diags().size(), (size_t)0); } @@ -959,7 +906,6 @@ X EQU 10 EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 10); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); std::string input2(R"( @@ -976,7 +922,6 @@ X EQU 10 EXPECT_EQ(get_symbol_abs(a2.hlasm_ctx(), "B"), 14); - a2.collect_diags(); ASSERT_EQ(a2.diags().size(), (size_t)0); } @@ -990,7 +935,6 @@ Y LR 1,1 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E033", "E068" })); } @@ -1015,7 +959,6 @@ X EQU 4 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_EQ(a.diags().size(), (size_t)3); } @@ -1032,7 +975,6 @@ X EQU 2 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1051,7 +993,6 @@ B EQU *-A EXPECT_EQ(get_symbol_abs(a.hlasm_ctx(), "B"), 1); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -1068,7 +1009,6 @@ Z DS A )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1098,7 +1038,6 @@ LEN EQU 144 )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1113,7 +1052,6 @@ TEST(org, missing_reloc_expr) )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A245" })); } @@ -1126,7 +1064,6 @@ B EQU A )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1147,7 +1084,6 @@ B EQU A,L'A )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -1169,7 +1105,6 @@ S LOCTR )"); analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); diff --git a/parser_library/test/processing/punch_test.cpp b/parser_library/test/processing/punch_test.cpp index bc145e692..5ca6b9445 100644 --- a/parser_library/test/processing/punch_test.cpp +++ b/parser_library/test/processing/punch_test.cpp @@ -29,7 +29,6 @@ TEST(punch, parameter_count) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A011", "A011" })); } @@ -41,7 +40,6 @@ TEST(punch, string_only) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A300" })); } @@ -53,7 +51,6 @@ TEST(punch, non_empty) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A302" })); } @@ -66,7 +63,6 @@ TEST(punch, limit_80) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A108" })); } @@ -82,7 +78,6 @@ TEST(punch, output) EXPECT_CALL(output, punch(StrEq("test string"))); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); }; diff --git a/parser_library/test/processing/start_test.cpp b/parser_library/test/processing/start_test.cpp index 0218f67d5..50019ad13 100644 --- a/parser_library/test/processing/start_test.cpp +++ b/parser_library/test/processing/start_test.cpp @@ -25,7 +25,6 @@ S START analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_TRUE(a.hlasm_ctx().ord_ctx.section_defined(id_index("S"), section_kind::EXECUTABLE)); @@ -40,7 +39,6 @@ E EQU * analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); const auto* s = a.hlasm_ctx().ord_ctx.get_section(id_index("S")); @@ -66,7 +64,6 @@ S CSECT analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -79,7 +76,6 @@ S START analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E073" })); } @@ -92,7 +88,6 @@ S START analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "E073" })); } @@ -106,7 +101,6 @@ S START analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -119,6 +113,5 @@ E EQU 0 analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "A250" })); } diff --git a/parser_library/test/semantics/concatenation_test.cpp b/parser_library/test/semantics/concatenation_test.cpp index 0c98330b7..10d00cad7 100644 --- a/parser_library/test/semantics/concatenation_test.cpp +++ b/parser_library/test/semantics/concatenation_test.cpp @@ -94,7 +94,6 @@ TEST(concatenation, no_dots) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), " "); @@ -108,7 +107,6 @@ TEST(concatenation, with_dots) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), " "); @@ -124,7 +122,6 @@ TEST(concatenation, with_functions) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), " X"); @@ -145,7 +142,6 @@ TEST(concatenation, with_expr_operator) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), " X"); @@ -164,7 +160,6 @@ TEST(concatenation, no_dots_without_subscript) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "A"), " ' "); @@ -178,7 +173,6 @@ TEST(concatenation, identifier_after_variable_name) )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); EXPECT_EQ(get_var_value(a.hlasm_ctx(), "B"), "X:"); diff --git a/parser_library/test/semantics/fading_test.cpp b/parser_library/test/semantics/fading_test.cpp index 41118f7b7..7239df437 100644 --- a/parser_library/test/semantics/fading_test.cpp +++ b/parser_library/test/semantics/fading_test.cpp @@ -12,6 +12,7 @@ * Broadcom, Inc. - initial API and implementation */ +#include #include #include diff --git a/parser_library/test/semantics/highlighting_test.cpp b/parser_library/test/semantics/highlighting_test.cpp index 1d65400e0..8cfae4cc2 100644 --- a/parser_library/test/semantics/highlighting_test.cpp +++ b/parser_library/test/semantics/highlighting_test.cpp @@ -350,7 +350,6 @@ TEST(highlighting, multiline_macro_param) )"; analyzer a(contents, analyzer_options { collect_highlighting_info::yes }); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); @@ -537,7 +536,6 @@ TEST_P(highlighting_fixture, macro_params_no_definition) { analyzer a(GetParam().text_to_test, analyzer_options { collect_highlighting_info::yes }); a.analyze(); - a.collect_diags(); matches_message_codes(a.diags(), { "E049" }); diff --git a/parser_library/test/semantics/operand_test.cpp b/parser_library/test/semantics/operand_test.cpp index bd4c54236..ae27bb1e1 100644 --- a/parser_library/test/semantics/operand_test.cpp +++ b/parser_library/test/semantics/operand_test.cpp @@ -174,7 +174,6 @@ A DS A )"; analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } diff --git a/parser_library/test/stability_test.cpp b/parser_library/test/stability_test.cpp index 5bb07169f..7de4aee8d 100644 --- a/parser_library/test/stability_test.cpp +++ b/parser_library/test/stability_test.cpp @@ -107,7 +107,6 @@ TEST(stability_test, entry_8) analyzer a(input); a.analyze(); - a.collect_diags(); } TEST(stability_test, entry_9) @@ -119,7 +118,6 @@ TEST(stability_test, entry_9) analyzer a(input); a.analyze(); - a.collect_diags(); } TEST(stability_test, entry_10) @@ -128,7 +126,6 @@ TEST(stability_test, entry_10) analyzer a(input); a.analyze(); - a.collect_diags(); } TEST(stability_test, entry_11) @@ -145,7 +142,6 @@ D DS z)" analyzer a(input); a.analyze(); - a.collect_diags(); } TEST(stability_test, entry_12) @@ -156,5 +152,4 @@ TEST(stability_test, entry_12) analyzer a(input); a.analyze(); - a.collect_diags(); } diff --git a/parser_library/test/utf_conv_test.cpp b/parser_library/test/utf_conv_test.cpp index 3fe049eeb..0fd1afdfb 100644 --- a/parser_library/test/utf_conv_test.cpp +++ b/parser_library/test/utf_conv_test.cpp @@ -164,7 +164,6 @@ TEST(encoding, server_substitution) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W017" })); } @@ -175,7 +174,6 @@ TEST(encoding, client_substitution_vscode) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W018" })); } @@ -186,6 +184,5 @@ TEST(encoding, client_server_substitution_multiple_vscode) analyzer a(input); a.analyze(); - a.collect_diags(); EXPECT_TRUE(matches_message_codes(a.diags(), { "W017", "W018" })); } diff --git a/parser_library/test/workspace/macro_cache_test.cpp b/parser_library/test/workspace/macro_cache_test.cpp index 238e63879..64644f325 100644 --- a/parser_library/test/workspace/macro_cache_test.cpp +++ b/parser_library/test/workspace/macro_cache_test.cpp @@ -388,7 +388,6 @@ TEST(macro_cache_test, inline_depends_on_copy) // try parsing the opencode now analyzer opencode(opencode_text, analyzer_options { opencode_file_loc, ctx }); opencode.analyze(); - opencode.collect_diags(); EXPECT_TRUE(opencode.diags().empty()); macro_cache_key copy_key { { processing::processing_kind::COPY, copy_id }, {} }; diff --git a/parser_library/test/workspace/virtual_files_test.cpp b/parser_library/test/workspace/virtual_files_test.cpp index d35f33742..35f595b97 100644 --- a/parser_library/test/workspace/virtual_files_test.cpp +++ b/parser_library/test/workspace/virtual_files_test.cpp @@ -52,7 +52,6 @@ TEST(virtual_files, callback_test_ainsert) )"; analyzer a(input, analyzer_options(&vf)); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -69,7 +68,6 @@ TEST(virtual_files, callback_test_preprocessor) )"; analyzer a(input, analyzer_options(&vf, db2_preprocessor_options())); a.analyze(); - a.collect_diags(); EXPECT_TRUE(a.diags().empty()); } @@ -110,9 +108,8 @@ TEST(virtual_files, callback_test_ainsert_valid_vfm) )"; analyzer a(input, analyzer_options(&vf)); a.analyze(); - a.collect_diags(); - const auto& d = a.diags(); + const auto d = a.diags(); ASSERT_EQ(d.size(), 1); EXPECT_EQ(d[0].file_uri, "hlasm://0/AINSERT_1.hlasm"); }