X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=657d53c35074a23e2660717937001fae087646fd;hb=c8adc6783134063d4ada34a58f9e7abf6a039bb2;hp=c0fc3d84f115bfbeebcb761ad880ab2ab16b1f33;hpb=a6e2dce2d00a981b99c4843088949aa24a746af2;p=pspp

diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c
index c0fc3d84f1..657d53c350 100644
--- a/src/language/data-io/print.c
+++ b/src/language/data-io/print.c
@@ -87,7 +87,7 @@ struct print_trns
     const char *encoding;       /* Encoding to use for output. */
     struct dfm_writer *writer;	/* Output file, NULL=listing file. */
     struct ll_list specs;       /* List of struct prt_out_specs. */
-    size_t record_cnt;          /* Number of records to write. */
+    size_t n_records;           /* Number of records to write. */
   };
 
 enum which_formats
@@ -96,13 +96,16 @@ enum which_formats
     WRITE
   };
 
+static const struct trns_class print_binary_trns_class;
+static const struct trns_class print_text_trns_class;
+
 static int internal_cmd_print (struct lexer *, struct dataset *ds,
 			       enum which_formats, bool eject);
-static trns_proc_func print_text_trns_proc, print_binary_trns_proc;
-static trns_free_func print_trns_free;
 static bool parse_specs (struct lexer *, struct pool *tmp_pool, struct print_trns *,
 			 struct dictionary *dict, enum which_formats);
 static void dump_table (struct print_trns *);
+
+static bool print_trns_free (void *trns_);
 
 /* Basic parsing. */
 
@@ -144,7 +147,7 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds,
   trns = pool_create_container (struct print_trns, pool);
   trns->eject = eject;
   trns->writer = NULL;
-  trns->record_cnt = 0;
+  trns->n_records = 0;
   ll_init (&trns->specs);
 
   tmp_pool = pool_create_subpool (trns->pool);
@@ -177,7 +180,7 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds,
 	  lex_match (lexer, T_LPAREN);
 	  if (!lex_force_int_range (lexer, "RECORDS", 0, INT_MAX))
 	    goto error;
-	  trns->record_cnt = lex_integer (lexer);
+	  trns->n_records = lex_integer (lexer);
 	  lex_get (lexer);
 	  lex_match (lexer, T_RPAREN);
 	}
@@ -239,11 +242,9 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds,
     dump_table (trns);
 
   /* Put the transformation in the queue. */
-  add_transformation (ds,
-                      (binary
-                       ? print_binary_trns_proc
-                       : print_text_trns_proc),
-                      print_trns_free, trns);
+  add_transformation (ds, (binary
+                           ? &print_binary_trns_class
+                           : &print_text_trns_class), trns);
 
   pool_destroy (tmp_pool);
   fh_unref (fh);
@@ -277,7 +278,7 @@ parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
 
   if (lex_token (lexer) == T_ENDCMD)
     {
-      trns->record_cnt = 1;
+      trns->n_records = 1;
       return true;
     }
 
@@ -299,11 +300,11 @@ parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
       lex_match (lexer, T_COMMA);
     }
 
-  if (trns->record_cnt != 0 && trns->record_cnt != record)
+  if (trns->n_records != 0 && trns->n_records != record)
     msg (SW, _("Output calls for %d records but %zu specified on RECORDS "
                "subcommand."),
-         record, trns->record_cnt);
-  trns->record_cnt = record;
+         record, trns->n_records);
+  trns->n_records = record;
 
   return true;
 }
@@ -354,19 +355,19 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
                          enum which_formats which_formats)
 {
   const struct variable **vars;
-  size_t var_cnt, var_idx;
+  size_t n_vars, var_idx;
   struct fmt_spec *formats, *f;
-  size_t format_cnt;
+  size_t n_formats;
   bool add_space;
 
   if (!parse_variables_const_pool (lexer, tmp_pool, dict,
-			     &vars, &var_cnt, PV_DUPLICATE))
+			     &vars, &n_vars, PV_DUPLICATE))
     return false;
 
   if (lex_is_number (lexer) || lex_token (lexer) == T_LPAREN)
     {
-      if (!parse_var_placements (lexer, tmp_pool, var_cnt, FMT_FOR_OUTPUT,
-                                 &formats, &format_cnt))
+      if (!parse_var_placements (lexer, tmp_pool, n_vars, FMT_FOR_OUTPUT,
+                                 &formats, &n_formats))
         return false;
       add_space = false;
     }
@@ -376,9 +377,9 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
 
       lex_match (lexer, T_ASTERISK);
 
-      formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
-      format_cnt = var_cnt;
-      for (i = 0; i < var_cnt; i++)
+      formats = pool_nmalloc (tmp_pool, n_vars, sizeof *formats);
+      n_formats = n_vars;
+      for (i = 0; i < n_vars; i++)
         {
           const struct variable *v = vars[i];
           formats[i] = (which_formats == PRINT
@@ -389,7 +390,7 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
     }
 
   var_idx = 0;
-  for (f = formats; f < &formats[format_cnt]; f++)
+  for (f = formats; f < &formats[n_formats]; f++)
     if (!execute_placement_format (f, record, column))
       {
         const struct variable *var;
@@ -420,7 +421,7 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
 
         *column += f->w + add_space;
       }
-  assert (var_idx == var_cnt);
+  assert (var_idx == n_vars);
 
   return true;
 }
@@ -462,7 +463,7 @@ dump_table (struct print_trns *trns)
   int row = pivot_category_create_leaf (
     variables->root, pivot_value_new_text (N_("N of Records")));
   pivot_table_put2 (table, 0, row,
-                    pivot_value_new_integer (trns->record_cnt));
+                    pivot_value_new_integer (trns->n_records));
 
   pivot_table_submit (table);
 }
@@ -474,7 +475,7 @@ static void print_text_flush_records (struct print_trns *, struct u8_line *,
                                       bool *eject, int *record);
 
 /* Performs the transformation inside print_trns T on case C. */
-static int
+static enum trns_result
 print_text_trns_proc (void *trns_, struct ccase **c,
                       casenumber case_num UNUSED)
 {
@@ -531,7 +532,7 @@ print_text_trns_proc (void *trns_, struct ccase **c,
                        ds_data (s), ds_length (s));
         }
     }
-  print_text_flush_records (trns, &line, trns->record_cnt + 1,
+  print_text_flush_records (trns, &line, trns->n_records + 1,
                             &eject, &record);
   u8_line_destroy (&line);
 
@@ -587,7 +588,7 @@ static void print_binary_flush_records (struct print_trns *,
                                         bool *eject, int *record);
 
 /* Performs the transformation inside print_trns T on case C. */
-static int
+static enum trns_result
 print_binary_trns_proc (void *trns_, struct ccase **c,
                         casenumber case_num UNUSED)
 {
@@ -630,7 +631,7 @@ print_binary_trns_proc (void *trns_, struct ccase **c,
             }
         }
     }
-  print_binary_flush_records (trns, &line, trns->record_cnt + 1,
+  print_binary_flush_records (trns, &line, trns->n_records + 1,
                               &eject, &record);
   ds_destroy (&line);
 
@@ -685,3 +686,15 @@ print_trns_free (void *trns_)
   return ok;
 }
 
+static const struct trns_class print_binary_trns_class = {
+  .name = "PRINT",
+  .execute = print_binary_trns_proc,
+  .destroy = print_trns_free,
+};
+
+static const struct trns_class print_text_trns_class = {
+  .name = "PRINT",
+  .execute = print_text_trns_proc,
+  .destroy = print_trns_free,
+};
+