projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys-file-reader: Fix reading overlong value labels for long string variables.
[pspp]
/
src
/
language
/
expressions
/
parse.c
diff --git
a/src/language/expressions/parse.c
b/src/language/expressions/parse.c
index 40b0a7ab53c1be8b25b515c021f244551e2002e7..3577443da94194a5317e80d9abcd5a42f87ffd99 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
@@
-577,7
+577,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
+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));
@@
-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)
{