Drop dump_footnote_value_31() in favor of dump_value_31().

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index b33b82422839731f8c82c974b68c80d73d2b6bad..c8ff8a6229226b670f8b3b74c695fddd64b5066f 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -154,7 +154,10 @@ dump_value_31(void)
     {
       if (match_u32 (0))
         {
-          match_u32_assert (0);
+          if (match_u32 (1))
+            get_string();
+          else
+            match_u32_assert (0);
           int subn = get_u32 ();
           printf ("nested %d bytes", subn);
           pos += subn;
@@ -173,7 +176,8 @@ dump_value_31(void)
           printf("(special 2)");
           match_byte_assert(0);
           match_byte_assert(0);
-          match_u32_assert(1);
+          if (!match_u32 (2))
+            match_u32_assert(1);
           match_byte_assert(0);
           match_byte_assert(0);
           int subn = get_u32 ();
@@ -221,14 +225,11 @@ dump_value(int level)
       else
         printf("string \"%s\" and \"%s\"", s1, s2);
       match_byte (0);
-      match_byte (0);
-      match_byte (0);
       match_byte (1);
       match_byte (1);
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (1);
     }
   else if (match_byte (5))
     {
@@ -240,7 +241,6 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (0);
     }
   else if (match_byte (2))
     {
@@ -260,10 +260,6 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
     }
   else if (match_byte (4))
     {
@@ -282,7 +278,6 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (0);
     }
   else if (match_byte (1))
     {
@@ -297,7 +292,6 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (1);
     }
   else
     {
@@ -348,32 +342,6 @@ dump_value(int level)
     }
 }
 
