Merge branch 'master' into rewrite-sheet

[pspp-builds.git] / src / language / expressions / evaluate.c

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 6e3315c385a40ad45206ef2d6f5bc2880b2b795b..fc5b74a3ab57b7727e96226c785640e5a3e8ee43 100644 (file)
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -18,13 +18,14 @@
 #include "private.h"
 
 #include <ctype.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include "helpers.h"
 #include "evaluate.h"
 #include <libpspp/pool.h>
 
+#include "xalloc.h"
+
 static void
 expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
                void *result)
@@ -62,7 +63,7 @@ expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
           break;
 
         case OP_return_number:
-          *(double *) result = finite (ns[-1]) ? ns[-1] : SYSMIS;
+          *(double *) result = isfinite (ns[-1]) ? ns[-1] : SYSMIS;
           return;
 
         case OP_return_string:
@@ -125,7 +126,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
         dump_postfix = 1;
       else if (lex_match (lexer, '('))
         {
-          char name[LONG_NAME_LEN + 1];
+          char name[VAR_NAME_LEN + 1];
           struct variable *v;
           size_t old_value_cnt;
           int width;
@@ -156,7 +157,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
 
          if  ( ds == NULL )
            {
-             ds = create_dataset (NULL, NULL);
+             ds = create_dataset ();
              d = dataset_dict (ds);
            }