X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fevaluate.c;h=09f237e0cd4e3664a0a57353ce2b0f0d2292becf;hb=d8dcf1b64a1e3fc0bcb9455564308191e0a5c642;hp=79b52159528d020d065034f1ef5c0a3f6dc59ec6;hpb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;p=pspp
diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 79b5215952..09f237e0cd 100644
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 2012 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
@@ -15,15 +15,18 @@
along with this program. If not, see . */
#include
+
+#include "language/expressions/private.h"
#include "evaluate.h"
#include
-#include
-#include
-#include
-#include
-#include
-#include
+
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "language/expressions/helpers.h"
+#include "language/lexer/value-parser.h"
+#include "libpspp/pool.h"
+#include "output/driver.h"
#include "xalloc.h"
@@ -48,7 +51,7 @@ expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
for (;;)
{
- assert (op < e->ops + e->op_cnt);
+ assert (op < e->ops + e->n_ops);
switch (op++->operation)
{
case OP_number:
@@ -102,96 +105,147 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
buf_copy_rpad (dst, dst_size, s.string, s.length, ' ');
}
-#include
-#include
+#include "language/lexer/lexer.h"
+#include "language/command.h"
+
+static bool default_optimize = true;
int
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
{
- bool optimize = true;
+ bool optimize = default_optimize;
int retval = CMD_FAILURE;
bool dump_postfix = false;
+ bool set_defaults = false;
struct ccase *c = NULL;
struct dataset *ds = NULL;
+ char *name = NULL;
+ char *title = NULL;
+
struct expression *expr;
+ struct dictionary *d = NULL;
+
for (;;)
{
- struct dictionary *d = NULL;
if (lex_match_id (lexer, "NOOPTIMIZE"))
- optimize = 0;
+ optimize = false;
+ else if (lex_match_id (lexer, "OPTIMIZE"))
+ optimize = true;
else if (lex_match_id (lexer, "POSTFIX"))
dump_postfix = 1;
+ else if (lex_match_id (lexer, "SET"))
+ set_defaults = true;
else if (lex_match (lexer, T_LPAREN))
{
- char name[VAR_NAME_LEN + 1];
struct variable *v;
- size_t old_value_cnt;
- int width;
if (!lex_force_id (lexer))
goto done;
- strcpy (name, lex_tokcstr (lexer));
+ name = xstrdup (lex_tokcstr (lexer));
lex_get (lexer);
if (!lex_force_match (lexer, T_EQUALS))
goto done;
+ union value value;
+ int width;
if (lex_is_number (lexer))
- width = 0;
+ {
+ width = 0;
+ value.f = lex_number (lexer);
+ lex_get (lexer);
+ }
+ else if (lex_match_id (lexer, "SYSMIS"))
+ {
+ width = 0;
+ value.f = SYSMIS;
+ }
else if (lex_is_string (lexer))
- width = ss_length (lex_tokss (lexer));
+ {
+ width = ss_length (lex_tokss (lexer));
+ value.s = CHAR_CAST (uint8_t *, ss_xstrdup (lex_tokss (lexer)));
+ lex_get (lexer);
+ }
else
{
lex_error (lexer, _("expecting number or string"));
goto done;
}
- if ( ds == NULL )
+ if (ds == NULL)
{
- ds = create_dataset ();
+ ds = dataset_create (NULL, "");
d = dataset_dict (ds);
}
- old_value_cnt = dict_get_next_value_idx (d);
v = dict_create_var (d, name, width);
if (v == NULL)
{
msg (SE, _("Duplicate variable name %s."), name);
+ value_destroy (&value, width);
goto done;
}
+ free (name);
+ name = NULL;
+
+ if (lex_match_id (lexer, "MISSING"))
+ {
+ struct missing_values mv;
+ mv_init (&mv, width);
+ mv_add_value (&mv, &value);
+ var_set_missing_values (v, &mv);
+ mv_destroy (&mv);
+ }
if (c == NULL)
c = case_create (dict_get_proto (d));
else
c = case_unshare_and_resize (c, dict_get_proto (d));
-
- if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
- NOT_REACHED ();
+ value_swap (case_data_rw (c, v), &value);
+ value_destroy (&value, width);
if (!lex_force_match (lexer, T_RPAREN))
goto done;
}
+ else if (lex_match_id (lexer, "VECTOR"))
+ {
+ struct variable **vars;
+ size_t n;
+ dict_get_vars_mutable (d, &vars, &n, 0);
+ dict_create_vector_assert (d, "V", vars, n);
+ free (vars);
+ }
else
break;
}
- if (lex_token (lexer) != T_SLASH)
+
+ if (set_defaults)
{
- lex_force_match (lexer, T_SLASH);
+ retval = CMD_SUCCESS;
+ default_optimize = optimize;
goto done;
}
- lex_get (lexer);
+ if (!lex_force_match (lexer, T_SLASH))
+ goto done;
+
+ for (size_t i = 1; ; i++)
+ if (lex_next_token (lexer, i) == T_ENDCMD)
+ {
+ title = lex_next_representation (lexer, 0, i - 1);
+ break;
+ }
expr = expr_parse_any (lexer, ds, optimize);
if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS)
{
if (expr != NULL)
expr_free (expr);
- printf ("error\n");
+ output_log ("%s => error", title);
goto done;
}
@@ -201,31 +255,29 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
switch (expr->type)
{
case OP_number:
+ case OP_num_vec_elem:
{
double d = expr_evaluate_num (expr, c, 0);
if (d == SYSMIS)
- printf ("sysmis\n");
+ output_log ("%s => sysmis", title);
else
- printf ("%.2f\n", d);
+ output_log ("%s => %.2f", title, d);
}
break;
case OP_boolean:
{
double b = expr_evaluate_num (expr, c, 0);
- printf ("%s\n",
- b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
+ output_log ("%s => %s", title,
+ b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
}
break;
case OP_string:
{
- struct substring s;
- expr_evaluate (expr, c, 0, &s);
-
- putchar ('"');
- fwrite (s.string, s.length, 1, stdout);
- puts ("\"");
+ struct substring out;
+ expr_evaluate (expr, c, 0, &out);
+ output_log ("%s => \"%.*s\"", title, (int) out.length, out.string);
break;
}
@@ -237,68 +289,73 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
retval = CMD_SUCCESS;
done:
- if (ds)
- destroy_dataset (ds);
+ dataset_destroy (ds);
case_unref (c);
+ free (name);
+ free (title);
+
return retval;
}
void
expr_debug_print_postfix (const struct expression *e)
{
- size_t i;
+ struct string s = DS_EMPTY_INITIALIZER;
- for (i = 0; i < e->op_cnt; i++)
+ for (size_t i = 0; i < e->n_ops; i++)
{
union operation_data *op = &e->ops[i];
if (i > 0)
- putc (' ', stderr);
+ ds_put_byte (&s, ' ');
switch (e->op_types[i])
{
case OP_operation:
if (op->operation == OP_return_number)
- printf ("return_number");
+ ds_put_cstr (&s, "return_number");
else if (op->operation == OP_return_string)
- printf ("return_string");
+ ds_put_cstr (&s, "return_string");
else if (is_function (op->operation))
- printf ("%s", operations[op->operation].prototype);
+ ds_put_format (&s, "%s", operations[op->operation].prototype);
else if (is_composite (op->operation))
- printf ("%s", operations[op->operation].name);
+ ds_put_format (&s, "%s", operations[op->operation].name);
else
- printf ("%s:", operations[op->operation].name);
+ ds_put_format (&s, "%s:", operations[op->operation].name);
break;
case OP_number:
if (op->number != SYSMIS)
- printf ("n<%g>", op->number);
+ ds_put_format (&s, "n<%g>", op->number);
else
- printf ("n");
+ ds_put_cstr (&s, "n");
break;
case OP_string:
- printf ("s<%.*s>",
- (int) op->string.length,
- op->string.string != NULL ? op->string.string : "");
+ ds_put_cstr (&s, "s<");
+ ds_put_substring (&s, op->string);
+ ds_put_byte (&s, '>');
break;
case OP_format:
{
char str[FMT_STRING_LEN_MAX + 1];
fmt_to_string (op->format, str);
- printf ("f<%s>", str);
+ ds_put_format (&s, "f<%s>", str);
}
break;
case OP_variable:
- printf ("v<%s>", var_get_name (op->variable));
+ ds_put_format (&s, "v<%s>", var_get_name (op->variable));
break;
case OP_vector:
- printf ("vec<%s>", vector_get_name (op->vector));
+ ds_put_format (&s, "vec<%s>", vector_get_name (op->vector));
break;
case OP_integer:
- printf ("i<%d>", op->integer);
+ ds_put_format (&s, "i<%d>", op->integer);
+ break;
+ case OP_expr_node:
+ ds_put_cstr (&s, "expr_node");
break;
default:
NOT_REACHED ();
}
}
- printf ("\n");
+ output_log_nocopy (ds_steal_cstr (&s));
}