token: Update functional interface and add token_copy(), token_equal().

[pspp] / src / output / ascii.c

diff --git a/src/output/ascii.c b/src/output/ascii.c
index cd5fcec64b06ab8c704f4b2fa9b3157089e59450..f0be586dbd9277b69cee4af01471d2906c57c3ef 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -645,7 +645,7 @@ ascii_submit (struct output_driver *driver, const struct output_item *item)
       break;
 
     case OUTPUT_ITEM_GROUP:
-      NOT_REACHED ();
+      break;
 
     case OUTPUT_ITEM_PAGE_BREAK:
       break;
@@ -1033,8 +1033,8 @@ ascii_test_write (struct output_driver *driver,
     .underline = underline,
   };
   const struct pivot_value value = {
-    .type = PIVOT_VALUE_TEXT,
     .text = {
+      .type = PIVOT_VALUE_TEXT,
       .local = CONST_CAST (char *, s),
       .c = CONST_CAST (char *, s),
       .id = CONST_CAST (char *, s),