projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct grammar in printed string
[pspp]
/
src
/
language
/
expressions
/
parse.c
diff --git
a/src/language/expressions/parse.c
b/src/language/expressions/parse.c
index 5ae4994484c685362d2daa689e79544c78a9f140..530e272cbed15bb87921f3a38344b7d2f12569c4 100644
(file)
--- a/
src/language/expressions/parse.c
+++ b/
src/language/expressions/parse.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-344,7
+344,13
@@
type_coercion_core (struct expression *e,
{
/* Convert numeric to boolean. */
if (do_coercion)
{
/* Convert numeric to boolean. */
if (do_coercion)
- *node = expr_allocate_unary (e, OP_NUM_TO_BOOLEAN, *node);
+ {
+ union any_node *op_name;
+
+ op_name = expr_allocate_string (e, ss_cstr (operator_name));
+ *node = expr_allocate_binary (e, OP_NUM_TO_BOOLEAN, *node,
+ op_name);
+ }
return true;
}
break;
return true;
}
break;
@@
-356,7
+362,7
@@
type_coercion_core (struct expression *e,
msg_disable ();
if ((*node)->type == OP_format
&& fmt_check_input (&(*node)->format.f)
msg_disable ();
if ((*node)->type == OP_format
&& fmt_check_input (&(*node)->format.f)
- && fmt_check_type_compat (&(*node)->format.f, VA
R
_NUMERIC))
+ && fmt_check_type_compat (&(*node)->format.f, VA
L
_NUMERIC))
{
msg_enable ();
if (do_coercion)
{
msg_enable ();
if (do_coercion)
@@
-370,7
+376,7
@@
type_coercion_core (struct expression *e,
msg_disable ();
if ((*node)->type == OP_format
&& fmt_check_output (&(*node)->format.f)
msg_disable ();
if ((*node)->type == OP_format
&& fmt_check_output (&(*node)->format.f)
- && fmt_check_type_compat (&(*node)->format.f, VA
R
_NUMERIC))
+ && fmt_check_type_compat (&(*node)->format.f, VA
L
_NUMERIC))
{
msg_enable ();
if (do_coercion)
{
msg_enable ();
if (do_coercion)
@@
-577,7
+583,7
@@
parse_binary_operators (struct lexer *lexer, struct expression *e, union any_nod
}
if (op_count > 1 && chain_warning != NULL)
}
if (op_count > 1 && chain_warning != NULL)
- msg (SW, chain_warning);
+ msg (SW,
"%s",
chain_warning);
return node;
}
return node;
}
@@
-801,9
+807,9
@@
parse_sysvar (struct lexer *lexer, struct expression *e)
+ tm->tm_sec);
}
else if (lex_match_id (lexer, "$LENGTH"))
+ tm->tm_sec);
}
else if (lex_match_id (lexer, "$LENGTH"))
- return expr_allocate_number (e, get_viewlength ());
+ return expr_allocate_number (e,
settings_
get_viewlength ());
else if (lex_match_id (lexer, "$WIDTH"))
else if (lex_match_id (lexer, "$WIDTH"))
- return expr_allocate_number (e, get_viewwidth ());
+ return expr_allocate_number (e,
settings_
get_viewwidth ());
else
{
msg (SE, _("Unknown system variable %s."), lex_tokid (lexer));
else
{
msg (SE, _("Unknown system variable %s."), lex_tokid (lexer));
@@
-918,7
+924,7
@@
parse_vector_element (struct lexer *lexer, struct expression *e)
|| !lex_match (lexer, ')'))
return NULL;
|| !lex_match (lexer, ')'))
return NULL;
- return expr_allocate_binary (e, (vector_get_type (vector) == VA
R
_NUMERIC
+ return expr_allocate_binary (e, (vector_get_type (vector) == VA
L
_NUMERIC
? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR),
element, expr_allocate_vector (e, vector));
}
? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR),
element, expr_allocate_vector (e, vector));
}
@@
-1079,7
+1085,7
@@
validate_function_args (const struct operation *f, int arg_cnt, int min_valid)
&& array_arg_cnt % f->array_granularity != 0)
{
if (f->array_granularity == 2)
&& 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."),
f->prototype);
else
msg (SE, _("%s must have multiple of %d arguments in list."),
@@
-1260,7
+1266,7
@@
parse_function (struct lexer *lexer, struct expression *e)
if (!validate_function_args (f, arg_cnt, min_valid))
goto fail;
if (!validate_function_args (f, arg_cnt, min_valid))
goto fail;
- if ((f->flags & OPF_EXTENSION) && get_syntax () == COMPATIBLE)
+ if ((f->flags & OPF_EXTENSION) &&
settings_
get_syntax () == COMPATIBLE)
msg (SW, _("%s is a PSPP extension."), f->prototype);
if (f->flags & OPF_UNIMPLEMENTED)
{
msg (SW, _("%s is a PSPP extension."), f->prototype);
if (f->flags & OPF_UNIMPLEMENTED)
{