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

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/12/05 06:22:46

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

Log message:
        Make GET DATA a separate command, instead of something invoked
        indirectly from GET.
        
        * automake.mk: Remove get-data.h from sources.
        
        * get-data.h: Removed.
        
        * get-data.c (parse_get_data_command): Rename cmd_get_data.
        
        * get.c (parse_read_command): No longer any need to check for DATA
        keyword.
        
        * command.def: Add GET DATA command.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/ChangeLog?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/command.def?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/ChangeLog?cvsroot=pspp&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/automake.mk?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get-data.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get.c?cvsroot=pspp&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get-data.h?cvsroot=pspp&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ChangeLog   6 Nov 2007 06:23:26 -0000       1.26
+++ ChangeLog   5 Dec 2007 06:22:45 -0000       1.27
@@ -1,3 +1,7 @@
+2007-12-04  Ben Pfaff  <address@hidden>
+
+       * command.def: Add GET DATA command.
+
 2007-11-05  Ben Pfaff  <address@hidden>
 
        Patch #6258.  Reviewed by John Darrington.

Index: command.def
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/command.def,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- command.def 23 Sep 2007 05:59:02 -0000      1.21
+++ command.def 5 Dec 2007 06:22:46 -0000       1.22
@@ -42,6 +42,7 @@
 /* Commands that define (or replace) the active file. */
 DEF_CMD (S_INITIAL | S_DATA | S_INPUT_PROGRAM | S_FILE_TYPE, 0, "DATA LIST", 
cmd_data_list)
 DEF_CMD (S_INITIAL | S_DATA, 0, "GET", cmd_get)
+DEF_CMD (S_INITIAL | S_DATA, 0, "GET DATA", cmd_get_data)
 DEF_CMD (S_INITIAL | S_DATA, 0, "IMPORT", cmd_import)
 DEF_CMD (S_INITIAL | S_DATA, 0, "INPUT PROGRAM", cmd_input_program)
 

Index: data-io/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- data-io/ChangeLog   5 Dec 2007 06:04:59 -0000       1.52
+++ data-io/ChangeLog   5 Dec 2007 06:22:46 -0000       1.53
@@ -1,5 +1,19 @@
 2007-12-04  Ben Pfaff  <address@hidden>
 
+       Make GET DATA a separate command, instead of something invoked
+       indirectly from GET.
+
+       * automake.mk: Remove get-data.h from sources.
+
+       * get-data.h: Removed.
+
+       * get-data.c (parse_get_data_command): Rename cmd_get_data.
+
+       * get.c (parse_read_command): No longer any need to check for DATA
+       keyword.
+
+2007-12-04  Ben Pfaff  <address@hidden>
+
        * src/language/data-io/data-reader.c (struct dfm_reader): New
        `file_size' member to support dfm_get_percent_read.
        (dfm_open_reader): Initialize file_size.

Index: data-io/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/automake.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- data-io/automake.mk 3 Nov 2007 03:43:11 -0000       1.10
+++ data-io/automake.mk 5 Dec 2007 06:22:46 -0000       1.11
@@ -8,7 +8,6 @@
        src/language/data-io/data-list.c \
        src/language/data-io/get.c \
        src/language/data-io/get-data.c \
-       src/language/data-io/get-data.h \
        src/language/data-io/inpt-pgm.c \
        src/language/data-io/inpt-pgm.h \
        src/language/data-io/print.c \

Index: data-io/get-data.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/get-data.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- data-io/get-data.c  3 Nov 2007 03:43:11 -0000       1.1
+++ data-io/get-data.c  5 Dec 2007 06:22:46 -0000       1.2
@@ -16,7 +16,6 @@
 
 #include <config.h>
 
-#include "get-data.h"
 
 #include <libpspp/message.h>
 #include <data/gnumeric-reader.h>
@@ -33,7 +32,7 @@
 static int parse_get_gnm (struct lexer *lexer, struct dataset *);
 
 int
-parse_get_data_command (struct lexer *lexer, struct dataset *ds)
+cmd_get_data (struct lexer *lexer, struct dataset *ds)
 {
   lex_force_match (lexer, '/');
 

Index: data-io/get.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/get.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- data-io/get.c       11 Nov 2007 05:51:42 -0000      1.47
+++ data-io/get.c       5 Dec 2007 06:22:46 -0000       1.48
@@ -45,8 +45,6 @@
 #include <libpspp/str.h>
 #include <libpspp/taint.h>
 
-#include "get-data.h"
-
 #include "xalloc.h"
 
 #include "gettext.h"
@@ -75,11 +73,6 @@
   struct dictionary *dict = NULL;
   struct case_map *map = NULL;
 
-  if ( type == GET_CMD && lex_match_id (lexer, "DATA") )
-    {
-      return parse_get_data_command (lexer, ds);
-    }
-
   for (;;)
     {
       lex_match (lexer, '/');

Index: data-io/get-data.h
===================================================================
RCS file: data-io/get-data.h
diff -N data-io/get-data.h
--- data-io/get-data.h  3 Nov 2007 03:43:12 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef GET_DATA_H
-#define GET_DATA_H
-
-struct lexer;
-struct dataset;
-
-int parse_get_data_command (struct lexer *lexer, struct dataset *ds);
-
-
-#endif