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 bdce53c5827540afe92e985991f6f045da057c2d..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;
@@
-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;
}
@@
-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."),