Redo VFM interface. Get rid of compaction_necessary, compaction_nval,

[pspp-builds.git] / src / command.c

diff --git a/src/command.c b/src/command.c
index f4c76c33b32bde5d8cb9ed67f1cafad17c8ed5a3..316868a2be5d5663ffb72ba4745144b62e8ea694 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -201,7 +201,8 @@ cmd_parse (void)
 
   /* If we're in a FILE TYPE structure, only certain commands can be
      allowed. */
-  if (pgm_state == STATE_INPUT && vfm_source == &file_type_source
+  if (pgm_state == STATE_INPUT
+      && case_source_is_class (vfm_source, &file_type_source_class)
       && !FILE_TYPE_okay (cp))
     return CMD_FAILURE;
 
@@ -561,11 +562,10 @@ int
 cmd_execute (void)
 {
   lex_match_id ("EXECUTE");
-  procedure (NULL, NULL, NULL);
+  procedure (NULL, NULL);
   return lex_end_of_command ();
 }
 
-
 #define assert_not_safer() \
   do { \
    if (set_safer) \
@@ -575,8 +575,6 @@ cmd_execute (void)
     } \
 } while(0) 
 
-
-
 /* Parses, performs the ERASE command. */
 int
 cmd_erase (void)