projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subscript fixes; added free functions
[pspp]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index 39b1ac4d2a554a3efe4e99277d037b865d382e77..9398b41cd239b285061cffca4522e87f806d15ca 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-34,7
+34,7
@@
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
union operation_data *op = e->ops;
double *ns = e->number_stack;
union operation_data *op = e->ops;
double *ns = e->number_stack;
- struct
fixed_
string *ss = e->string_stack;
+ struct
sub
string *ss = e->string_stack;
assert ((c != NULL) == (e->dict != NULL));
pool_clear (e->eval_pool);
assert ((c != NULL) == (e->dict != NULL));
pool_clear (e->eval_pool);
@@
-51,7
+51,7
@@
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
case OP_string:
{
case OP_string:
{
- const struct
fixed_
string *s = &op++->string;
+ const struct
sub
string *s = &op++->string;
*ss++ = copy_string (e, s->string, s->length);
}
break;
*ss++ = copy_string (e, s->string, s->length);
}
break;
@@
-61,7
+61,7
@@
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
return;
case OP_return_string:
return;
case OP_return_string:
- *(struct
fixed_
string *) result = ss[-1];
+ *(struct
sub
string *) result = ss[-1];
return;
#include "evaluate.inc"
return;
#include "evaluate.inc"
@@
-88,7
+88,7
@@
void
expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
char *dst, size_t dst_size)
{
expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
char *dst, size_t dst_size)
{
- struct
fixed_
string s;
+ struct
sub
string s;
assert (e->type == OP_string);
assert ((dst == NULL) == (dst_size == 0));
assert (e->type == OP_string);
assert ((dst == NULL) == (dst_size == 0));
@@
-140,7
+140,7
@@
cmd_debug_evaluate (void)
else if (token == T_STRING)
{
width = ds_length (&tokstr);
else if (token == T_STRING)
{
width = ds_length (&tokstr);
- fprintf (stderr, "(%s = \"%.2s\")", name, ds_c
_
str (&tokstr));
+ fprintf (stderr, "(%s = \"%.2s\")", name, ds_cstr (&tokstr));
}
else
{
}
else
{
@@
-223,7
+223,7
@@
cmd_debug_evaluate (void)
case OP_string:
{
case OP_string:
{
- struct
fixed_
string s;
+ struct
sub
string s;
expr_evaluate (expr, c, 0, &s);
fputc ('"', stderr);
expr_evaluate (expr, c, 0, &s);
fputc ('"', stderr);