summaryrefslogtreecommitdiff
path: root/main.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2006-03-19 21:11:49 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 02:41:31 -0400
commit32bdfe20d98f1c8e6c0aabe9b26f0507326d2baa (patch)
tree50a4c5490f842ff4241ed6c574d3debd0ed6e1b6 /main.cc
parentab748ed13ed87369e2e4ed5a617b5de12750fda6 (diff)
downloadfork-ledger-32bdfe20d98f1c8e6c0aabe9b26f0507326d2baa.tar.gz
fork-ledger-32bdfe20d98f1c8e6c0aabe9b26f0507326d2baa.tar.bz2
fork-ledger-32bdfe20d98f1c8e6c0aabe9b26f0507326d2baa.zip
Tons of corrections and fixes to value expressions and lot figures.
Diffstat (limited to 'main.cc')
-rw-r--r--main.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/main.cc b/main.cc
index 705ee3af..84397b15 100644
--- a/main.cc
+++ b/main.cc
@@ -100,9 +100,7 @@ int parse_and_report(config_t& config, int argc, char * argv[], char * envp[])
command = "p";
else if (command == "output")
command = "w";
- else if (command == "emacs")
- command = "x";
- else if (command == "lisp")
+ else if (command == "emacs" || command == "lisp")
command = "x";
else if (command == "xml")
command = "X";
@@ -119,7 +117,7 @@ int parse_and_report(config_t& config, int argc, char * argv[], char * envp[])
command = "r";
}
else if (command == "parse") {
- value_auto_ptr expr(ledger::parse_value_expr(*arg));
+ value_expr expr(ledger::parse_value_expr(*arg));
if (config.verbose_mode) {
std::cout << "Value expression tree:" << std::endl;
ledger::dump_value_expr(std::cout, expr.get());
@@ -243,7 +241,7 @@ int parse_and_report(config_t& config, int argc, char * argv[], char * envp[])
// Are we handling the parse or expr commands? Do so now.
if (command == "expr") {
- value_auto_ptr expr(ledger::parse_value_expr(*arg));
+ value_expr expr(ledger::parse_value_expr(*arg));
if (config.verbose_mode) {
std::cout << "Value expression tree:" << std::endl;
ledger::dump_value_expr(std::cout, expr.get());