fix: AREAD/AINSERT support in macros called from copybooks #138
Conversation
…ack was modified by previous aread
| @@ -60,6 +58,13 @@ std::string_view text_data_ref_t::get_range_content(range r) const | |||
| return std::string_view(&text->at(start_i), end_i - start_i); | |||
| } | |||
|
|
|||
| std::string_view text_data_ref_t::get_lines_beginning(position pos) const | |||
There was a problem hiding this comment.
This is more readable for me:
| std::string_view text_data_ref_t::get_lines_beginning(position pos) const | |
| std::string_view text_data_ref_t::get_lines_beginning_at(position pos) const |
Also why does the function take position instead of just line number?
There was a problem hiding this comment.
actually, I wanted get_lines_beginning_at and get_line_beginning_at to have the same signature and did not want to spend time changing the later. So, I'd prefer to keep the position argument for now.
| @@ -131,6 +139,10 @@ void opencode_provider::ainsert(const std::string& rec, ainsert_destination dest | |||
| m_ainsert_buffer.push_front(rec); | |||
| break; | |||
| } | |||
| // ainsert buffer may contains macro call that will remove code lines from copybooks | |||
There was a problem hiding this comment.
| // ainsert buffer may contains macro call that will remove code lines from copybooks | |
| // ainsert buffer may contain macro call that will remove code lines from copybooks |
| { | ||
| std::string_view text; | ||
| position_t line_no; | ||
| const lsp::file_info* copy_file; |
There was a problem hiding this comment.
lsp::file_info is used to hold "LSP metadata" about a file and it seems to me that we do not need all the metadata here, just the newlines. Could this member be changed to const lsp::text_data_ref_t*?
In a future refactoring, we might want to merge some code from file_impl and text_data_ref_t, since both represent the file in a similar way, holding text + positions of newlines.
| @@ -81,8 +81,8 @@ class opencode_provider final : public diagnosable_impl, public statement_provid | |||
| { | |||
| size_t begin_offset; | |||
| size_t end_offset; | |||
| size_t begin_line; | |||
| size_t end_line; | |||
| position_t begin_line; | |||
There was a problem hiding this comment.
I am not 100% sure about this change, since position_t is too similar to position. I know it was not introduced in this PR but maybe I would move in opposite direction - removing the position_t where possible? Or if you think it is useful, rename position_t?
| m_suspended = true; | ||
| } | ||
|
|
||
| bool copy_statement_provider::resume_at(position_t line_no, resume_copy resume_opts) |
There was a problem hiding this comment.
| bool copy_statement_provider::resume_at(position_t line_no, resume_copy resume_opts) | |
| bool copy_statement_provider::try_resume_at(position_t line_no, resume_copy resume_opts) |
...since the method checks first?
|
|
||
| auto a = std::make_unique<analyzer>(it->second, analyzer_options { library, this, std::move(ctx), data }); | ||
| a->analyze(); | ||
| a->collect_diags(); |
There was a problem hiding this comment.
| a->collect_diags(); |
There was a problem hiding this comment.
We end up doing this step during normal processing, so while it is redundant here, I'd prefer keeping it.
|
Kudos, SonarCloud Quality Gate passed! |
|
🎉 This PR is included in version 0.14.0-beta.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 0.14.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
fix: Address edge cases when AREAD and AINSERT are called from source code brought by COPY instruction.
feat: Add support for macro library to fuzzer.