X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=3be7d5a9d6e94391b9adffb1d3cd062bdc4cac91;hb=b17d33ee847585114dfb2345d8187bcae5b522e9;hp=cbf4e3a51f6d1c8eedb89a46b2fed1b5b59ba9bf;hpb=f5f799c10d8ca6d673fde7486ec90e6ab85b0d6d;p=pspp

diff --git a/dump.c b/dump.c
index cbf4e3a51f..3be7d5a9d6 100644
--- a/dump.c
+++ b/dump.c
@@ -148,731 +148,16 @@ get_string(const char *where)
 #define get_string() get_string(WHERE)
 
 static void
-dump_value(int level)
-{
-  for (int i = 0; i <= level; i++)
-    printf ("    ");
-
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  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);
-      char *s2 = get_string();
-      char *s3 = get_string();
-      if (strcmp(s1, s3))
-        printf("strings \"%s\", \"%s\" and \"%s\"", s1, s2, s3);
-      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);
-      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 (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);
-      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))
-    {
-      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);
-      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);
-      match_byte (1);
-      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);
-      char *base = get_string();
-      int x = get_u32();
-      printf ("\"%s\" with %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');
-                }
-            }
-        }
-    }
-}
-
-static void
-dump_dim_value(int level)
-{
-  for (int i = 0; i <= level; i++)
-    printf ("    ");
-
-  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);
-      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))
-    {
-      match_byte_assert (0x58);
-      printf ("variable \"%s\"", get_string());
-      get_string();
-      match_byte_assert (2);
-    }
-  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_u32 (3))
-        match_u32_assert (2);
-      match_byte (0);
-    }
-  else if (match_byte (1))
-    {
-      unsigned int format;
-      double value;
-
-      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
-    {
-      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;
-      printf ("; \"%s\", substitutions:", get_string());
-      int total_subs = get_u32();
-      int x = get_u32();
-      if (x)
-        {
-          total_subs = (total_subs - 1) + x;
-          match_u32_assert (0);
-        }
-      printf (" (total %d)", total_subs);
-
-      for (int i = 0; i < total_subs; i++)
-        {
-          putc ('\n', stdout);
-          dump_value (level + 1);
-        }
-    }
-}
-
-static void
-dump_category(int level)
-{
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  dump_value (level);
-
-  if (match_u32 (2))
-    get_u32 ();
-  else if (match_u32 (1))
-    {
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      get_u32 ();
-    }
-  else if (match_byte (1))
-    {
-      match_byte (0);
-      if (!match_u32 (2))
-        match_u32_assert (1);
-      match_byte (0);
-      get_u32();
-    }
-  else
-    {
-      match_u32_assert (0);
-      get_u32 ();
-    }
-
-  int n_categories = get_u32();
-  if (n_categories > 0)
-    printf (", %d subcategories:", n_categories);
-  printf("\n");
-  for (int i = 0; i < n_categories; i++)
-    dump_category (level + 1);
-}
-
-static void
-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);
-        }
-    }
-
-  /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
-  pos++;
-
-  if (!match_byte(0) && !match_byte(1))
-    match_byte_assert(2);
-  if (!match_u32(0))
-    match_u32_assert(2);
-  if (!match_byte(0))
-    match_byte_assert(1);
-  match_byte(0);
-  match_byte(0);
-  match_byte(0);
-  match_byte(0);
-  get_u32();
-  match_byte(0);
-  match_byte(0);
-  match_byte(0);
-  match_byte(0);
-  n_categories = get_u32();
-  printf("%d nested categories\n", n_categories);
-  for (int i = 0; i < n_categories; i++)
-    dump_category (0);
-}
-
-int n_dims;
-static void
-dump_dims(void)
-{
-  n_dims = get_u32();
-  printf ("%u dimensions\n", n_dims);
-  for (int i = 0; i < n_dims; i++)
-    {
-      printf("\n");
-      dump_dim ();
-    }
-}
-
-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(void)
-{
-#if 1
-  int a[16];
-  for (int i = 0; i < 3 + n_dims; i++)
-    a[i] = get_u32();
-  printf ("data intro:");
-  for (int i = 0; i < 3 + n_dims; i++)
-    printf(" %d", a[i]);
-  printf("\n");
-#else
-  fprintf (stderr,"data intro (%d dims):", n_dims);
-  for (int i = 0; i < 3+n_dims; i++)
-    fprintf (stderr," %d", get_u32());
-  fprintf(stderr,"\n");
-#endif
-  int x = get_u32();
-  printf ("%d data values, starting at %08x\n", x, pos);
-  for (int i = 0; i < x; i++)
-    {
-      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
-        {
-          dump_data_value_31();
-          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;
-
-                      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))
-                    {
-                      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');
-                }
-            }
-        }
-      putchar('\n');
-    }
-}
-
-static void
-dump_title_value_31(int level)
+dump_value_31(void)
 {
   if (match_byte (0x31))
     {
       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;
@@ -891,7 +176,7 @@ dump_title_value_31(int level)
           printf("(special 2)");
           match_byte_assert(0);
           match_byte_assert(0);
-          if (!match_u32(2))
+          if (!match_u32 (2))
             match_u32_assert(1);
           match_byte_assert(0);
           match_byte_assert(0);
@@ -920,35 +205,34 @@ dump_title_value_31(int level)
 }
 
 static void
-dump_title_value(int level)
+dump_value__(int level, bool match1)
 {
   for (int i = 0; i <= level; i++)
     printf ("    ");
 
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+
   if (match_byte (3))
     {
-      get_string();
-      dump_title_value_31(level);
-      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);
+      char *s1 = get_string();
+      dump_value_31();
+      char *s2 = get_string();
+      char *s3 = get_string();
+      if (strcmp(s1, s3))
+        printf("strings \"%s\", \"%s\" and \"%s\"", s1, s2, s3);
+      else
+        printf("string \"%s\" and \"%s\"", s1, s2);
+      if (!match_byte (0))
+        match_byte_assert(1);
+      if (match1)
+        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))
@@ -969,13 +253,6 @@ dump_title_value(int level)
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
       if (!match_byte (1) && !match_byte(2))
         match_byte_assert (3);
