summaryrefslogtreecommitdiff
path: root/src/format.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-06-13 15:04:53 -0400
committerJohn Wiegley <johnw@newartisans.com>2010-06-13 15:04:53 -0400
commit0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582 (patch)
tree985c50c080c077fa931ed9bf01c3895cbb851eda /src/format.cc
parent40f553228f5a28034c6635fdcb4c86af28a385ed (diff)
parentcf0147fcd04fc7ec4b3849350430e47169581e64 (diff)
downloadfork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.tar.gz
fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.tar.bz2
fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.zip
Merge branch 'next'
Diffstat (limited to 'src/format.cc')
-rw-r--r--src/format.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/format.cc b/src/format.cc
index bde39882..ae40e1c3 100644
--- a/src/format.cc
+++ b/src/format.cc
@@ -362,8 +362,13 @@ string format_t::real_calc(scope_t& scope)
out << value.to_string();
}
catch (const calc_error&) {
+ string current_context = error_context();
+
add_error_context(_("While calculating format expression:"));
add_error_context(expr.context_to_str());
+
+ if (! current_context.empty())
+ add_error_context(current_context);
throw;
}
break;