You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "error.h"
#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"
/* FIXME: we shouldn't do this here, but I'm afraid that other
code will check the class of vfm_source. */
- vfm_source = create_case_source (&input_program_source_class,
- default_dict, NULL);
+ vfm_source = create_case_source (&input_program_source_class, NULL);
return lex_end_of_command ();
}
/* Put inp into vfm_source for later use. */
vfm_source->aux = inp;
- /* FIXME: we should use create_case_source() here. */
- vfm_source->value_cnt = dict_get_next_value_idx (default_dict);
-
return lex_end_of_command ();
}
return CMD_FAILURE;
}
- e = expr_parse (EXPR_NUMERIC);
+ e = expr_parse (default_dict, EXPR_NUMBER);
if (!e)
return CMD_FAILURE;
}
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;
}