const struct operator *op;
for (op = ops; op < ops + op_cnt; op++)
- {
- if (op->token == '-')
- lex_negative_to_dash (lexer);
- if (lex_match (lexer, op->token))
- {
- if (operator != NULL)
- *operator = op;
- return true;
- }
- }
+ if (lex_token (lexer) == op->token)
+ {
+ if (op->token != T_NEG_NUM)
+ lex_get (lexer);
+ if (operator != NULL)
+ *operator = op;
+ return true;
+ }
if (operator != NULL)
*operator = NULL;
return false;
parse_or (struct lexer *lexer, struct expression *e)
{
static const struct operator op =
- { T_OR, OP_OR, "logical disjunction (\"OR\")" };
+ { T_OR, OP_OR, "logical disjunction (`OR')" };
return parse_binary_operators (lexer, e, parse_and (lexer, e), &op, 1, parse_and, NULL);
}
parse_and (struct lexer *lexer, struct expression *e)
{
static const struct operator op =
- { T_AND, OP_AND, "logical conjunction (\"AND\")" };
+ { T_AND, OP_AND, "logical conjunction (`AND')" };
return parse_binary_operators (lexer, e, parse_not (lexer, e),
&op, 1, parse_not, NULL);
parse_not (struct lexer *lexer, struct expression *e)
{
static const struct operator op
- = { T_NOT, OP_NOT, "logical negation (\"NOT\")" };
+ = { T_NOT, OP_NOT, "logical negation (`NOT')" };
return parse_inverting_unary_operator (lexer, e, &op, parse_rel);
}
parse_rel (struct lexer *lexer, struct expression *e)
{
const char *chain_warning =
- _("Chaining relational operators (e.g. \"a < b < c\") will "
+ _("Chaining relational operators (e.g. `a < b < c') will "
"not produce the mathematically expected result. "
"Use the AND logical operator to fix the problem "
- "(e.g. \"a < b AND b < c\"). "
+ "(e.g. `a < b AND b < c'). "
"If chaining is really intended, parentheses will disable "
- "this warning (e.g. \"(a < b) < c\".)");
+ "this warning (e.g. `(a < b) < c'.)");
union any_node *node = parse_add (lexer, e);
{
static const struct operator ops[] =
{
- { '=', OP_EQ, "numeric equality (\"=\")" },
- { T_EQ, OP_EQ, "numeric equality (\"EQ\")" },
- { T_GE, OP_GE, "numeric greater-than-or-equal-to (\">=\")" },
- { T_GT, OP_GT, "numeric greater than (\">\")" },
- { T_LE, OP_LE, "numeric less-than-or-equal-to (\"<=\")" },
- { T_LT, OP_LT, "numeric less than (\"<\")" },
- { T_NE, OP_NE, "numeric inequality (\"<>\")" },
+ { T_EQUALS, OP_EQ, "numeric equality (`=')" },
+ { T_EQ, OP_EQ, "numeric equality (`EQ')" },
+ { T_GE, OP_GE, "numeric greater-than-or-equal-to (`>=')" },
+ { T_GT, OP_GT, "numeric greater than (`>')" },
+ { T_LE, OP_LE, "numeric less-than-or-equal-to (`<=')" },
+ { T_LT, OP_LT, "numeric less than (`<')" },
+ { T_NE, OP_NE, "numeric inequality (`<>')" },
};
return parse_binary_operators (lexer, e, node, ops,
{
static const struct operator ops[] =
{
- { '=', OP_EQ_STRING, "string equality (\"=\")" },
- { T_EQ, OP_EQ_STRING, "string equality (\"EQ\")" },
- { T_GE, OP_GE_STRING, "string greater-than-or-equal-to (\">=\")" },
- { T_GT, OP_GT_STRING, "string greater than (\">\")" },
- { T_LE, OP_LE_STRING, "string less-than-or-equal-to (\"<=\")" },
- { T_LT, OP_LT_STRING, "string less than (\"<\")" },
- { T_NE, OP_NE_STRING, "string inequality (\"<>\")" },
+ { T_EQUALS, OP_EQ_STRING, "string equality (`=')" },
+ { T_EQ, OP_EQ_STRING, "string equality (`EQ')" },
+ { T_GE, OP_GE_STRING, "string greater-than-or-equal-to (`>=')" },
+ { T_GT, OP_GT_STRING, "string greater than (`>')" },
+ { T_LE, OP_LE_STRING, "string less-than-or-equal-to (`<=')" },
+ { T_LT, OP_LT_STRING, "string less than (`<')" },
+ { T_NE, OP_NE_STRING, "string inequality (`<>')" },
};
return parse_binary_operators (lexer, e, node, ops,
{
static const struct operator ops[] =
{
- { '+', OP_ADD, "addition (\"+\")" },
- { '-', OP_SUB, "subtraction (\"-\")" },
+ { T_PLUS, OP_ADD, "addition (`+')" },
+ { T_DASH, OP_SUB, "subtraction (`-')" },
+ { T_NEG_NUM, OP_ADD, "subtraction (`-')" },
};
return parse_binary_operators (lexer, e, parse_mul (lexer, e),
{
static const struct operator ops[] =
{
- { '*', OP_MUL, "multiplication (\"*\")" },
- { '/', OP_DIV, "division (\"/\")" },
+ { T_ASTERISK, OP_MUL, "multiplication (`*')" },
+ { T_SLASH, OP_DIV, "division (`/')" },
};
return parse_binary_operators (lexer, e, parse_neg (lexer, e),
static union any_node *
parse_neg (struct lexer *lexer, struct expression *e)
{
- static const struct operator op = { '-', OP_NEG, "negation (\"-\")" };
+ static const struct operator op = { T_DASH, OP_NEG, "negation (`-')" };
return parse_inverting_unary_operator (lexer, e, &op, parse_exp);
}
parse_exp (struct lexer *lexer, struct expression *e)
{
static const struct operator op =
- { T_EXP, OP_POW, "exponentiation (\"**\")" };
+ { T_EXP, OP_POW, "exponentiation (`**')" };
const char *chain_warning =
- _("The exponentiation operator (\"**\") is left-associative, "
+ _("The exponentiation operator (`**') is left-associative, "
"even though right-associative semantics are more useful. "
- "That is, \"a**b**c\" equals \"(a**b)**c\", not as \"a**(b**c)\". "
+ "That is, `a**b**c' equals `(a**b)**c', not as `a**(b**c)'. "
"To disable this warning, insert parentheses.");
- return parse_binary_operators (lexer, e, parse_primary (lexer, e), &op, 1,
- parse_primary, chain_warning);
+ union any_node *lhs, *node;
+ bool negative = false;
+
+ if (lex_token (lexer) == T_NEG_NUM)
+ {
+ lhs = expr_allocate_number (e, -lex_tokval (lexer));
+ negative = true;
+ lex_get (lexer);
+ }
+ else
+ lhs = parse_primary (lexer, e);
+
+ node = parse_binary_operators (lexer, e, lhs, &op, 1,
+ parse_primary, chain_warning);
+ return negative ? expr_allocate_unary (e, OP_NEG, node) : node;
}
/* Parses system variables. */
switch (lex_token (lexer))
{
case T_ID:
- if (lex_look_ahead (lexer) == '(')
+ if (lex_look_ahead (lexer) == T_LPAREN)
{
/* An identifier followed by a left parenthesis may be
a vector element reference. If not, it's a function
return node;
}
- case '(':
+ case T_LPAREN:
{
union any_node *node;
lex_get (lexer);
node = parse_or (lexer, e);
- if (node != NULL && !lex_match (lexer, ')'))
- {
- lex_error (lexer, _("expecting `)'"));
- return NULL;
- }
+ if (node != NULL && !lex_force_match (lexer, T_RPAREN))
+ return NULL;
return node;
}
default:
- lex_error (lexer, _("in expression"));
+ lex_error (lexer, NULL);
return NULL;
}
}
/* Skip left parenthesis token.
The caller must have verified that the lookahead is a left
parenthesis. */
- assert (lex_token (lexer) == '(');
+ assert (lex_token (lexer) == T_LPAREN);
lex_get (lexer);
element = parse_or (lexer, e);
if (!type_coercion (e, OP_number, &element, "vector indexing")
- || !lex_match (lexer, ')'))
+ || !lex_match (lexer, T_RPAREN))
return NULL;
return expr_allocate_binary (e, (vector_get_type (vector) == VAL_NUMERIC
&& array_arg_cnt % f->array_granularity != 0)
{
if (f->array_granularity == 2)
- msg (SE, _("%s must have even number of arguments in list."),
+ msg (SE, _("%s must have an even number of arguments in list."),
f->prototype);
else
msg (SE, _("%s must have multiple of %d arguments in list."),
ds_put_cstr (s, ", ");
ds_put_cstr (s, operations[expr_node_returns (args[i])].prototype);
}
- ds_put_char (s, ')');
+ ds_put_byte (s, ')');
}
static void
for (f = first; f < last; f++)
ds_put_format (&s, "\n%s", f->prototype);
}
- ds_put_char (&s, '.');
+ ds_put_byte (&s, '.');
msg (SE, "%s", ds_cstr (&s));
}
lex_get (lexer);
- if (!lex_force_match (lexer, '('))
+ if (!lex_force_match (lexer, T_LPAREN))
{
ds_destroy (&func_name);
return NULL;
args = NULL;
arg_cnt = arg_cap = 0;
- if (lex_token (lexer) != ')')
+ if (lex_token (lexer) != T_RPAREN)
for (;;)
{
if (lex_token (lexer) == T_ID
- && toupper (lex_look_ahead (lexer)) == 'T')
+ && toupper (lex_look_ahead (lexer)) == T_ID)
{
const struct variable **vars;
size_t var_cnt;
add_arg (&args, &arg_cnt, &arg_cap, arg);
}
- if (lex_match (lexer, ')'))
+ if (lex_match (lexer, T_RPAREN))
break;
- else if (!lex_match (lexer, ','))
+ else if (!lex_match (lexer, T_COMMA))
{
lex_error (lexer, _("expecting `,' or `)' invoking %s function"),
first->name);