[Pspp-cvs] pspp/src/language ChangeLog command.def command...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/05/01 22:59:22

Modified files:
        src/language   : ChangeLog command.def command.h 
        src/language/data-io: ChangeLog automake.mk data-list.c 
Removed files:
        src/language/data-io: file-type.c file-type.h 

Log message:
        Remove vestiges of FILE TYPE support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/command.def.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/command.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/ChangeLog.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/automake.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: pspp/src/language/ChangeLog
diff -u pspp/src/language/ChangeLog:1.4 pspp/src/language/ChangeLog:1.5
--- pspp/src/language/ChangeLog:1.4     Thu Apr 27 04:15:02 2006
+++ pspp/src/language/ChangeLog Mon May  1 22:59:22 2006
@@ -1,3 +1,9 @@
+Mon May  1 15:56:56 2006  Ben Pfaff  <address@hidden>
+
+       Remove vestiges of FILE TYPE support. 
+       
+       * command.def: Mark FILE TYPE, RECORD TYPE unimplemented.
+
 Wed Apr 26 21:13:46 2006  Ben Pfaff  <address@hidden>
 
        CLEAR TRANSFORMATIONS is unsafe as implemented.  It's a fair
Index: pspp/src/language/command.def
diff -u pspp/src/language/command.def:1.3 pspp/src/language/command.def:1.4
--- pspp/src/language/command.def:1.3   Thu Apr 27 04:15:02 2006
+++ pspp/src/language/command.def       Mon May  1 22:59:22 2006
@@ -120,9 +120,6 @@
 DEF_CMD (S_DATA, 0, "TEMPORARY", cmd_temporary)
 DEF_CMD (S_DATA, 0, "USE", cmd_use)
 
-/* FILE TYPE. */
-DEF_CMD (S_FILE_TYPE, 0, "RECORD TYPE", cmd_record_type)
-
 /* Commands valid only with INPUT PROGRAM. */
 DEF_CMD (S_INPUT_PROGRAM, 0, "END CASE", cmd_end_case)
 DEF_CMD (S_INPUT_PROGRAM, 0, "END FILE", cmd_end_file)
@@ -182,6 +179,7 @@
 UNIMPL_CMD ("PROXIMITIES", "Pairwise similarity")
 UNIMPL_CMD ("QUICK CLUSTER", "Fast clustering")
 UNIMPL_CMD ("RANK", "Create rank scores")
+UNIMPL_CMD ("RECORD TYPE", "Defines a type of record within FILE TYPE")
 UNIMPL_CMD ("REFORMAT", "Read obsolete files")
 UNIMPL_CMD ("REPEATING DATA", "Specify multiple cases per input record")
 UNIMPL_CMD ("REPORT", "Pretty print working file")
Index: pspp/src/language/command.h
diff -u pspp/src/language/command.h:1.2 pspp/src/language/command.h:1.3
--- pspp/src/language/command.h:1.2     Wed Apr 26 20:54:08 2006
+++ pspp/src/language/command.h Mon May  1 22:59:22 2006
@@ -29,7 +29,7 @@
     CMD_SUCCESS = 1,            /* Successfully parsed and executed. */
     CMD_EOF,                    /* No commands left. */
     CMD_QUIT,                   /* Requested exit. */
-    CMD_END_SUBLOOP,            /* End of INPUT PROGRAM or FILE TYPE. */
+    CMD_END_SUBLOOP,            /* End of INPUT PROGRAM. */
 
     /* Various kinds of failures. */
     CMD_FAILURE,                /* Not executed at all. */
Index: pspp/src/language/data-io/ChangeLog
diff -u pspp/src/language/data-io/ChangeLog:1.6 
pspp/src/language/data-io/ChangeLog:1.7
--- pspp/src/language/data-io/ChangeLog:1.6     Wed Apr 26 20:54:08 2006
+++ pspp/src/language/data-io/ChangeLog Mon May  1 22:59:22 2006
@@ -1,4 +1,21 @@
-Wed Apr 26 13:41:05 2006  Ben Pfaff  <address@hidden>
+Mon May  1 15:58:28 2006  Ben Pfaff  <address@hidden>
+
+       Remove vestiges of FILE TYPE support. 
+       
+       * data-list.c: (cmd_data_list) Don't check for FILE TYPE.
+       (cmd_repeating_data) Ditto.
+       
+
+Mon May  1 15:57:24 2006  Ben Pfaff  <address@hidden>
+
+       Remove vestiges of FILE TYPE support. 
+       
+       * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Remove
+       file-type.c, file-type.h.
+
+       * file-type.c: Removed.
+       
+       * file-type.h: Removed.
 
 Wed Apr 26 13:16:28 2006  Ben Pfaff  <address@hidden>
 
Index: pspp/src/language/data-io/automake.mk
diff -u pspp/src/language/data-io/automake.mk:1.3 
pspp/src/language/data-io/automake.mk:1.4
--- pspp/src/language/data-io/automake.mk:1.3   Wed Apr 26 20:54:08 2006
+++ pspp/src/language/data-io/automake.mk       Mon May  1 22:59:22 2006
@@ -13,8 +13,6 @@
 
 src_language_data_io_libdata_io_a_SOURCES = \
        src/language/data-io/data-list.c \
-       src/language/data-io/file-type.c \
-       src/language/data-io/file-type.h \
        src/language/data-io/get.c \
        src/language/data-io/inpt-pgm.c \
        src/language/data-io/inpt-pgm.h \
Index: pspp/src/language/data-io/data-list.c
diff -u pspp/src/language/data-io/data-list.c:1.11 
pspp/src/language/data-io/data-list.c:1.12
--- pspp/src/language/data-io/data-list.c:1.11  Wed Apr 26 22:00:29 2006
+++ pspp/src/language/data-io/data-list.c       Mon May  1 22:59:22 2006
@@ -36,7 +36,6 @@
 #include <language/data-io/data-list.h>
 #include <language/data-io/data-reader.h>
 #include <language/data-io/file-handle.h>
-#include <language/data-io/file-type.h>
 #include <language/data-io/inpt-pgm.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/alloc.h>
@@ -120,7 +119,7 @@
   int table = -1;                /* Print table if nonzero, -1=undecided. */
   struct file_handle *fh = fh_inline_file ();
 
-  if (!in_input_program () && !in_file_type ())
+  if (!in_input_program ())
     discard_variables ();
 
   dls = xmalloc (sizeof *dls);
@@ -140,12 +139,6 @@
          fh = fh_parse (FH_REF_FILE | FH_REF_INLINE);
          if (fh == NULL)
            goto error;
-         if (in_file_type () && fh != fh_get_default_handle ())
-           {
-             msg (SE, _("DATA LIST must use the same file "
-                        "as the enclosing FILE TYPE."));
-             goto error;
-           }
        }
       else if (lex_match_id ("RECORDS"))
        {
@@ -1355,7 +1348,7 @@
   bool saw_id = false;          /* Saw ID subcommand? */
   struct file_handle *const fh = fh_get_default_handle ();
   
-  assert (in_input_program () || in_file_type ());
+  assert (in_input_program ());
 
   rpd = xmalloc (sizeof *rpd);
   rpd->reader = dfm_open_reader (fh);