-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "private.h"
+#include "evaluate.h"
#include <ctype.h>
-#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
-#include "helpers.h"
-#include "evaluate.h"
+#include <language/expressions/helpers.h>
+#include <language/expressions/private.h>
+#include <language/lexer/value-parser.h>
#include <libpspp/pool.h>
+#include "xalloc.h"
+
static void
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
void *result)
{
+ struct dataset *ds = e->ds;
union operation_data *op = e->ops;
double *ns = e->number_stack;
- struct fixed_string *ss = e->string_stack;
+ struct substring *ss = e->string_stack;
+
+ /* Without a dictionary/dataset, the expression can't refer to variables,
+ and you don't need to specify a case when you evaluate the
+ expression. With a dictionary/dataset, the expression can refer
+ to variables, so you must specify a case when you evaluate the
+ expression. */
+ assert ((c != NULL) == (e->ds != NULL));
- assert ((c != NULL) == (e->dict != NULL));
pool_clear (e->eval_pool);
for (;;)
case OP_string:
{
- const struct fixed_string *s = &op++->string;
+ const struct substring *s = &op++->string;
*ss++ = copy_string (e, s->string, s->length);
}
break;
case OP_return_number:
- *(double *) result = finite (ns[-1]) ? ns[-1] : SYSMIS;
+ *(double *) result = isfinite (ns[-1]) ? ns[-1] : SYSMIS;
return;
case OP_return_string:
- *(struct fixed_string *) result = ss[-1];
+ *(struct substring *) result = ss[-1];
return;
#include "evaluate.inc"
-
+
default:
- abort ();
+ NOT_REACHED ();
}
}
}
return d;
}
-
-
void
expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
- char *dst, size_t dst_size)
+ char *dst, size_t dst_size)
{
- struct fixed_string s;
+ struct substring s;
assert (e->type == OP_string);
assert ((dst == NULL) == (dst_size == 0));
expr_evaluate (e, c, case_idx, &s);
-
- copy_mangle (dst, dst_size, s.string, s.length);
+
+ buf_copy_rpad (dst, dst_size, s.string, s.length, ' ');
}
\f
#include <language/lexer/lexer.h>
#include <language/command.h>
int
-cmd_debug_evaluate (void)
+cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
{
bool optimize = true;
int retval = CMD_FAILURE;
bool dump_postfix = false;
- struct dictionary *d = NULL;
+
struct ccase *c = NULL;
+ struct dataset *ds = NULL;
+
struct expression *expr;
- for (;;)
+ for (;;)
{
- if (lex_match_id ("NOOPTIMIZE"))
+ struct dictionary *d = NULL;
+ if (lex_match_id (lexer, "NOOPTIMIZE"))
optimize = 0;
- else if (lex_match_id ("POSTFIX"))
+ else if (lex_match_id (lexer, "POSTFIX"))
dump_postfix = 1;
- else if (lex_match ('('))
+ else if (lex_match (lexer, '('))
{
- char name[LONG_NAME_LEN + 1];
+ char name[VAR_NAME_LEN + 1];
struct variable *v;
size_t old_value_cnt;
int width;
- if (!lex_force_id ())
+ if (!lex_force_id (lexer))
goto done;
- strcpy (name, tokid);
+ strcpy (name, lex_tokid (lexer));
- lex_get ();
- if (!lex_force_match ('='))
+ lex_get (lexer);
+ if (!lex_force_match (lexer, '='))
goto done;
- if (lex_is_number ())
+ if (lex_is_number (lexer))
{
width = 0;
- fprintf (stderr, "(%s = %.2f)", name, tokval);
+ fprintf (stderr, "(%s = %.2f)", name, lex_tokval (lexer));
}
- else if (token == T_STRING)
+ else if (lex_token (lexer) == T_STRING)
{
- width = ds_length (&tokstr);
- fprintf (stderr, "(%s = \"%.2s\")", name, ds_c_str (&tokstr));
+ width = ds_length (lex_tokstr (lexer));
+ fprintf (stderr, "(%s = \"%.2s\")", name, ds_cstr (lex_tokstr (lexer)));
}
else
{
- lex_error (_("expecting number or string"));
+ lex_error (lexer, _("expecting number or string"));
goto done;
}
- if (d == NULL)
- d = dict_create ();
-
+ if ( ds == NULL )
+ {
+ ds = create_dataset ();
+ d = dataset_dict (ds);
+ }
+
old_value_cnt = dict_get_next_value_idx (d);
v = dict_create_var (d, name, width);
if (v == NULL)
goto done;
}
- if (c == NULL)
- {
- c = xmalloc (sizeof *c);
- case_nullify (c);
- }
- case_resize (c, old_value_cnt, dict_get_next_value_idx (d));
-
- if (lex_is_number ())
- case_data_rw (c, v->fv)->f = tokval;
+ if (c == NULL)
+ c = case_create (dict_get_proto (d));
else
- memcpy (case_data_rw (c, v->fv)->s, ds_data (&tokstr),
- v->width);
- lex_get ();
+ c = case_unshare_and_resize (c, dict_get_proto (d));
- if (!lex_force_match (')'))
+ if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
+ NOT_REACHED ();
+
+ if (!lex_force_match (lexer, ')'))
goto done;
}
- else
+ else
break;
}
- if (token != '/')
+ if (lex_token (lexer) != '/')
{
- lex_force_match ('/');
+ lex_force_match (lexer, '/');
goto done;
}
- if (d != NULL)
- fprintf (stderr, "; ");
- fprintf (stderr, "%s => ", lex_rest_of_line (NULL));
- lex_get ();
- expr = expr_parse_any (d, optimize);
- if (!expr || lex_end_of_command () != CMD_SUCCESS)
+ if ( ds != NULL )
+ fprintf(stderr, "; ");
+ fprintf (stderr, "%s => ", lex_rest_of_line (lexer));
+ lex_get (lexer);
+
+ expr = expr_parse_any (lexer, ds, optimize);
+ if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS)
{
if (expr != NULL)
expr_free (expr);
goto done;
}
- if (dump_postfix)
+ if (dump_postfix)
expr_debug_print_postfix (expr);
- else
- switch (expr->type)
+ else
+ switch (expr->type)
{
- case OP_number:
+ case OP_number:
{
double d = expr_evaluate_num (expr, c, 0);
if (d == SYSMIS)
fprintf (stderr, "sysmis\n");
else
- fprintf (stderr, "%.2f\n", d);
+ fprintf (stderr, "%.2f\n", d);
}
break;
-
- case OP_boolean:
+
+ case OP_boolean:
{
double b = expr_evaluate_num (expr, c, 0);
fprintf (stderr, "%s\n",
- b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
+ b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
}
break;
- case OP_string:
+ case OP_string:
{
- struct fixed_string s;
+ struct substring s;
expr_evaluate (expr, c, 0, &s);
fputc ('"', stderr);
fwrite (s.string, s.length, 1, stderr);
fputs ("\"\n", stderr);
- break;
+ break;
}
default:
- assert (0);
+ NOT_REACHED ();
}
expr_free (expr);
retval = CMD_SUCCESS;
done:
- if (c != NULL)
- {
- case_destroy (c);
- free (c);
- }
- dict_destroy (d);
+ if (ds)
+ destroy_dataset (ds);
+
+ case_unref (c);
+
return retval;
}
void
-expr_debug_print_postfix (const struct expression *e)
+expr_debug_print_postfix (const struct expression *e)
{
size_t i;
- for (i = 0; i < e->op_cnt; i++)
+ for (i = 0; i < e->op_cnt; i++)
{
union operation_data *op = &e->ops[i];
if (i > 0)
putc (' ', stderr);
- switch (e->op_types[i])
+ switch (e->op_types[i])
{
case OP_operation:
if (op->operation == OP_return_number)
fprintf (stderr, "return_number");
else if (op->operation == OP_return_string)
fprintf (stderr, "return_string");
- else if (is_function (op->operation))
+ else if (is_function (op->operation))
fprintf (stderr, "%s", operations[op->operation].prototype);
- else if (is_composite (op->operation))
+ else if (is_composite (op->operation))
fprintf (stderr, "%s", operations[op->operation].name);
else
fprintf (stderr, "%s:", operations[op->operation].name);
op->string.string != NULL ? op->string.string : "");
break;
case OP_format:
- fprintf (stderr, "f<%s%d.%d>",
- formats[op->format->type].name,
- op->format->w, op->format->d);
+ {
+ char str[FMT_STRING_LEN_MAX + 1];
+ fmt_to_string (op->format, str);
+ fprintf (stderr, "f<%s>", str);
+ }
break;
case OP_variable:
- fprintf (stderr, "v<%s>", op->variable->name);
+ fprintf (stderr, "v<%s>", var_get_name (op->variable));
break;
case OP_vector:
- fprintf (stderr, "vec<%s>", op->vector->name);
+ fprintf (stderr, "vec<%s>", vector_get_name (op->vector));
break;
case OP_integer:
fprintf (stderr, "i<%d>", op->integer);
break;
default:
- abort ();
- }
+ NOT_REACHED ();
+ }
}
fprintf (stderr, "\n");
}
projects / pspp-builds.git / blobdiff