-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
#983: Refactor CTPG script options Java parser code #462
#983: Refactor CTPG script options Java parser code #462
Conversation
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
Outdated
Show resolved
Hide resolved
exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc
Outdated
Show resolved
Hide resolved
exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc
Outdated
Show resolved
Hide resolved
exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc
Outdated
Show resolved
Hide resolved
scriptCode.replace(optionIt->origPos, optionIt->origLen, optionIt->script); | ||
} | ||
collectImportScripts(optionIt->second, recursionDepth, collectedScript); | ||
//Now replace the imported script bodies |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
//Now replace the imported script bodies |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
std::vector<ReplacedScripts> replacedScripts; | ||
replacedScripts.reserve(optionIt->second.size()); | ||
std::vector<CollectedScript> collectedScript; | ||
collectedScript.reserve(optionIt->second.size()); | ||
//In order to continue compatibility with legacy implementation we must collect import scripts in forward direction |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should probably go into collectImportScripts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, the comment is about both steps:
collectImportScripts()
+ ``replaceImportScripts`. I think it's better to keep it here
std::vector<ReplacedScripts> replacedScripts; | ||
replacedScripts.reserve(optionIt->second.size()); | ||
std::vector<CollectedScript> collectedScript; | ||
collectedScript.reserve(optionIt->second.size()); | ||
//In order to continue compatibility with legacy implementation we must collect import scripts in forward direction | ||
//but then replace in reverse direction (in order to keep consistency of positions) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this one is already in replaceImportScripts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
(in order to keep consistency of positions)
related to exasol/script-languages-release#983