projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reform string library.
[pspp-builds.git]
/
src
/
language
/
expressions
/
optimize.c
diff --git
a/src/language/expressions/optimize.c
b/src/language/expressions/optimize.c
index 9f9626bc06329c95a3b75312eb60b7aa149d8e8b..c5ba6224dfd0f07c00db74c0bf8e00415fa9d15f 100644
(file)
--- a/
src/language/expressions/optimize.c
+++ b/
src/language/expressions/optimize.c
@@
-141,9
+141,9
@@
static double get_number_arg (struct composite_node *, size_t arg_idx);
static double *get_number_args (struct composite_node *,
size_t arg_idx, size_t arg_cnt,
struct expression *);
static double *get_number_args (struct composite_node *,
size_t arg_idx, size_t arg_cnt,
struct expression *);
-static struct
fixed_
string get_string_arg (struct composite_node *,
+static struct
sub
string get_string_arg (struct composite_node *,
size_t arg_idx);
size_t arg_idx);
-static struct
fixed_
string *get_string_args (struct composite_node *,
+static struct
sub
string *get_string_args (struct composite_node *,
size_t arg_idx, size_t arg_cnt,
struct expression *);
static const struct fmt_spec *get_format_arg (struct composite_node *,
size_t arg_idx, size_t arg_cnt,
struct expression *);
static const struct fmt_spec *get_format_arg (struct composite_node *,
@@
-187,7
+187,7
@@
get_number_args (struct composite_node *c, size_t arg_idx, size_t arg_cnt,
return d;
}
return d;
}
-static struct
fixed_
string
+static struct
sub
string
get_string_arg (struct composite_node *c, size_t arg_idx)
{
assert (arg_idx < c->arg_cnt);
get_string_arg (struct composite_node *c, size_t arg_idx)
{
assert (arg_idx < c->arg_cnt);
@@
-195,11
+195,11
@@
get_string_arg (struct composite_node *c, size_t arg_idx)
return c->args[arg_idx]->string.s;
}
return c->args[arg_idx]->string.s;
}
-static struct
fixed_
string *
+static struct
sub
string *
get_string_args (struct composite_node *c, size_t arg_idx, size_t arg_cnt,
struct expression *e)
{
get_string_args (struct composite_node *c, size_t arg_idx, size_t arg_cnt,
struct expression *e)
{
- struct
fixed_
string *s;
+ struct
sub
string *s;
size_t i;
s = pool_alloc (e->expr_pool, sizeof *s * arg_cnt);
size_t i;
s = pool_alloc (e->expr_pool, sizeof *s * arg_cnt);
@@
-236,7
+236,7
@@
emit_number (struct expression *e, double n)
}
static void
}
static void
-emit_string (struct expression *e, struct
fixed_
string s)
+emit_string (struct expression *e, struct
sub
string s)
{
allocate_aux (e, OP_string)->string = s;
}
{
allocate_aux (e, OP_string)->string = s;
}