X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fevaluate.c;h=d5f5f3871744252ac9f92ad61ec0e78f9a0b73ad;hb=5c3291dc396b795696e94f47780308fd7ace6fc4;hp=6e3315c385a40ad45206ef2d6f5bc2880b2b795b;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git
diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 6e3315c3..d5f5f387 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 Free Software Foundation, Inc.
+ 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
@@ -15,16 +15,17 @@
along with this program. If not, see . */
#include
-#include "private.h"
+#include "evaluate.h"
#include
-#include
#include
#include
-#include "helpers.h"
-#include "evaluate.h"
+#include
+#include
#include
+#include "xalloc.h"
+
static void
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
void *result)
@@ -62,7 +63,7 @@ expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
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:
@@ -97,7 +98,7 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
assert ((dst == NULL) == (dst_size == 0));
expr_evaluate (e, c, case_idx, &s);
- buf_copy_rpad (dst, dst_size, s.string, s.length);
+ buf_copy_rpad (dst, dst_size, s.string, s.length, ' ');
}
#include
@@ -125,7 +126,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
dump_postfix = 1;
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;
@@ -156,7 +157,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if ( ds == NULL )
{
- ds = create_dataset (NULL, NULL);
+ ds = create_dataset ();
d = dataset_dict (ds);
}
@@ -169,17 +170,14 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
}
if (c == NULL)
- {
- c = xmalloc (sizeof *c);
- case_create (c, dict_get_next_value_idx (d));
- }
+ c = case_create (dict_get_proto (d));
else
- case_resize (c, dict_get_next_value_idx (d));
+ c = case_unshare_and_resize (c, dict_get_proto (d));
if (lex_is_number (lexer))
case_data_rw (c, v)->f = lex_tokval (lexer);
else
- memcpy (case_data_rw (c, v)->s, ds_data (lex_tokstr (lexer)),
+ memcpy (case_str_rw (c, v), ds_data (lex_tokstr (lexer)),
var_get_width (v));
lex_get (lexer);
@@ -254,11 +252,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if (ds)
destroy_dataset (ds);
- if (c != NULL)
- {
- case_destroy (c);
- free (c);
- }
+ case_unref (c);
return retval;
}