Skip to content
Snippets Groups Projects
Verified Commit b8205a49 authored by Houtan Bastani's avatar Houtan Bastani
Browse files

Revert "macro processor: allow @#includepath to accept a colon-separated list of paths"

This reverts commit 12b09073.
parent 12b09073
Branches
No related tags found
No related merge requests found
Pipeline #1437 passed
......@@ -68,14 +68,7 @@ IncludePath::interpret(ostream &output, bool no_line_macro)
StringPtr msp = dynamic_pointer_cast<String>(expr->eval());
if (!msp)
throw StackTrace("File name does not evaluate to a string");
size_t last = 0;
size_t next = 0;
while ((next = static_cast<string>(*msp).find(":", last)) != string::npos)
{
path.push_back(static_cast<string>(*msp).substr(last, next-last));
last = next + 1;
}
path.push_back(static_cast<string>(*msp).substr(last));
path = *msp;
}
catch (StackTrace &ex)
{
......
......@@ -83,12 +83,12 @@ namespace macro
{
private:
const ExpressionPtr expr;
vector<string> path;
string path;
public:
IncludePath(const ExpressionPtr expr_arg, Environment &env_arg, const Tokenizer::location location_arg) :
Directive(env_arg, move(location_arg)), expr{move(expr_arg)} { }
void interpret(ostream &output, bool no_line_macro) override;
inline vector<string> getPath() const { return path; }
inline string getPath() const { return path; }
};
......
......@@ -85,10 +85,7 @@ Driver::parse(const string &file_arg, const string &basename_arg, istream &modfi
auto ipp = dynamic_pointer_cast<IncludePath>(statement);
if (ipp)
{
auto p = ipp->getPath();
paths.insert(paths.end(), p.begin(), p.end());
}
paths.emplace_back(ipp->getPath());
auto ip = dynamic_pointer_cast<Include>(statement);
if (ip)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment