X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fparse.c;h=bdce53c5827540afe92e985991f6f045da057c2d;hb=9b94efd7513afdb12a6023024e00e50801532fee;hp=40b0a7ab53c1be8b25b515c021f244551e2002e7;hpb=d56946881b61c6eed503c7266840ea307bddafdd;p=pspp-builds.git diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index 40b0a7ab..bdce53c5 100644 --- 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")) - return expr_allocate_number (e, get_viewlength ()); + return expr_allocate_number (e, settings_get_viewlength ()); 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)); @@ -1260,7 +1260,7 @@ parse_function (struct lexer *lexer, struct expression *e) 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) {