diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-13 15:04:53 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-13 15:04:53 -0400 |
| commit | 0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582 (patch) | |
| tree | 985c50c080c077fa931ed9bf01c3895cbb851eda /src/parser.cc | |
| parent | 40f553228f5a28034c6635fdcb4c86af28a385ed (diff) | |
| parent | cf0147fcd04fc7ec4b3849350430e47169581e64 (diff) | |
| download | fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.tar.gz fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.tar.bz2 fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.zip | |
Merge branch 'next'
Diffstat (limited to 'src/parser.cc')
| -rw-r--r-- | src/parser.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/parser.cc b/src/parser.cc index db989f07..a15775d1 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -59,8 +59,6 @@ expr_t::parser_t::parse_value_term(std::istream& in, tok = next_token(in, tflags.plus_flags(PARSE_OP_CONTEXT)); if (tok.kind == token_t::LPAREN) { op_t::kind_t kind = op_t::O_CALL; - if (ident == "any" || ident == "all") - kind = op_t::O_EXPAND; ptr_op_t call_node(new op_t(kind)); call_node->set_left(node); node = call_node; @@ -81,7 +79,7 @@ expr_t::parser_t::parse_value_term(std::istream& in, .minus_flags(PARSE_SINGLE)); tok = next_token(in, tflags, ')'); - if (node->kind == op_t::O_CONS) { + if (node && node->kind == op_t::O_CONS) { ptr_op_t prev(node); node = new op_t(op_t::O_SEQ); node->set_left(prev); |