# These are binary operator keywords always a single LHS and RHS
# * AND/OR are handled separately as they are N-ary
# * so is NOT as being unary
-# * BETWEEN without paranthesis around the ANDed arguments (which
-# makes it a non-binary op) is detected and accomodated in
+# * BETWEEN without parentheses around the ANDed arguments (which
+# makes it a non-binary op) is detected and accommodated in
# _recurse_parse()
# * AS is not really an operator but is handled here as it's also LHS/RHS
# this one *is* capturing for the split below
# splits on whitespace if all else fails
-# has to happen before the composiign qr's are anchored (below)
+# has to happen before the composing qr's are anchored (below)
$tokenizer_re = qr/ \s* ( $tokenizer_re ) \s* | \s+ /x;
# Parser states for _recurse_parse()
# we're now in "unknown token" land - start eating tokens until
# we see something familiar, OR in the case of RHS (binop) stop
# after the first token
+ # Also stop processing when we could end up with an unknown func
else {
my @lits = [ -LITERAL => [$token] ];
unless ( $state == PARSE_RHS ) {
- while (@$tokens and $tokens->[0] !~ $all_std_keywords_re) {
+ while (
+ @$tokens
+ and
+ $tokens->[0] !~ $all_std_keywords_re
+ and
+ ! ( @$tokens > 1 and $tokens->[1] eq '(' )
+ ) {
push @lits, [ -LITERAL => [ shift @$tokens ] ];
}
}
# deal with post-fix operators (asc/desc)
if ($tokens->[0] =~ $asc_desc_re) {
+ return @left if $state == PARSE_RHS;
@left = [ ('-' . uc (shift @$tokens)) => [ @left ] ];
}
$changes++;
}
- # if the parent operator explcitly allows it nuke the parenthesis
+ # if the parent operator explicitly allows it nuke the parenthesis
if ( $ast->[0] =~ $unrollable_ops_re ) {
push @children, @{$child->[1]};
$changes++;