projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abstract the documents within a dictionary a little better. Thanks to
[pspp-builds.git]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index b597fd4cfe9b820ff24d24589559f88091e24e62..92f0a0e347c6ee3acf966bbfffd7b2044e855025 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+ Copyright (C) 1997-9, 2000, 2006, 2007 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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-90,8
+89,6
@@
expr_evaluate_num (struct expression *e, const struct ccase *c, int case_idx)
return d;
}
return d;
}
-
-
void
expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
char *dst, size_t dst_size)
void
expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
char *dst, size_t dst_size)
@@
-158,13
+155,13
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
lex_error (lexer, _("expecting number or string"));
goto done;
}
lex_error (lexer, _("expecting number or string"));
goto done;
}
-
- if ( ds == NULL )
+
+ if ( ds == NULL )
{
{
- ds = create_dataset ();
+ ds = create_dataset (
NULL, NULL, NULL
);
d = dataset_dict (ds);
}
d = dataset_dict (ds);
}
-
+
old_value_cnt = dict_get_next_value_idx (d);
v = dict_create_var (d, name, width);
if (v == NULL)
old_value_cnt = dict_get_next_value_idx (d);
v = dict_create_var (d, name, width);
if (v == NULL)
@@
-179,13
+176,13
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
case_create (c, dict_get_next_value_idx (d));
}
else
case_create (c, dict_get_next_value_idx (d));
}
else
- case_resize (c,
old_value_cnt,
dict_get_next_value_idx (d));
+ case_resize (c, dict_get_next_value_idx (d));
if (lex_is_number (lexer))
if (lex_is_number (lexer))
- case_data_rw (c, v
->fv
)->f = lex_tokval (lexer);
+ case_data_rw (c, v)->f = lex_tokval (lexer);
else
else
- memcpy (case_data_rw (c, v
->fv
)->s, ds_data (lex_tokstr (lexer)),
- v
->width
);
+ memcpy (case_data_rw (c, v)->s, ds_data (lex_tokstr (lexer)),
+ v
ar_get_width (v)
);
lex_get (lexer);
if (!lex_force_match (lexer, ')'))
lex_get (lexer);
if (!lex_force_match (lexer, ')'))
@@
-202,7
+199,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if ( ds != NULL )
fprintf(stderr, "; ");
if ( ds != NULL )
fprintf(stderr, "; ");
- fprintf (stderr, "%s => ", lex_rest_of_line (lexer
, NULL
));
+ fprintf (stderr, "%s => ", lex_rest_of_line (lexer));
lex_get (lexer);
expr = expr_parse_any (lexer, ds, optimize);
lex_get (lexer);
expr = expr_parse_any (lexer, ds, optimize);
@@
-311,10
+308,10
@@
expr_debug_print_postfix (const struct expression *e)
}
break;
case OP_variable:
}
break;
case OP_variable:
- fprintf (stderr, "v<%s>",
op->variable->name
);
+ fprintf (stderr, "v<%s>",
var_get_name (op->variable)
);
break;
case OP_vector:
break;
case OP_vector:
- fprintf (stderr, "vec<%s>",
op->vector->name
);
+ fprintf (stderr, "vec<%s>",
vector_get_name (op->vector)
);
break;
case OP_integer:
fprintf (stderr, "i<%d>", op->integer);
break;
case OP_integer:
fprintf (stderr, "i<%d>", op->integer);