X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=57bc9b4489e186abc35175038c40d53ed6031cc1;hb=35d486d1a1ca5dd788b188355fd5e090bed785b3;hp=966080b00cc159fde898c4e1f0b4cca58e6d565c;hpb=8220f18af09951e9646ca8a977df1400dd3ca6ee;p=pspp

diff --git a/dump.c b/dump.c
index 966080b00c..57bc9b4489 100644
--- a/dump.c
+++ b/dump.c
@@ -147,6 +147,63 @@ get_string(const char *where)
 }
 #define get_string() get_string(WHERE)
 
+static void
+dump_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);
+          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_value(int level)
 {
@@ -160,47 +217,7 @@ dump_value(int level)
   if (match_byte (3))
     {
       char *s1 = 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();
       char *s2 = get_string();
       char *s3 = get_string();
       if (strcmp(s1, s3))
@@ -208,18 +225,15 @@ 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))
     {
-      match_byte_assert (0x58);
+      dump_value_31();
       printf ("variable \"%s\"", get_string());
       get_string();
       if (!match_byte(1) && !match_byte(2))
@@ -227,7 +241,6 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (0);
     }
   else if (match_byte (2))
     {
@@ -247,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))
     {
@@ -269,27 +278,13 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (0);
     }
   else 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);
+      dump_value_31();
       format = get_u32 ();
       value = get_double ();
       printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
