sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow relative includes in the current directory

Browse source
This commit is contained in:
John Wiegley 2009-12-07 20:43:17 -05:00
parent 12db51e6bb
commit 6d0ab845ea
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/textual.cc
View file

@ -663,20 +663,26 @@ void instance_t::include_directive(char * line)
{ {
path filename; path filename;
DEBUG("textual.include", "include: " << line);
if (line[0] != '/' && line[0] != '\\' && line[0] != '~') { if (line[0] != '/' && line[0] != '\\' && line[0] != '~') {
DEBUG("textual.include", "received a relative path");
DEBUG("textual.include", "parent file path: " << pathname.string());
string::size_type pos = pathname.string().rfind('/'); string::size_type pos = pathname.string().rfind('/');
if (pos == string::npos) if (pos == string::npos)
pos = pathname.string().rfind('\\'); pos = pathname.string().rfind('\\');
if (pos != string::npos) if (pos != string::npos) {
filename = path(string(pathname.string(), 0, pos + 1)) / line; filename = path(string(pathname.string(), 0, pos + 1)) / line;
DEBUG("textual.include", "normalized path: " << filename.string());
} else {
filename = path(string(".")) / line;
}
} else { } else {
filename = line; filename = line;
} }
filename = resolve_path(filename); filename = resolve_path(filename);
DEBUG("textual.include", "resolved path: " << filename.string());
DEBUG("textual.include", "Line " << linenum << ": " <<
"Including path '" << filename << "'");
if (! exists(filename)) if (! exists(filename))
throw_(std::runtime_error, throw_(std::runtime_error,