projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch #5653, which adds callbacks to dataset whenever its dictionary or
[pspp-builds.git]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index 1cf73ed713096011b0e2b36d483fa4d7f07dd119..2498b0945528c26bff216e5b2a6c50c91981e715 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
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
@@
-156,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)
@@
-180,9
+179,9
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
case_resize (c, old_value_cnt, dict_get_next_value_idx (d));
if (lex_is_number (lexer))
case_resize (c, old_value_cnt, dict_get_next_value_idx (d));
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)),
+ memcpy (case_data_rw (c, v)->s, ds_data (lex_tokstr (lexer)),
var_get_width (v));
lex_get (lexer);
var_get_width (v));
lex_get (lexer);
@@
-312,7
+311,7
@@
expr_debug_print_postfix (const struct expression *e)
fprintf (stderr, "v<%s>", var_get_name (op->variable));
break;
case OP_vector:
fprintf (stderr, "v<%s>", var_get_name (op->variable));
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);