From ea1642b3f969463a49e5a671478c92e4ef129665 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 13 Jun 2010 05:02:14 -0400 Subject: Completely reworked argument passing in expressions --- src/parser.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/parser.cc') 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); -- cgit v1.2.3