[Pspp-cvs] pspp/src data/ChangeLog data/procedure.c data/t...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/07/01 03:17:06

Modified files:
        src/data       : ChangeLog procedure.c transformations.c 
                         transformations.h 
        src/language/data-io: inpt-pgm.c 

Log message:
        Changed trns_chain_execute signature (Patch #6057)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/transformations.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/transformations.h?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/inpt-pgm.c?cvsroot=pspp&r1=1.26&r2=1.27

Patches:
Index: data/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- data/ChangeLog      11 Jun 2007 04:03:19 -0000      1.132
+++ data/ChangeLog      1 Jul 2007 03:17:05 -0000       1.133
@@ -1,3 +1,8 @@
+2007-07-01 John Darrington <address@hidden>
+
+       * transformation.c transformation.h (trns_chain_execute): Changed the 
+       signature (Patch #6057)
+
 2007-06-10  Ben Pfaff  <address@hidden>
 
        * casereader-filter.c (casereader_filter_destroy): Make sure to

Index: data/procedure.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- data/procedure.c    15 Jun 2007 01:24:28 -0000      1.30
+++ data/procedure.c    1 Jul 2007 03:17:05 -0000       1.31
@@ -92,7 +92,7 @@
                                    but proc_commit not yet called. */
     }
   proc_state;
-  size_t cases_written;       /* Cases output so far. */
+  casenumber cases_written;       /* Cases output so far. */
   bool ok;                    /* Error status. */
 }; /* struct dataset */
 
@@ -213,7 +213,7 @@
   assert (ds->proc_state == PROC_OPEN);
   for (;;)
     {
-      size_t case_nr;
+      casenumber case_nr;
 
       assert (retval == TRNS_DROP_CASE || retval == TRNS_ERROR);
       if (retval == TRNS_ERROR)
@@ -230,7 +230,7 @@
       /* Execute permanent transformations.  */
       case_nr = ds->cases_written + 1;
       retval = trns_chain_execute (ds->permanent_trns_chain, TRNS_CONTINUE,
-                                   c, &case_nr);
+                                   c, case_nr);
       caseinit_update_left_vars (ds->caseinit, c);
       if (retval != TRNS_CONTINUE)
         {
@@ -265,7 +265,7 @@
       if (ds->temporary_trns_chain != NULL)
         {
           retval = trns_chain_execute (ds->temporary_trns_chain, TRNS_CONTINUE,
-                                       c, &ds->cases_written);
+                                       c, ds->cases_written);
           if (retval != TRNS_CONTINUE)
             {
               case_destroy (c);

Index: data/transformations.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/transformations.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- data/transformations.c      8 Jun 2007 04:53:49 -0000       1.6
+++ data/transformations.c      1 Jul 2007 03:17:05 -0000       1.7
@@ -181,15 +181,13 @@
 }
 
 /* Executes the given CHAIN of transformations on C,
-   passing *CASE_NR as the case number.
-   If a transformation modifies *CASE_NR, it will affect the case
-   number passed to following transformations.
+   passing CASE_NR as the case number.
    Returns the result code that caused the transformations to
    terminate, or TRNS_CONTINUE if the transformations finished
    due to "falling off the end" of the set of transformations. */
 enum trns_result
-trns_chain_execute (struct trns_chain *chain, enum trns_result start,
-                    struct ccase *c, const size_t *case_nr)
+trns_chain_execute (const struct trns_chain *chain, enum trns_result start,
+                    struct ccase *c, casenumber case_nr)
 {
   size_t i;
 
@@ -197,7 +195,7 @@
   for (i = start < 0 ? 0 : start; i < chain->trns_cnt; )
     {
       struct transformation *trns = &chain->trns[i];
-      int retval = trns->execute (trns->aux, c, *case_nr);
+      int retval = trns->execute (trns->aux, c, case_nr);
       if (retval == TRNS_CONTINUE)
         i++;
       else if (retval >= 0)

Index: data/transformations.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/transformations.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- data/transformations.h      8 Jun 2007 04:53:49 -0000       1.7
+++ data/transformations.h      1 Jul 2007 03:17:05 -0000       1.8
@@ -49,8 +49,8 @@
 void trns_chain_append (struct trns_chain *, trns_finalize_func *,
                         trns_proc_func *, trns_free_func *, void *);
 size_t trns_chain_next (struct trns_chain *);
-enum trns_result trns_chain_execute (struct trns_chain *, enum trns_result,
-                                     struct ccase *, const size_t *case_nr);
+enum trns_result trns_chain_execute (const struct trns_chain *, enum 
trns_result,
+                                     struct ccase *, casenumber case_nr);
 
 void trns_chain_splice (struct trns_chain *, struct trns_chain *);
 

Index: language/data-io/inpt-pgm.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/data-io/inpt-pgm.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- language/data-io/inpt-pgm.c 11 Jun 2007 04:15:48 -0000      1.26
+++ language/data-io/inpt-pgm.c 1 Jul 2007 03:17:05 -0000       1.27
@@ -68,7 +68,7 @@
     struct trns_chain *trns_chain;
     enum trns_result restart;
 
-    size_t case_nr;             /* Incremented by END CASE transformation. */
+    casenumber case_nr;             /* Incremented by END CASE transformation. 
*/
 
     struct caseinit *init;
     size_t value_cnt;
@@ -203,7 +203,7 @@
 
       caseinit_init_vars (inp->init, c);
       inp->restart = trns_chain_execute (inp->trns_chain, inp->restart,
-                                         c, &inp->case_nr);
+                                         c, inp->case_nr);
       assert (is_valid_state (inp->restart));
       caseinit_update_left_vars (inp->init, c);
     }