X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fexpressions%2Fevaluate.c;h=1736ab80e8f8b942832bf490875b2568279fb87f;hb=724be9e4720784aafeac395b3f6df47a89fc5e07;hp=6ac0572185619dc83977cb81655957cf437f6581;hpb=97cb2acd10045679031d3abe971f7896de575790;p=pspp
diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 6ac0572185..1736ab80e8 100644
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -15,15 +15,17 @@
along with this program. If not, see . */
#include
-#include "evaluate.h"
+
+#include "language/expressions/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)
@@ -153,7 +155,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if ( ds == NULL )
{
- ds = create_dataset ();
+ ds = dataset_create (NULL, "");
d = dataset_dict (ds);
}
@@ -172,7 +174,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))
@@ -240,8 +242,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);