projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Indicate filtered cases in data sheet.
[pspp-builds.git]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index 6402cc0a2a7c6f7d71f9c09fd5fe110532e22cd3..91b9c84249b76c0e7d799ad7dc089f66874c314a 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007
, 2009
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 published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,7
+18,6
@@
#include "private.h"
#include <ctype.h>
#include "private.h"
#include <ctype.h>
-#include <gsl/gsl_math.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include "helpers.h"
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include "helpers.h"
@@
-64,7
+63,7
@@
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
break;
case OP_return_number:
break;
case OP_return_number:
- *(double *) result =
gsl_
finite (ns[-1]) ? ns[-1] : SYSMIS;
+ *(double *) result =
is
finite (ns[-1]) ? ns[-1] : SYSMIS;
return;
case OP_return_string:
return;
case OP_return_string:
@@
-171,12
+170,9
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
}
if (c == NULL)
}
if (c == NULL)
- {
- c = xmalloc (sizeof *c);
- case_create (c, dict_get_next_value_idx (d));
- }
+ c = case_create (dict_get_next_value_idx (d));
else
else
- case_resize (c, dict_get_next_value_idx (d));
+ c
= c
ase_resize (c, dict_get_next_value_idx (d));
if (lex_is_number (lexer))
case_data_rw (c, v)->f = lex_tokval (lexer);
if (lex_is_number (lexer))
case_data_rw (c, v)->f = lex_tokval (lexer);
@@
-256,11
+252,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if (ds)
destroy_dataset (ds);
if (ds)
destroy_dataset (ds);
- if (c != NULL)
- {
- case_destroy (c);
- free (c);
- }
+ case_unref (c);
return retval;
}
return retval;
}