Reduce build time by suppressing template instantiation #1419
+416
−315
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -36,6 +36,17 @@ | |||||||||||||
|
|
||||||||||||||
| namespace openscenario_interpreter | ||||||||||||||
| { | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
| struct Scope; | ||||||||||||||
|
|
||||||||||||||
| inline namespace syntax | ||||||||||||||
| { | ||||||||||||||
| struct Orientation; | ||||||||||||||
| struct Position; | ||||||||||||||
| struct Properties; | ||||||||||||||
| struct Range; | ||||||||||||||
| } // namespace syntax | ||||||||||||||
|
|
||||||||||||||
| inline namespace reader | ||||||||||||||
| { | ||||||||||||||
| using Cardinality = | ||||||||||||||
|
|
@@ -72,7 +83,7 @@ auto traverse(const pugi::xml_node & parent, const std::string & name, F && f) - | |||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| template <typename T, typename Scope> | ||||||||||||||
| auto readElement(const std::string & name, const pugi::xml_node & parent, Scope & scope) -> T | ||||||||||||||
| { | ||||||||||||||
| if (const auto child = parent.child(name.c_str())) { | ||||||||||||||
| return T(child, scope); | ||||||||||||||
|
|
@@ -89,6 +100,15 @@ auto readElement(const std::string & name, const pugi::xml_node & parent, Scope | |||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| extern template auto readElement(const std::string &, const pugi::xml_node &, Scope &) | ||||||||||||||
| -> syntax::Orientation; | ||||||||||||||
| extern template auto readElement(const std::string &, const pugi::xml_node &, Scope &) | ||||||||||||||
| -> syntax::Position; | ||||||||||||||
| extern template auto readElement(const std::string &, const pugi::xml_node &, Scope &) | ||||||||||||||
| -> syntax::Properties; | ||||||||||||||
| extern template auto readElement(const std::string &, const pugi::xml_node &, Scope &) | ||||||||||||||
| -> syntax::Range; | ||||||||||||||
|
|
||||||||||||||
| template <typename T, typename U, typename Scope> | ||||||||||||||
| auto readElement(const std::string & name, const pugi::xml_node & parent, Scope & scope, U && value) | ||||||||||||||
| { | ||||||||||||||
|
|
@@ -153,62 +173,9 @@ auto readGroups(const pugi::xml_node & node, Ts &&... xs) | |||||||||||||
| return groups; | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| auto choice( | ||||||||||||||
| const pugi::xml_node & node, | ||||||||||||||
| std::unordered_map<std::string, std::function<Object(const pugi::xml_node &)>> callees) -> Object; | ||||||||||||||
|
Comment on lines
+176
to
+178
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| } // namespace reader | ||||||||||||||
| } // namespace openscenario_interpreter | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -126,26 +126,6 @@ struct DistanceCondition : private Scope, private SimulatorCore::ConditionEvalua | |
|
|
||
| auto evaluate() -> Object; | ||
| }; | ||
| } // namespace syntax | ||
| } // namespace openscenario_interpreter | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,26 +110,6 @@ struct RelativeDistanceCondition : private Scope, private SimulatorCore::Conditi | |
|
|
||
| auto evaluate() -> Object; | ||
| }; | ||
| } // namespace syntax | ||
| } // namespace openscenario_interpreter | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,99 @@ | ||||||
| // Copyright 2015 TIER IV, Inc. All rights reserved. | ||||||
| // | ||||||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
| // you may not use this file except in compliance with the License. | ||||||
| // You may obtain a copy of the License at | ||||||
| // | ||||||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| // | ||||||
| // Unless required by applicable law or agreed to in writing, software | ||||||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||||||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
| // See the License for the specific language governing permissions and | ||||||
| // limitations under the License. | ||||||
|
|
||||||
| #include <openscenario_interpreter/reader/attribute.hpp> | ||||||
| #include <openscenario_interpreter/scope.hpp> | ||||||
| #include <openscenario_interpreter/syntax/rule.hpp> | ||||||
|
|
||||||
| namespace openscenario_interpreter | ||||||
| { | ||||||
| inline namespace reader | ||||||
| { | ||||||
| auto substitute(std::string attribute, const Scope & scope) -> String | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| { | ||||||
| auto dirname = [](auto &&, auto && scope) { return scope.dirname(); }; | ||||||
|
|
||||||
| auto find_pkg_share = [](auto && package_name, const auto &) { | ||||||
| return ament_index_cpp::get_package_share_directory(package_name); | ||||||
| }; | ||||||
|
|
||||||
| auto ros2 = [](auto && arguments, const auto &) { | ||||||
| auto remove_trailing_newline = [](auto && s) { | ||||||
| while (s.back() == '\n') { | ||||||
| s.pop_back(); | ||||||
| } | ||||||
| return s; | ||||||
| }; | ||||||
| if (auto && result = remove_trailing_newline(concealer::dollar("ros2 " + arguments)); | ||||||
| result.find('\n') != std::string::npos) { | ||||||
| throw SyntaxError( | ||||||
| "The substitution result by `$(ros2 ...)` must not contain a newline character. " | ||||||
| "You gave `$(ros2 ", | ||||||
| arguments, ")` and the result was ", | ||||||
| std::quoted(boost::replace_all_copy(result, "\n", "\\n")), | ||||||
| ", which is unacceptable for the reasons stated above."); | ||||||
| } else { | ||||||
| return result; | ||||||
| } | ||||||
| }; | ||||||
|
|
||||||
| auto var = [](auto && name, const auto & scope) { | ||||||
| // TODO: Return the value of the launch configuration variable instead of the OpenSCENARIO parameter. | ||||||
| if (const auto found = scope.ref(name); found) { | ||||||
| return boost::lexical_cast<String>(found); | ||||||
| } else { | ||||||
| return String(); | ||||||
| } | ||||||
| }; | ||||||
|
|
||||||
| // NOTE: https://design.ros2.org/articles/roslaunch_xml.html#dynamic-configuration | ||||||
| static const std::unordered_map< | ||||||
| std::string, std::function<std::string(const std::string &, const Scope &)> > | ||||||
| substitutions{ | ||||||
| {"dirname", dirname}, | ||||||
| // TODO {"env", env}, | ||||||
| // TODO {"eval", eval}, | ||||||
| // TODO {"exec-in-package", exec_in_package}, | ||||||
| // TODO {"find-exec", find_exec}, | ||||||
| // TODO {"find-pkg-prefix", find_pkg_prefix}, | ||||||
| {"find-pkg-share", find_pkg_share}, | ||||||
| {"ros2", | ||||||
| ros2}, // NOTE: TIER IV extension (Not included in the ROS 2 Launch XML Substitution) | ||||||
| {"var", var}, | ||||||
| }; | ||||||
|
|
||||||
| static const auto pattern = std::regex(R"((.*)\$\((([\w-]+)\s?([^\)]*))\)(.*))"); | ||||||
|
|
||||||
| for (std::smatch result; std::regex_match(attribute, result, pattern);) { | ||||||
| if (const auto iter = substitutions.find(result.str(3)); iter != std::end(substitutions)) { | ||||||
| attribute = result.str(1) + std::get<1>(*iter)(result.str(4), scope) + result.str(5); | ||||||
| } else { | ||||||
| throw SyntaxError("Unknown substitution ", std::quoted(result.str(3)), " specified"); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return attribute; | ||||||
| } | ||||||
|
|
||||||
| template auto readAttribute(const std::string &, const pugi::xml_node &, const Scope &) -> Boolean; | ||||||
| template auto readAttribute(const std::string &, const pugi::xml_node &, const Scope &) | ||||||
| -> UnsignedShort; | ||||||
| template auto readAttribute(const std::string &, const pugi::xml_node &, const Scope &) | ||||||
| -> UnsignedInteger; | ||||||
| template auto readAttribute(const std::string &, const pugi::xml_node &, const Scope &) -> Double; | ||||||
| template auto readAttribute(const std::string &, const pugi::xml_node &, const Scope &) -> String; | ||||||
| template auto readAttribute(const std::string &, const pugi::xml_node &, const Scope &) | ||||||
| -> syntax::Rule; | ||||||
|
Comment on lines
+89
to
+97
There was a problem hiding this comment. Please sort in lexicographic order unless there is a technical reason not to. |
||||||
| } // namespace reader | ||||||
| } // namespace openscenario_interpreter | ||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Please sort in lexicographic order unless there is a technical reason not to.