X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fevaluate.c;h=dea521a8fa25554638644866a915c5804720c937;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=91b9c84249b76c0e7d799ad7dc089f66874c314a;hpb=9a331fe64eb814ae5c1322e21717a04fb254bf65;p=pspp-builds.git
diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 91b9c842..dea521a8 100644
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -15,13 +15,14 @@
along with this program. If not, see . */
#include
-#include "private.h"
+#include "evaluate.h"
#include
#include
#include
-#include "helpers.h"
-#include "evaluate.h"
+#include
+#include
+#include
#include
#include "xalloc.h"
@@ -98,7 +99,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
@@ -170,16 +171,12 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
}
if (c == NULL)
- c = case_create (dict_get_next_value_idx (d));
+ c = case_create (dict_get_proto (d));
else
- c = 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)),
- var_get_width (v));
- lex_get (lexer);
+ if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
+ NOT_REACHED ();
if (!lex_force_match (lexer, ')'))
goto done;