projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change "union value" to dynamically allocate long strings.
[pspp]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index 91b9c84249b76c0e7d799ad7dc089f66874c314a..d5f5f3871744252ac9f92ad61ec0e78f9a0b73ad 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-15,13
+15,13
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "
priv
ate.h"
+#include "
evalu
ate.h"
#include <ctype.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <ctype.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
-#include
"helpers.h"
-#include
"evaluate.h"
+#include
<language/expressions/helpers.h>
+#include
<language/expressions/private.h>
#include <libpspp/pool.h>
#include "xalloc.h"
#include <libpspp/pool.h>
#include "xalloc.h"
@@
-98,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);
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
, ' '
);
}
\f
#include <language/lexer/lexer.h>
}
\f
#include <language/lexer/lexer.h>
@@
-170,14
+170,14
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
}
if (c == NULL)
}
if (c == NULL)
- c = case_create (dict_get_
next_value_idx
(d));
+ c = case_create (dict_get_
proto
(d));
else
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
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);
var_get_width (v));
lex_get (lexer);