-      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))
     {
@@ -991,29 +268,22 @@ dump_title_value(int level)
       value = get_string ();
       printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
-      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);
-      match_byte (1);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (1);
+      if (match1)
+        match_byte (1);
     }
   else
     {
-      dump_title_value_31(level);
+      dump_value_31();
 
       char *base = get_string();
       int x = get_u32();
@@ -1030,19 +300,7 @@ dump_title_value(int level)
           printf("variable %d has %d values:\n", i, y);
           for (int j = 0; j < y; j++)
             {
-              match_byte(0);
-              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);
-                }
-              else
-                dump_title_value (level+1);
+              dump_value__ (level + 1, false);
               putchar('\n');
             }
         }
@@ -1050,224 +308,112 @@ dump_title_value(int level)
 }
 
 static void
-dump_footnote_value(int level)
+dump_category(int level)
 {
-  for (int i = 0; i <= level; i++)
-    printf ("    ");
+  dump_value__ (level, true);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
 
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  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);
-      get_string();
-      printf("string \"%s\"", get_string());
-      if (!match_byte (0))
-        match_byte_assert (1);
-    }
-  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);
-    }
-  else if (match_byte (2))
+  if (match_u32 (1))
+    match_byte (0);
+  else if (match_byte (1))
     {
-      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);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
       match_byte (0);
+      if (!match_u32 (2))
+        match_u32_assert (1);
       match_byte (0);
     }
