Fix all of the cases where we can find the dimensions section.

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index 65bd4831cecba3a820e3fe7eb003d8db56ba91e3..28c0ca3bbc08c9068c08f1aaf6cace5320598cb8 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -302,20 +302,48 @@ dump_value(int level)
           printf ("nested %d bytes", subn);
           pos += subn;
         }
-      printf ("; \"%s\", substitutions:", get_string());
-      int total_subs = get_u32();
+      char *base = get_string();
       int x = get_u32();
-      if (x)
+      printf ("\"%s\"; %d variables:\n", base, x);
+      if (match_u32(0))
         {
-          total_subs = (total_subs - 1) + x;
-          match_u32_assert (0);
+          for (int i = 0; i < x; i++)
+            {
+              dump_value (level+1);
+              putchar('\n');
+            }
         }
-      printf (" (total %d)", total_subs);
-
-      for (int i = 0; i < total_subs; i++)
+      else
         {
-          putc ('\n', stdout);
-          dump_value (level + 1);
+          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