Changed DFM from open-at-first-access to explicit-open. Before,

[pspp-builds.git] / src / inpt-pgm.c

diff --git a/src/inpt-pgm.c b/src/inpt-pgm.c
index dc08f346a9704b7d4dc60f593aa40f1195f5a417..ee2fd7cb1302c0a495a0ef26ed59a00a9e68314f 100644 (file)
--- a/src/inpt-pgm.c
+++ b/src/inpt-pgm.c
@@ -59,8 +59,6 @@ static trns_free_func reread_trns_free;
 int
 cmd_input_program (void)
 {
-  lex_match_id ("INPUT");
-  lex_match_id ("PROGRAM");
   discard_variables ();
 
   /* FIXME: we shouldn't do this here, but I'm afraid that other
@@ -77,10 +75,6 @@ cmd_end_input_program (void)
   struct input_program_pgm *inp;
   size_t i;
 
-  lex_match_id ("END");
-  lex_match_id ("INPUT");
-  lex_match_id ("PROGRAM");
-
   if (!case_source_is_class (vfm_source, &input_program_source_class))
     {
       msg (SE, _("No matching INPUT PROGRAM command."));
@@ -287,9 +281,6 @@ cmd_end_case (void)
 {
   struct trns_header *t;
 
-  lex_match_id ("END");
-  lex_match_id ("CASE");
-
   if (!case_source_is_class (vfm_source, &input_program_source_class))
     {
       msg (SE, _("This command may only be executed between INPUT PROGRAM "
@@ -336,8 +327,6 @@ cmd_reread (void)
   /* Created transformation. */
   struct reread_trns *t;
 
-  lex_match_id ("REREAD");
-
   h = default_handle;
   e = NULL;
   while (token != '.')
@@ -360,14 +349,8 @@ cmd_reread (void)
       else if (lex_match_id ("FILE"))
        {
          lex_match ('=');
-         if (token != T_ID)
-           {
-             lex_error (_("expecting file handle name"));
-             expr_free (e);
-             return CMD_FAILURE;
-           }
-         h = fh_get_handle_by_name (tokid);
-         if (!h)
+          h = fh_parse_file_handle ();
+         if (h == NULL)
            {
              expr_free (e);
              return CMD_FAILURE;
@@ -430,9 +413,6 @@ cmd_end_file (void)
 {
   struct trns_header *t;
 
-  lex_match_id ("END");
-  lex_match_id ("FILE");
-
   if (!case_source_is_class (vfm_source, &input_program_source_class))
     {
       msg (SE, _("This command may only be executed between INPUT PROGRAM "