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

[pspp-builds.git] / src / file-type.c

diff --git a/src/file-type.c b/src/file-type.c
index e5e3d81e9fde266feb938c8637abadcc4b598bb8..89a97938668b283793bd2821b404a4eb0c817106 100644 (file)
--- a/src/file-type.c
+++ b/src/file-type.c
@@ -109,7 +109,6 @@ cmd_file_type (void)
   fty->had_rec_type = 0;
   fty->recs_head = fty->recs_tail = NULL;
 
-  lex_match_id ("TYPE");
   if (lex_match_id ("MIXED"))
     fty->type = FTY_MIXED;
   else if (lex_match_id ("GROUPED"))
@@ -270,6 +269,8 @@ cmd_file_type (void)
        }
     }
 
+  if (!dfm_open_for_reading (fty->handle))
+    goto error;
   default_handle = fty->handle;
 
   create_col_var (&fty->record);
@@ -423,9 +424,6 @@ cmd_record_type (void)
        }
     }
 
-  lex_match_id ("RECORD");
-  lex_match_id ("TYPE");
-
   /* Parse record type values. */
   if (lex_match_id ("OTHER"))
     rct->flags |= RCT_OTHER;
@@ -582,8 +580,6 @@ cmd_end_file_type (void)
   fty = vfm_source->aux;
   fty->case_size = dict_get_case_size (default_dict);
 
-  lex_match_id ("TYPE");
-
   if (fty->recs_tail)
     {
       fty->recs_tail->lt = n_trns - 1;