Skip to content
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

#972 and #973: Refactorings for Script Options parser #976

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .current_gitmodules

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions doc/changes/changes_8.4.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ This release uses version 1.0.0 of the container tool.
- #950: Refactored existing script-options parser
- #944: Removed exaudfclient_bin_py3
- #967: Added ctpg script options parser
- #972: Refactor exception handling for Script Options parser
- #973: Support new lines and white spaces at the beginning in script options values

## Doc

Expand Down
4 changes: 2 additions & 2 deletions exaudfclient/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ cc_binary(
name = "exaudfclient_bin",
srcs = ["exaudfclient.cc", "//base:load_dynamic"],
linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace
deps = ["//base/exaudflib:header", "//base:debug_message_h"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
["//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory"],
defines = VM_ENABLED_DEFINES,
data = ["//base:libexaudflib_complete.so"]
Expand All @@ -112,7 +112,7 @@ cc_binary(
name = "exaudfclient_static_bin",
srcs = ["exaudfclient.cc", "//base:load_dynamic"],
linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace
deps = ["//base/exaudflib:header", "//base:debug_message_h"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
["//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory"] + [ "@zmq//:zmq", "@protobuf//:protobuf"],
defines = VM_ENABLED_DEFINES,
data = ["//base:libexaudflib_complete.so"],
Expand Down
2 changes: 1 addition & 1 deletion exaudfclient/exaudfclient.cc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "base/streaming_container/streamingcontainer.h"
#endif
#include <functional>
#include "base/debug_message.h"
#include "base/utils/debug_message.h"
#include <stdio.h>
#include <stddef.h>
#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion script-languages
Submodule script-languages updated 35 files
+2 −2 exaudfclient/BUILD
+1 −7 exaudfclient/base/BUILD
+1 −1 exaudfclient/base/benchmark_container/BUILD
+1 −1 exaudfclient/base/benchmark_container/benchmark_container.cc
+1 −1 exaudfclient/base/exaudflib/BUILD
+1 −1 exaudfclient/base/exaudflib/impl/check.cc
+1 −1 exaudfclient/base/exaudflib/impl/exaudflib_main.cc
+1 −1 exaudfclient/base/exaudflib/impl/socket_high_level.cc
+1 −1 exaudfclient/base/exaudflib/impl/socket_low_level.cc
+1 −1 exaudfclient/base/javacontainer/BUILD
+3 −3 exaudfclient/base/javacontainer/javacontainer_impl.cc
+3 −2 exaudfclient/base/javacontainer/script_options/BUILD
+0 −1 exaudfclient/base/javacontainer/script_options/converter.h
+7 −9 exaudfclient/base/javacontainer/script_options/extractor.cc
+1 −4 exaudfclient/base/javacontainer/script_options/extractor.h
+4 −8 exaudfclient/base/javacontainer/script_options/parser.h
+51 −48 exaudfclient/base/javacontainer/script_options/parser_legacy.cc
+6 −12 exaudfclient/base/javacontainer/script_options/parser_legacy.h
+2 −2 exaudfclient/base/python/python3/BUILD
+1 −1 exaudfclient/base/python/python3/python_ext_dataframe.cc
+1 −1 exaudfclient/base/python/pythoncontainer.cc
+5 −0 exaudfclient/base/script_options_parser/BUILD
+1 −0 exaudfclient/base/script_options_parser/ctpg/BUILD
+59 −13 exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc
+2 −3 exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.h
+106 −23 exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
+17 −0 exaudfclient/base/script_options_parser/exception.h
+1 −0 exaudfclient/base/script_options_parser/legacy/BUILD
+6 −5 exaudfclient/base/script_options_parser/legacy/script_option_lines.cc
+3 −3 exaudfclient/base/script_options_parser/legacy/script_option_lines.h
+16 −23 exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
+10 −0 exaudfclient/base/utils/BUILD
+0 −0 exaudfclient/base/utils/debug_message.h
+16 −0 exaudfclient/base/utils/exceptions.h
+1 −1 exaudfclient/exaudfclient.cc