X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=bd12c3eb23a22db2ea5fc968408e0ef3fe639a78;hb=339bbfdda6902eaf7f3f1245c3da99bcc243efc2;hp=41d4b068252c82e39f7d467124e9a49f013efa27;hpb=08469b9582b8c7a2e5bf137d9d74148d85d9f652;p=pspp

diff --git a/dump.c b/dump.c
index 41d4b06825..bd12c3eb23 100644
--- a/dump.c
+++ b/dump.c
@@ -205,7 +205,7 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (1);
+      match_byte (1) || match_byte(3);
       match_byte (1);
       match_byte (0);
       match_byte (0);
@@ -237,8 +237,11 @@ dump_value(int level)
       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 (1) && !match_u32(2))
-        match_u32_assert (3);
+      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);
@@ -281,22 +284,33 @@ dump_value(int level)
   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;
+      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);
+          subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
       printf ("; \"%s\", substitutions:", get_string());
-      for (;;)
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)
         {
-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);
         }
+      printf (" (total %d)", total_subs);
 
       for (int i = 0; i < total_subs; i++)
         {
@@ -306,18 +320,17 @@ dump_value(int level)
     }
   else
     {
-      int total_subs = 1;
 
       match_byte_assert (0x58);
       printf ("\"%s\" with substitutions:", get_string());
-      for (;;)
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)
         {
-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);
         }
+      printf (" (total %d)", total_subs);
 
       for (int i = 0; i < total_subs; i++)
         {
@@ -399,7 +412,6 @@ dump_dim_value(int level)
   else
     {
       int subn;
-      int total_subs = 1;
 
       match_byte (0);
       match_byte_assert (0x31);
@@ -409,14 +421,14 @@ dump_dim_value(int level)
       printf ("nested %d bytes", subn);
       pos += subn;
       printf ("; \"%s\", substitutions:", get_string());
-      for (;;)
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)
         {
-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);
         }
+      printf (" (total %d)", total_subs);
 
       for (int i = 0; i < total_subs; i++)
         {
@@ -541,7 +553,8 @@ dump_dim(void)
 
   if (!match_byte(0) && !match_byte(1))
     match_byte_assert(2);
-  match_u32_assert(2);
+  if (!match_u32(0))
+    match_u32_assert(2);
   if (!match_byte(0))
     match_byte_assert(1);
   match_byte(0);