projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked settings so as to use one large struct instead of lots of static
[pspp-builds.git]
/
src
/
language
/
expressions
/
parse.c
diff --git
a/src/language/expressions/parse.c
b/src/language/expressions/parse.c
index 40b0a7ab53c1be8b25b515c021f244551e2002e7..bdce53c5827540afe92e985991f6f045da057c2d 100644
(file)
--- a/
src/language/expressions/parse.c
+++ b/
src/language/expressions/parse.c
@@
-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)
{