-static void
-dump_dim_value_31(void)
-{
-  if (match_byte (0x31))
-    {
-      if (match_u32 (0))
-        {
-          match_u32_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (1)) 
-        {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-    }
-  else
-    match_byte_assert (0x58);
-}
-
 static void
 dump_dim_value(int level)
 {
@@ -383,7 +351,7 @@ dump_dim_value(int level)
   if (match_byte (3))
     {
       get_string();
-      dump_dim_value_31();
+      dump_value_31();
       get_string();
       printf("string \"%s\"", get_string());
       match_byte (0);
@@ -432,7 +400,7 @@ dump_dim_value(int level)
   else
     {
       match_byte (0);
-      dump_dim_value_31();
+      dump_value_31();
       printf ("; \"%s\", substitutions:", get_string());
       int total_subs = get_u32();
       int x = get_u32();
@@ -536,62 +504,6 @@ dump_dims(void)
     }
 }
 
-static void
-dump_data_value_31(void)
-{
-  if (match_byte (0x31))
-    {
-      if (match_u32 (0))
-        {
-          if (match_u32 (1))
-            get_string();
-          else
-            match_u32_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (1))
-        {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (2))
-        {
-          printf("(special 2)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          match_u32_assert(1);
-          match_byte_assert(0);
-          match_byte_assert(0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else
-        {
-          match_u32_assert(3);
-          printf("(special 3)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          match_byte_assert(1);
-          match_byte_assert(0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes, ", subn);
-          pos += subn;
-          subn = get_u32 ();
-          printf ("nested %d bytes, ", subn);
-          pos += subn;
-        }
-    }
-  else
-    match_byte_assert (0x58);
-}
-
 static void
 dump_data_value(void)
 {
@@ -604,7 +516,7 @@ dump_data_value(void)
       unsigned int format;
       double value;
 
-      dump_data_value_31();
+      dump_value_31();
       format = get_u32 ();
       value = get_double ();
       printf ("    value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
@@ -612,7 +524,7 @@ dump_data_value(void)
   else if (match_byte (3))
     {
       get_string();
-      dump_data_value_31();
+      dump_value_31();
       get_string();
       printf("string \"%s\"", get_string());
       match_byte (0);
@@ -662,7 +574,7 @@ dump_data_value(void)
     }
   else
     {
-      dump_data_value_31();
+      dump_value_31();
       char *base = get_string();
       int x = get_u32();
       printf ("\"%s\"; %d variables:\n", base, x);
@@ -710,60 +622,6 @@ dump_data(void)
     }
 }
 
-static void
-dump_title_value_31(int level)
-{
-  if (match_byte (0x31))
-    {
-      if (match_u32 (0))
-        {
-          match_u32_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (1))
-        {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (2))
-        {
-          printf("(special 2)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          if (!match_u32(2))
-            match_u32_assert(1);
-          match_byte_assert(0);
-          match_byte_assert(0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else
-        {
-          match_u32_assert(3);
-          printf("(special 3)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          match_byte_assert(1);
-          match_byte_assert(0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes, ", subn);
-          pos += subn;
-          subn = get_u32 ();
-          printf ("nested %d bytes, ", subn);
-          pos += subn;
-        }
-    }
-  else
-    match_byte_assert (0x58);
-}
-
 static void
 dump_title_value(int level)
 {
@@ -778,7 +636,7 @@ dump_title_value(int level)
   if (match_byte (3))
     {
       get_string();
-      dump_title_value_31(level);
+      dump_value_31();
       get_string();
       printf("string \"%s\"", get_string());
       match_byte (0);
@@ -793,7 +651,7 @@ dump_title_value(int level)
     }
   else if (match_byte (5))
     {
-      dump_title_value_31(level);
+      dump_value_31();
       printf ("variable \"%s\"", get_string());
       get_string();
       if (!match_byte(1) && !match_byte(2))
@@ -846,7 +704,7 @@ dump_title_value(int level)
       unsigned int format;
       double value;
 
-      dump_title_value_31(level);
+      dump_value_31();
       format = get_u32 ();
       value = get_double ();
       printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
@@ -858,7 +716,7 @@ dump_title_value(int level)
     }
   else
     {
-      dump_title_value_31(level);
+      dump_value_31();
 
       char *base = get_string();
       int x = get_u32();
@@ -907,47 +765,7 @@ dump_footnote_value(int level)
   if (match_byte (3))
     {
       get_string();
-      if (match_byte (0x31))
-        {
-          if (match_u32 (1))
-            {
-              printf("(footnote %d) ", get_u32());
-              match_byte_assert (0);
-              match_byte_assert (0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-          else if (match_u32 (2))
-            {
-              printf("(special 2)");
-              match_byte_assert(0);
-              match_byte_assert(0);
-              match_u32_assert(1);
-              match_byte_assert(0);
-              match_byte_assert(0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-          else
-            {
-              match_u32_assert(3);
-              printf("(special 3)");
-              match_byte_assert(0);
-              match_byte_assert(0);
-              match_byte_assert(1);
-              match_byte_assert(0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes, ", subn);
-              pos += subn;
-              subn = get_u32 ();
-              printf ("nested %d bytes, ", subn);
-              pos += subn;
-            }
-        }
-      else
-        match_byte_assert (0x58);
+      dump_value_31();
       get_string();
       printf("string \"%s\"", get_string());
       if (!match_byte (0))
@@ -1008,43 +826,14 @@ dump_footnote_value(int level)
       unsigned int format;
       double value;
 
-      if (match_byte (0x31))
-        {
-          if (match_u32 (1))
-            {
-              printf("(footnote %d) ", get_u32());
-              match_byte_assert (0);
-              match_byte_assert (0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-        }
-      else
-        match_byte_assert (0x58);
+      dump_value_31();
       format = get_u32 ();
       value = get_double ();
       printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
     }
-  else if (match_byte (0x31))
+  else
     {
-      if (match_u32 (1))
-        {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else
-        {
-          match_u32_assert (0);
-          match_u32_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
+      dump_value_31();
       char *base = get_string();
       int x = get_u32();
       printf ("\"%s\"; %d variables:\n", base, x);
@@ -1078,42 +867,6 @@ dump_footnote_value(int level)
             }
         }
     }
-  else
-    {
-
-      match_byte_assert (0x58);
-      char *base = get_string();
-      int x = get_u32();
-      printf ("\"%s\" with %d variables:\n", base, x);
-      for (int i = 0; i < x; i++)
-        {
-          int y = get_u32();
-          if (!y)
-            y = 1;
-          else
-            match_u32_assert(0);
-          for (int j = 0; j <= level; j++)
-            printf ("    ");
-          printf("variable %d has %d values:\n", i, y);
-          for (int j = 0; j < y; j++)
-            {
-              if (match_byte(3))
-                {
-                  char *a = get_string();
-                  match_byte_assert(0x58);
-                  char *b = get_string();
-                  char *c = get_string();
-                  for (int k = 0; k <= level + 1; k++)
-                    printf ("    ");
-                  printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
-                  match_byte_assert(0);
-                }
-              else
-                dump_footnote_value (level+1);
-              putchar('\n');
-            }
-        }
-    }
 }
 
 static void
@@ -1152,42 +905,14 @@ dump_title(void)
           match_byte(0);
           match_byte(0);
           match_byte(0);
-          if (match_byte (1))
-            {
-              unsigned int format;
-              double value;
-
-              if (match_byte (0x31))
-                {
-                  if (match_u32 (1))
-                    {
-                      printf("(footnote %d) ", get_u32());
-                      match_byte_assert (0);
-                      match_byte_assert (0);
-                      int subn = get_u32 ();
-                      printf ("nested %d bytes", subn);
-                      pos += subn;
-                    }
-                }
-              else
-                match_byte_assert (0x58);
-              format = get_u32 ();
-              value = get_double ();
-              printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
-              match_byte (1);
-              match_byte (0);
-              match_byte (0);
-              match_byte (0);
-              match_byte (1);
-            }
-          else if (match_byte (0x31))
+          if (match_byte (0x31))
             {
+              /* Custom footnote marker string. */
               match_byte_assert(3);
               get_string();
               match_byte_assert(0x58);
               match_u32_assert(0);
               get_string();
-              match_byte(0);
             }
           else
             match_byte_assert (0x58);