projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move definition of sort-cases-dialog to a seperate file.
[pspp-builds.git]
/
src
/
language
/
expressions
/
parse.c
diff --git
a/src/language/expressions/parse.c
b/src/language/expressions/parse.c
index 5ae4994484c685362d2daa689e79544c78a9f140..bdce53c5827540afe92e985991f6f045da057c2d 100644
(file)
--- a/
src/language/expressions/parse.c
+++ b/
src/language/expressions/parse.c
@@
-356,7
+356,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
+370,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)
@@
-801,9
+801,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
+918,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));
}
@@
-1260,7
+1260,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)
{