dump: Another way to express substitution?

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index 7994db13c19517bb33a66c5a71586f48d8722b2e..0a92002672de550e728b21e251850807d6ff87f9 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -152,6 +152,7 @@ dump_value(int level)
   for (int i = 0; i <= level; i++)
     printf ("    ");
 
+  match_byte (0);
   if (match_byte (3))
     {
       get_string();
@@ -255,13 +256,11 @@ dump_value(int level)
       match_byte (0);
       match_byte (1);
     }
-  else
+  else if (match_byte (0x31))
     {
       int subn;
       int total_subs = 1;
 
-      match_byte (0);
-      match_byte_assert (0x31);
       match_u32_assert (0);
       match_u32_assert (0);
       subn = get_u32 ();
@@ -277,6 +276,27 @@ dump_value(int level)
           total_subs *= n_subst;
         }
 
+      for (int i = 0; i < total_subs; i++)
+        {
+          putc ('\n', stdout);
+          dump_value (level + 1);
+        }
+    }
+  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);