@@ -297,76 +292,12 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (1);
-    }
-  else 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_u32_assert (0);
-          match_u32_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      char *base = get_string();
-      int x = get_u32();
-      printf ("\"%s\"; %d variables:\n", base, x);
-      if (match_u32(0))
-        {
-          for (int i = 0; i < x; i++)
-            {
-              dump_value (level+1);
-              putchar('\n');
-            }
-        }
-      else
-        {
-          for (int i = 0; i < x; i++)
-            {
-              int y = get_u32();
-              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(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                    }
-                  else
-                    dump_value (level+1);
-                  putchar('\n');
-                }
-            }
-        }
     }
   else
     {
-
-      match_byte_assert (0x58);
+      dump_value_31();
       char *base = get_string();
+
       int x = get_u32();
       printf ("\"%s\" with %d variables:\n", base, x);
       if (match_u32(0))
@@ -421,25 +352,10 @@ dump_dim_value(int level)
   if (match_byte (3))
     {
       get_string();
-      if (match_byte (0x31))
-        {
-          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();
       get_string();
       printf("string \"%s\"", get_string());
       match_byte (0);
-      match_byte_assert (1);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
       match_byte (1);
     }
   else if (match_byte (5))
@@ -447,7 +363,8 @@ dump_dim_value(int level)
       match_byte_assert (0x58);
       printf ("variable \"%s\"", get_string());
       get_string();
-      match_byte_assert (2);
+      if (!match_byte (2))
+        match_byte_assert(3);
     }
   else if (match_byte (2))
     {
@@ -483,15 +400,8 @@ dump_dim_value(int level)
     }
   else
     {
-      int subn;
-
       match_byte (0);
-      match_byte_assert (0x31);
-      match_u32_assert (0);
-      match_u32_assert (0);
-      subn = get_u32 ();
-      printf ("nested %d bytes", subn);
-      pos += subn;
+      dump_value_31();
       printf ("; \"%s\", substitutions:", get_string());
       int total_subs = get_u32();
       int x = get_u32();
@@ -556,69 +466,7 @@ dump_dim(void)
   int n_categories;
   printf("next dim\n");
   match_byte(0);
-  if (match_byte(3))
-    {
-      get_string();
-      match_byte_assert(0x58);
-      get_string();
-      printf("string \"%s\": ", get_string());
-      match_byte(1) || match_byte(0);
-    }
-  else if (match_byte(5)) 
-    {
-      match_byte_assert(0x58);
-      printf("variable \"%s\": ", get_string());
-      get_string();
-      if (!match_byte(2))
-        match_byte_assert(3);
-    }
-  else if (match_byte(0x31))
-    {
-      int subn;
-      int total_subs = 1;
-
-      match_u32_assert (0);
-      match_u32_assert (0);
-      subn = get_u32 ();
-      printf ("nested %d bytes", subn);
-      pos += subn;
-      printf ("; \"%s\", substitutions:", get_string());
-      for (;;)
-        {
-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
-        }
-
-      for (int i = 0; i < total_subs; i++)
-        {
-          putc ('\n', stdout);
-          dump_dim_value (0);
-        }
-    }
-  else
-    {
-      int total_subs = 1;
-
-      match_byte_assert (0x58);
-      printf ("\"%s\" with substitutions:", get_string());
-      for (;;)
-        {
-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
-        }
-
-      for (int i = 0; i < total_subs; i++)
-        {
-          putc ('\n', stdout);
-          dump_dim_value (0);
-        }
-    }
+  dump_dim_value(0);
 
   /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
   pos++;
@@ -658,59 +506,93 @@ dump_dims(void)
 }
 
 static void
-dump_data_value_31(void)
+dump_data_value(void)
 {
-  if (match_byte (0x31))
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  if (match_byte (1))
     {
-      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
+      unsigned int format;
+      double value;
+
+      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 (3))
+    {
+      get_string();
+      dump_value_31();
+      get_string();
+      printf("string \"%s\"", get_string());
+      match_byte (0);
+    }
+  else if (match_byte (2))
+    {
+      unsigned int format;
+      char *var, *vallab;
+      double value;
+
+      match_byte_assert (0x58);
+      format = get_u32 ();
+      value = get_double ();
+      var = get_string ();
+      vallab = get_string ();
+      printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
+              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      if (!match_byte (1) && !match_byte(2))
+        match_byte_assert (3);
+    }
+  else if (match_byte (4))
+    {
+      unsigned int format;
+      char *var, *vallab, *value;
+
+      match_byte_assert (0x58);
+      format = get_u32 ();
+      vallab = get_string ();
+      var = get_string ();
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert (3);
+      value = get_string ();
+      printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
+              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+    }
+  else if (match_byte (5))
+    {
+      match_byte_assert (0x58);
+      printf ("variable \"%s\"", get_string());
+      get_string();
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert(3);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+    }
+  else
+    {
+      dump_value_31();
+      char *base = get_string();
+      int x = get_u32();
+      printf ("\"%s\"; %d variables:\n", base, x);
+      for (int i = 0; i < x; i++)
         {
-          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;
+          int y = get_u32();
+          if (!y)
+            y = 1;
+          else
+            match_u32_assert(0);
+          for (int j = 0; j <= 0; j++)
+            printf ("    ");
+          printf("variable %d has %d values:\n", i, y);
+          for (int j = 0; j < y; j++)
+            dump_data_value();
         }
     }
-  else
-    match_byte_assert (0x58);
 }
 
 static void
@@ -736,303 +618,11 @@ dump_data(void)
     {
       printf("%08x, index %d:\n", pos, get_u32());
       match_u32_assert(0);
-      match_byte(0);
-      match_byte(0);
-      match_byte(0);
-      match_byte(0);
-      if (match_byte (1))
-        {
-          unsigned int format;
-          double value;
-
-          dump_data_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 (3))
-        {
-          get_string();
-          dump_data_value_31();
-          get_string();
-          printf("string \"%s\"", get_string());
-          match_byte (0);
-        }
-      else if (match_byte (2))
-        {
-          unsigned int format;
-          char *var, *vallab;
-          double value;
-
-          match_byte_assert (0x58);
-          format = get_u32 ();
-          value = get_double ();
-          var = get_string ();
-          vallab = get_string ();
-          printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
-                  value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
-          if (!match_byte (1) && !match_byte(2))
-            match_byte_assert (3);
-        }
-      else if (match_byte (4))
-        {
-          unsigned int format;
-          char *var, *vallab, *value;
-
-          match_byte_assert (0x58);
-          format = get_u32 ();
-          vallab = get_string ();
-          var = get_string ();
-          if (!match_byte(1) && !match_byte(2))
-            match_byte_assert (3);
-          value = get_string ();
-          printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
-                  value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
-        }
-      else if (match_byte (5))
-        {
-          match_byte_assert (0x58);
-          printf ("variable \"%s\"", get_string());
-          get_string();
-          if (!match_byte(1) && !match_byte(2))
-            match_byte_assert(3);
-          match_byte (0);
-          match_byte (0);
-          match_byte (0);
-          match_byte (0);
-        }
-      else 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_u32_assert (0);
-              match_u32_assert (0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-          char *base = get_string();
-          int x = get_u32();
-          printf ("\"%s\"; %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 <= 0; j++)
-                printf ("    ");
-              printf("variable %d has %d values:\n", i, y);
-              for (int j = 0; j < y; j++)
-                {
-                  if (match_byte (1))
-                    {
-                      unsigned int format;
-                      double value;
-
-                      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
-                            {
-                              match_u32_assert(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_byte_assert (0x58);
-                      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(3))
-                    {
-                      char *a = get_string();
-                      match_byte_assert(0x58);
-                      char *b = get_string();
-                      char *c = get_string();
-                      for (int k = 0; k <= 1; k++)
-                        printf ("    ");
-                      printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                    }
-                  else if (match_byte(5))
-                    {
-                      match_byte_assert (0x58);
-                      printf ("variable \"%s\"", get_string());
-                      get_string();
-                      if (!match_byte(1) && !match_byte(2))
-                        match_byte_assert(3);
-                      match_byte (0);
-                      match_byte (0);
-                      match_byte (0);
-                      match_byte (0);
-                    }
-                  else
-                    dump_value (0);
-                  putchar('\n');
-                }
-            }
-        }
-      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 <= 0; 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 <= 1; k++)
-                        printf ("    ");
-                      printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                    }
-                  else 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);
-                    }
-                  else
-                    dump_value (1);
-                  putchar('\n');
-                }
-            }
-        }
+      dump_data_value();
       putchar('\n');
     }
 }
 
-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)
 {
@@ -1043,26 +633,22 @@ dump_title_value(int level)
   match_byte (0);
   match_byte (0);
   match_byte (0);
-  match_byte (0);
   if (match_byte (3))
     {
       get_string();
-      dump_title_value_31(level);
+      dump_value_31();
       get_string();
       printf("string \"%s\"", get_string());
       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))
     {
-      dump_title_value_31(level);
+      dump_value_31();
       printf ("variable \"%s\"", get_string());
       get_string();
       if (!match_byte(1) && !match_byte(2))
@@ -1086,10 +672,6 @@ dump_title_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))
     {
@@ -1108,14 +690,13 @@ dump_title_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (0);
     }
   else if (match_byte (1))
     {
       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);
@@ -1123,11 +704,10 @@ dump_title_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (1);
     }
   else
     {
-      dump_title_value_31(level);
+      dump_value_31();
 
       char *base = get_string();
       int x = get_u32();
@@ -1176,47 +756,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))
@@ -1277,43 +817,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);
@@ -1347,42 +858,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
@@ -1421,42 +896,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);