diff options
Diffstat (limited to 'src/textual.cc')
| -rw-r--r-- | src/textual.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/textual.cc b/src/textual.cc index cf670cae..cbeb6358 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -663,20 +663,26 @@ void instance_t::include_directive(char * line) { path filename; + DEBUG("textual.include", "include: " << line); + 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('/'); if (pos == string::npos) pos = pathname.string().rfind('\\'); - if (pos != string::npos) + if (pos != string::npos) { filename = path(string(pathname.string(), 0, pos + 1)) / line; + DEBUG("textual.include", "normalized path: " << filename.string()); + } else { + filename = path(string(".")) / line; + } } else { filename = line; } filename = resolve_path(filename); - - DEBUG("textual.include", "Line " << linenum << ": " << - "Including path '" << filename << "'"); + DEBUG("textual.include", "resolved path: " << filename.string()); if (! exists(filename)) throw_(std::runtime_error, @@ -1044,6 +1050,9 @@ post_t * instance_t::parse_post(char * line, *post->cost *= post->amount; post->cost->set_commodity(cost_commodity); } + else if (post->amount.sign() < 0) { + post->cost->in_place_negate(); + } DEBUG("textual.parse", "line " << linenum << ": " << "Total cost is " << *post->cost); |