Skip to content
Snippets Groups Projects
Commit bc7ef1a4 authored by Fabian Reister's avatar Fabian Reister
Browse files

Revert "aron code generation: explicitly specifying include paths" 

This reverts commit 6128ed04.
parent 49250629
No related branches found
No related tags found
1 merge request!258RobotUnit with global robot pose information
Hide whitespace changes
Inline Side-by-side
source/RobotAPI/applications/AronCodeGenerator/main.cpp
+ 2
− 14
View file @ bc7ef1a4
......@@ -63,8 +63,7 @@ int main(int argc, char* argv[])
options.add_options("IO")
("i,input", "XML file name", cxxopts::value<std::string>()->default_value(input_default))
("o,output", "The output path", cxxopts::value<std::string>()->default_value(output_default))
("I,include", "include path", cxxopts::value<std::vector<std::string>>());
("o,output", "The output path", cxxopts::value<std::string>()->default_value(output_default));
options.add_options("Generation")
("f,force", "Enforce the generation", cxxopts::value<bool>()->default_value("false"));
......@@ -109,17 +108,6 @@ int main(int argc, char* argv[])
std::filesystem::path input_file(filename);
std::filesystem::path output_folder(output);
std::vector<std::filesystem::path> includePaths;
if(result.count("I") > 0)
{
for(const auto& path: result["I"].as<std::vector<std::string>>())
{
includePaths.emplace_back(path);
}
}
if (!std::filesystem::exists(input_file) || !std::filesystem::is_regular_file(input_file))
{
std::cerr << "The input file does not exist or is not a regular file." << std::endl;
......@@ -144,7 +132,7 @@ int main(int argc, char* argv[])
}
typereader::xml::Reader reader;
reader.parseFile(input_file, includePaths);
reader.parseFile(input_file);
if (verbose)
{
std::cout << "Parsing the XML file... done!" << std::endl;
......
source/RobotAPI/libraries/aron/core/typereader/Reader.h
+ 2
− 2
View file @ bc7ef1a4
......@@ -47,10 +47,10 @@ namespace armarx::aron::typereader
Reader() = default;
/// parse a filename
virtual void parseFile(const std::string& filename, const std::vector<std::filesystem::path>& includePaths) = 0;
virtual void parseFile(const std::string& filename) = 0;
/// path a file given by std::filesystem
virtual void parseFile(const std::filesystem::path& file, const std::vector<std::filesystem::path>& includePaths) = 0;
virtual void parseFile(const std::filesystem::path& file) = 0;
std::vector<std::string> getCodeIncludes() const
{
......
source/RobotAPI/libraries/aron/core/typereader/xml/Reader.cpp
+ 19
− 35
View file @ bc7ef1a4
......@@ -26,7 +26,6 @@
// Header
#include "Reader.h"
#include <sstream>
// ArmarX
#include <ArmarXCore/core/rapidxml/wrapper/RapidXmlReader.h>
......@@ -43,20 +42,8 @@ namespace armarx::aron::typereader::xml
namespace
{
/// Resolve a relative Package path. This may be removed in a newer version of aron
std::optional<fs::path> resolveRelativePackagePath(const fs::path& path, const std::vector<fs::path>& includePaths)
std::optional<fs::path> resolveRelativePackagePath(const fs::path& path)
{
// new behavior: using provided include paths
for (const auto& includePath : includePaths)
{
fs::path absPath = includePath / path;
if (fs::is_regular_file(absPath))
{
// path is valid
return absPath;
}
}
// legacy behavior: using cmake package finder paths
const std::string package = *path.begin();
armarx::CMakePackageFinder finder(package);
if (finder.packageFound())
......@@ -72,12 +59,14 @@ namespace armarx::aron::typereader::xml
}
return std::nullopt;
}
return std::nullopt;
else
{
return std::nullopt;
}
}
}
void Reader::parseFile(const std::string& _filename, const std::vector<std::filesystem::path>& includePaths)
void Reader::parseFile(const std::string& _filename)
{
std::string filename = _filename;
// Handle C++ style includes like "<path/to/file>".
......@@ -85,19 +74,19 @@ namespace armarx::aron::typereader::xml
{
filename = filename.substr(1, filename.size() - 2);
}
parseFile(std::filesystem::path(filename), includePaths);
parseFile(std::filesystem::path(filename));
}
void Reader::parseFile(const std::filesystem::path& _file, const std::vector<std::filesystem::path>& includePaths)
void Reader::parseFile(const std::filesystem::path& _file)
{
fs::path file = _file;
RapidXmlReaderPtr reader = RapidXmlReader::FromFile(file.string());
parse(reader, _file, includePaths);
parse(reader, _file);
}
// private method reading nodes
void Reader::parse(const RapidXmlReaderPtr& reader, const std::filesystem::path& filePath, const std::vector<std::filesystem::path>& includePaths)
void Reader::parse(const RapidXmlReaderPtr& reader, const std::filesystem::path& filePath)
{
RapidXmlReaderNode root = reader->getRoot();
......@@ -115,7 +104,7 @@ namespace armarx::aron::typereader::xml
{
for (const auto& include : (*code_includes).nodes())
{
this->codeIncludes.push_back(readCodeInclude(include, filePath, includePaths));
this->codeIncludes.push_back(readCodeInclude(include, filePath));
}
}
......@@ -124,7 +113,7 @@ namespace armarx::aron::typereader::xml
{
for (const auto& aronInclude : (*aron_includes).nodes())
{
this->aronIncludes.push_back(readAronInclude(aronInclude, filePath, includePaths));
this->aronIncludes.push_back(readAronInclude(aronInclude, filePath));
}
}
......@@ -155,7 +144,7 @@ namespace armarx::aron::typereader::xml
}
}
std::string Reader::readCodeInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath, const std::vector<std::filesystem::path>& includePaths)
std::string Reader::readCodeInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath)
{
util::EnforceTagName(node, constantes::INCLUDE_TAG);
util::EnforceAttribute(node, constantes::INCLUDE_ATTRIBUTE_NAME);
......@@ -163,7 +152,7 @@ namespace armarx::aron::typereader::xml
return include;
}
std::string Reader::readAronInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath, const std::vector<std::filesystem::path>& includePaths)
std::string Reader::readAronInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath)
{
util::EnforceTagName(node, constantes::INCLUDE_TAG);
std::string specifiedPath = util::GetAttribute(node, constantes::INCLUDE_ATTRIBUTE_NAME);
......@@ -177,8 +166,7 @@ namespace armarx::aron::typereader::xml
if (!xmlincludepath.empty() && xmlincludepath.is_relative())
{
// ARMARX_INFO << "Checking file " << xmlincludepath;
if (std::optional<fs::path> resolvedPackagePath = resolveRelativePackagePath(xmlincludepath, includePaths); resolvedPackagePath.has_value())
if (std::optional<fs::path> resolvedPackagePath = resolveRelativePackagePath(xmlincludepath); resolvedPackagePath.has_value())
{
// check if relative path belongs to a package
resolved_absolute_path = resolvedPackagePath.value();
......@@ -193,13 +181,7 @@ namespace armarx::aron::typereader::xml
if (!fs::is_regular_file(resolved_absolute_path))
{
std::stringstream ss;
for(const auto& includePath: includePaths)
{
ss << includePath << ", ";
}
throw error::AronException(__PRETTY_FUNCTION__, "Could not find an aron XML file `" + xmlincludepath.string() + "`. Search paths are: " + ss.str());
throw error::AronException(__PRETTY_FUNCTION__, "Could not find an aron XML file. Last path tried was: " + resolved_absolute_path.string());
}
}
}
......@@ -207,7 +189,7 @@ namespace armarx::aron::typereader::xml
// parse parent xml file and add objects to alreday known
Reader anotherReader;
anotherReader.parseFile(resolved_absolute_path, includePaths);
anotherReader.parseFile(resolved_absolute_path);
for (const auto& previouslyKnown : anotherReader.factory.allPreviouslyKnownPublicTypes)
{
factory.allPreviouslyKnownPublicTypes.push_back(previouslyKnown);
......@@ -242,3 +224,5 @@ namespace armarx::aron::typereader::xml
return type::IntEnum::DynamicCastAndCheck(factory.create(node, Path()));
}
}
source/RobotAPI/libraries/aron/core/typereader/xml/Reader.h
+ 5
− 5
View file @ bc7ef1a4
......@@ -50,14 +50,14 @@ namespace armarx::aron::typereader::xml
public:
Reader() = default;
void parseFile(const std::string& filename, const std::vector<std::filesystem::path>& includePaths) override;
void parseFile(const std::filesystem::path& file, const std::vector<std::filesystem::path>& includePaths) override;
void parseFile(const std::string&) override;
void parseFile(const std::filesystem::path&) override;
private:
void parse(const RapidXmlReaderPtr& node, const std::filesystem::path& filePath, const std::vector<std::filesystem::path>& includePaths);
void parse(const RapidXmlReaderPtr& node, const std::filesystem::path& filePath);
std::string readCodeInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath, const std::vector<std::filesystem::path>& includePaths);
std::string readAronInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath, const std::vector<std::filesystem::path>& includePaths);
std::string readCodeInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath);
std::string readAronInclude(const RapidXmlReaderNode& node, const std::filesystem::path& filePath);
type::ObjectPtr readGenerateObject(const RapidXmlReaderNode& node);
type::IntEnumPtr readGenerateIntEnum(const RapidXmlReaderNode& node);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment