X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fexpressions%2Fevaluate.c;h=bd3f46def36a81f922e97c61354c1591d72c44f4;hb=48b5d1d1f17f8059c7e91246b3d47ff3122a8f9f;hp=6ac0572185619dc83977cb81655957cf437f6581;hpb=97cb2acd10045679031d3abe971f7896de575790;p=pspp
diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 6ac0572185..bd3f46def3 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, 2011 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,17 @@
along with this program. If not, see . */
#include
+
#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/expressions/private.h"
+#include "language/lexer/value-parser.h"
+#include "libpspp/pool.h"
#include "xalloc.h"
@@ -102,8 +104,8 @@ 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"
int
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
@@ -130,7 +132,6 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
else if (lex_match (lexer, T_LPAREN))
{
struct variable *v;
- size_t old_value_cnt;
int width;
if (!lex_force_id (lexer))
@@ -153,11 +154,10 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
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)
{
@@ -172,7 +172,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
else
c = case_unshare_and_resize (c, dict_get_proto (d));
- if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
+ if (!parse_value (lexer, case_data_rw (c, v), v))
NOT_REACHED ();
if (!lex_force_match (lexer, T_RPAREN))
@@ -181,13 +181,9 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
else
break;
}
- if (lex_token (lexer) != T_SLASH)
- {
- lex_force_match (lexer, T_SLASH);
+
+ if (!lex_force_match (lexer, T_SLASH))
goto done;
- }
-
- lex_get (lexer);
expr = expr_parse_any (lexer, ds, optimize);
if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS)
@@ -240,8 +236,7 @@ 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);