-  else if (match_byte (4))
-    {
-      unsigned int format;
-      char *var, *vallab, *value;
+  else if (!match_u32(2))
+    match_u32_assert (0);
 
-      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);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-    }
-  else if (match_byte (1))
-    {
-      unsigned int format;
-      double value;
+  get_u32 ();
 
-      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 if (match_byte (0x31))
+  int n_categories = get_u32();
+  if (n_categories > 0)
+    printf (", %d subcategories:", n_categories);
+  printf("\n");
+  for (int i = 0; i < n_categories; i++)
+    dump_category (level + 1);
+}
+
+static void
+dump_dim(void)
+{
+  int n_categories;
+  printf("next dim\n");
+  dump_value__ (0, false);
+
+  /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
+  pos++;
+
+  if (!match_byte(0) && !match_byte(1))
+    match_byte_assert(2);
+  if (!match_u32(0))
+    match_u32_assert(2);
+  if (!match_byte(0))
+    match_byte_assert(1);
+  get_u32();
+  match_byte(0);
+  match_byte(0);
+  n_categories = get_u32();
+  printf("%d nested categories\n", n_categories);
+  for (int i = 0; i < n_categories; i++)
+    dump_category (0);
+}
+
+int n_dims;
+static void
+dump_dims(void)
+{
+  n_dims = get_u32();
+  printf ("%u dimensions\n", n_dims);
+  for (int i = 0; i < n_dims; i++)
     {
-      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 <= 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);
-                  if (!match_byte(1))
-                    match_byte_assert(0);
-                }
-              else
-                dump_footnote_value (level+1);
-              putchar('\n');
-            }
-        }
+      printf("\n");
+      dump_dim ();
     }
-  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 int
+compare_int(const void *a_, const void *b_)
+{
+  const int *a = a_;
+  const int *b = b_;
+  return *a < *b ? -1 : *a > *b;
+}
+
+static void
+dump_data(void)
+{
+  /* The first three numbers add to the number of dimensions. */
+  int t = get_u32();
+  t += get_u32();
+  match_u32_assert(n_dims - t);
+
+  /* The next n_dims numbers are a permutation of the dimension numbers. */
+  int a[n_dims], b[n_dims];
+  for (int i = 0; i < n_dims; i++)
+    a[i] = b[i] = get_u32();
+  qsort(b, n_dims, sizeof *b, compare_int);
+  for (int i = 0; i < n_dims; i++)
+    if (b[i] != i)
+      {
+        fprintf(stderr, "bad dimension permutation:");
+        for (int i = 0; i < n_dims; i++)
+          fprintf(stderr, " %d", a[i]);
+        putc('\n', stderr);
+        exit(1);
+      }
+
+  int x = get_u32();
+  printf ("%d data values, starting at %08x\n", x, pos);
+  for (int i = 0; i < x; i++)
+    {
+      printf("%08x, index %d:\n", pos, get_u32());
+      match_u32_assert(0);
+      dump_value__(0, false);
+      putchar('\n');
     }
 }
 
@@ -1275,15 +421,15 @@ static void
 dump_title(void)
 {
   pos = 0x27;
-  dump_title_value(0); putchar('\n');
-  dump_title_value(0); putchar('\n');
+  dump_value__(0, true); putchar('\n');
+  dump_value__(0, true); putchar('\n');
   match_byte_assert(0x31);
-  dump_title_value(0); putchar('\n');
+  dump_value__(0, true); putchar('\n');
   match_byte(0);
   match_byte_assert(0x58);
   if (match_byte(0x31))
     {
-      dump_footnote_value(0); putchar('\n');
+      dump_value__(0, false); putchar('\n');
     }
   else
     match_byte_assert(0x58);
@@ -1302,47 +448,15 @@ dump_title(void)
       for (int i = 0; i < n_footnotes; i++)
         {
           printf("footnote %d:\n", i);
-          dump_footnote_value(0);
-          match_byte(0);
-          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))
+          dump_value__(0, false);
+          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);
@@ -1531,8 +645,7 @@ main(int argc, char *argv[])
           dump_dims ();
           printf("\n\ndata:\n");
           dump_data ();
-          if (pos == n - 1)
-            match_byte_assert (1);
+          match_byte (1);
           if (pos != n)
             {
               fprintf (stderr, "%x / %x\n", pos, n);