X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Finpt-pgm.c;h=ef9c3646440cc889c8d0fcd2fee0e93ee927bd28;hb=1f053e35b27208cad9bec322c67ba4ef022c1dc1;hp=0cbf66f325569d54b828c98eac639c2124ac029b;hpb=06f9ee45954e5e71fa7f6262dbf37defa1dbf996;p=pspp-builds.git

diff --git a/src/inpt-pgm.c b/src/inpt-pgm.c
index 0cbf66f3..ef9c3646 100644
--- a/src/inpt-pgm.c
+++ b/src/inpt-pgm.c
@@ -14,8 +14,8 @@
 
    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"
@@ -25,9 +25,10 @@
 #include "case.h"
 #include "command.h"
 #include "data-list.h"
-#include "dfm.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"
@@ -64,8 +65,7 @@ cmd_input_program (void)
 
   /* 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 ();
 }
@@ -115,9 +115,6 @@ cmd_end_input_program (void)
   /* 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 ();
 }
 
@@ -312,7 +309,7 @@ struct reread_trns
   {
     struct trns_header h;
 
-    struct file_handle *handle;	/* File to move file pointer back on. */
+    struct dfm_reader *reader;	/* File to move file pointer back on. */
     struct expression *column;	/* Column to reset file pointer to. */
   };
 
@@ -320,16 +317,11 @@ struct reread_trns
 int
 cmd_reread (void)
 {
-  /* File to be re-read. */
-  struct file_handle *h;
-  
-  /* Expression for column to set file pointer to. */
-  struct expression *e;
+  struct file_handle *fh;       /* File to be re-read. */
+  struct expression *e;         /* Expression for column to set. */
+  struct reread_trns *t;        /* Created transformation. */
 
-  /* Created transformation. */
-  struct reread_trns *t;
-
-  h = default_handle;
+  fh = default_handle;
   e = NULL;
   while (token != '.')
     {
@@ -344,15 +336,15 @@ cmd_reread (void)
 	      return CMD_FAILURE;
 	    }
 	  
-	  e = expr_parse (EXPR_NUMERIC);
+	  e = expr_parse (default_dict, EXPR_NUMBER);
 	  if (!e)
 	    return CMD_FAILURE;
 	}
       else if (lex_match_id ("FILE"))
 	{
 	  lex_match ('=');
-          h = fh_parse_file_handle ();
-	  if (h == NULL)
+          fh = fh_parse ();
+	  if (fh == NULL)
 	    {
 	      expr_free (e);
 	      return CMD_FAILURE;
@@ -369,7 +361,7 @@ cmd_reread (void)
   t = xmalloc (sizeof *t);
   t->h.proc = reread_trns_proc;
   t->h.free = reread_trns_free;
-  t->handle = h;
+  t->reader = dfm_open_reader (fh);
   t->column = e;
   add_transformation ((struct trns_header *) t);
 
@@ -384,29 +376,29 @@ reread_trns_proc (struct trns_header * pt, struct ccase * c,
   struct reread_trns *t = (struct reread_trns *) pt;
 
   if (t->column == NULL)
-    dfm_reread_record (t->handle, 1);
+    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->handle, 1);
+	  dfm_reread_record (t->reader, 1);
 	}
       else
-	dfm_reread_record (t->handle, column.f);
+	dfm_reread_record (t->reader, column);
     }
   return -1;
 }
 
 /* Frees a REREAD transformation. */
 static void
-reread_trns_free (struct trns_header * t)
+reread_trns_free (struct trns_header *t_)
 {
-  expr_free (((struct reread_trns *) t)->column);
+  struct reread_trns *t = (struct reread_trns *) t_;
+  expr_free (t->column);
+  dfm_close_reader (t->reader);
 }
 
 /* Parses END FILE command. */