/* 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
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
+
+#include "xalloc.h"
\f
/* Declarations. */
{
/* 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;
msg_disable ();
if ((*node)->type == OP_format
&& fmt_check_input (&(*node)->format.f)
- && fmt_check_type_compat (&(*node)->format.f, VAR_NUMERIC))
+ && fmt_check_type_compat (&(*node)->format.f, VAL_NUMERIC))
{
msg_enable ();
if (do_coercion)
msg_disable ();
if ((*node)->type == OP_format
&& fmt_check_output (&(*node)->format.f)
- && fmt_check_type_compat (&(*node)->format.f, VAR_NUMERIC))
+ && fmt_check_type_compat (&(*node)->format.f, VAL_NUMERIC))
{
msg_enable ();
if (do_coercion)
}
if (op_count > 1 && chain_warning != NULL)
- msg (SW, chain_warning);
+ msg (SW, "%s", chain_warning);
return node;
}
+ 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));
|| !lex_match (lexer, ')'))
return NULL;
- return expr_allocate_binary (e, (vector_get_type (vector) == VAR_NUMERIC
+ return expr_allocate_binary (e, (vector_get_type (vector) == VAL_NUMERIC
? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR),
element, expr_allocate_vector (e, vector));
}
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)
{