[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/inpt-pgm.c
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] Changes to pspp/src/inpt-pgm.c |
Date: |
Tue, 01 Mar 2005 03:16:32 -0500 |
Index: pspp/src/inpt-pgm.c
diff -u pspp/src/inpt-pgm.c:1.16 pspp/src/inpt-pgm.c:1.17
--- pspp/src/inpt-pgm.c:1.16 Mon Nov 15 09:51:22 2004
+++ pspp/src/inpt-pgm.c Tue Mar 1 08:16:15 2005
@@ -28,7 +28,7 @@
#include "dfm-read.h"
#include "dictionary.h"
#include "error.h"
-#include "expr.h"
+#include "expressions/public.h"
#include "file-handle.h"
#include "lexer.h"
#include "misc.h"
@@ -340,7 +340,7 @@
return CMD_FAILURE;
}
- e = expr_parse (EXPR_NUMERIC);
+ e = expr_parse (default_dict, EXPR_NUMBER);
if (!e)
return CMD_FAILURE;
}
@@ -383,17 +383,15 @@
dfm_reread_record (t->reader, 1);
else
{
- union value column;
-
- expr_evaluate (t->column, c, case_num, &column);
- if (!finite (column.f) || column.f < 1)
+ double column = expr_evaluate_num (t->column, c, case_num);
+ if (!finite (column) || column < 1)
{
msg (SE, _("REREAD: Column numbers must be positive finite "
"numbers. Column set to 1."));
dfm_reread_record (t->reader, 1);
}
else
- dfm_reread_record (t->reader, column.f);
+ dfm_reread_record (t->reader, column);
}
return -1;
}
- [Pspp-cvs] Changes to pspp/src/inpt-pgm.c,
Ben Pfaff <=