output-item: Make command name part of every output_item.

[pspp] / src / output / group-item.c

diff --git a/src/output/group-item.c b/src/output/group-item.c
index b5cb84ea59b7bb175a0bbe439ce06aeba7df6119..c0aad17d9f9bc2e0d85432e41cc4a18989f47d83 100644 (file)
--- a/src/output/group-item.c
+++ b/src/output/group-item.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2018 Free Sonftware Foundation, Inc.
+   Copyright (C) 2018 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
@@ -20,20 +20,33 @@
 
 #include <stdlib.h>
 
+#include "libpspp/compiler.h"
+#include "libpspp/str.h"
 #include "output/driver.h"
 #include "output/output-item-provider.h"
 
 #include "gl/xalloc.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 struct group_open_item *
-group_open_item_create (const char *command_name)
+group_open_item_create (const char *command_name, const char *label)
 {
-  struct group_open_item *item;
-
-  item = xmalloc (sizeof *item);
-  output_item_init (&item->output_item, &group_open_item_class);
-  item->command_name = command_name ? xstrdup (command_name) : NULL;
+  return group_open_item_create_nocopy (
+    xstrdup_if_nonnull (command_name),
+    xstrdup_if_nonnull (label));
+}
 
+struct group_open_item *
+group_open_item_create_nocopy (char *command_name, char *label)
+{
+  struct group_open_item *item = xmalloc (sizeof *item);
+  *item = (struct group_open_item) {
+    .output_item = OUTPUT_ITEM_INITIALIZER (&group_open_item_class),
+    .output_item.label = label,
+    .output_item.command_name = command_name,
+  };
   return item;
 }
 
@@ -45,28 +58,37 @@ group_open_item_submit (struct group_open_item *item)
   output_submit (&item->output_item);
 }
 
+static const char *
+group_open_item_get_label (const struct output_item *output_item)
+{
+  struct group_open_item *item = to_group_open_item (output_item);
+
+  return (item->output_item.command_name
+          ? item->output_item.command_name
+          : _("Group"));
+}
+
 static void
 group_open_item_destroy (struct output_item *output_item)
 {
   struct group_open_item *item = to_group_open_item (output_item);
 
-  free (item->command_name);
   free (item);
 }
 
 const struct output_item_class group_open_item_class =
   {
+    group_open_item_get_label,
     group_open_item_destroy,
   };
 \f
 struct group_close_item *
 group_close_item_create (void)
 {
-  struct group_close_item *item;
-
-  item = xmalloc (sizeof *item);
-  output_item_init (&item->output_item, &group_close_item_class);
-
+  struct group_close_item *item = xmalloc (sizeof *item);
+  *item = (struct group_close_item) {
+    .output_item = OUTPUT_ITEM_INITIALIZER (&group_close_item_class),
+  };
   return item;
 }
 
@@ -78,6 +100,13 @@ group_close_item_submit (struct group_close_item *item)
   output_submit (&item->output_item);
 }
 
+static const char *
+group_close_item_get_label (const struct output_item *output_item UNUSED)
+{
+  /* Not marked for translation: user should never see it. */
+  return "Group Close";
+}
+
 static void
 group_close_item_destroy (struct output_item *output_item)
 {
@@ -88,5 +117,6 @@ group_close_item_destroy (struct output_item *output_item)
 
 const struct output_item_class group_close_item_class =
   {
+    group_close_item_get_label,
     group_close_item_destroy,
   };