Fix more.

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index 60056f55b951f8450badf7b9e3001b50ab2acff8..faea74221ccc7b2d660829b9cf6c2c952d9ce5b0 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -125,10 +125,10 @@ match_byte_assert(uint8_t b, const char *where)
 #define match_byte_assert(b) match_byte_assert(b, WHERE)
 
 static char *
-get_string(void)
+get_string(const char *where)
 {
   if (data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0
-      && all_ascii(&data[pos + 4], data[pos]))
+      /*&& all_ascii(&data[pos + 4], data[pos])*/)
     {
       int len = data[pos];
       char *s = malloc(len + 1);
@@ -140,13 +140,195 @@ get_string(void)
     }
   else
     {
-      fprintf(stderr, "0x%x: expected string\n", pos);
+      fprintf(stderr, "%s: 0x%x: expected string\n", where, pos);
       exit(1);
     }
 }
+#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))
+    {
+      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());
+      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_u32 (1) && !match_u32(2))
+        match_u32_assert (3);
+      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;
+
+      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))
+    {
+      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_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);
+          dump_value (level + 1);
+        }
+    }
+}
+
+static void
+dump_dim_value(int level)
 {
   for (int i = 0; i <= level; i++)
     printf ("    ");
@@ -180,12 +362,7 @@ dump_value(int level)
       match_byte_assert (0x58);
       printf ("variable \"%s\"", get_string());
       get_string();
-      if (!match_byte (3))
-        match_byte_assert (2);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
+      match_byte_assert (2);
     }
   else if (match_byte (2))
     {
@@ -267,6 +444,14 @@ dump_category(int level)
       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);
@@ -285,15 +470,17 @@ 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_assert(1);
+      match_byte(1) || match_byte(0);
     }
-  else if (match_byte(5))
+  else if (match_byte(5)) 
     {
       match_byte_assert(0x58);
       printf("variable \"%s\": ", get_string());
@@ -301,16 +488,61 @@ dump_dim(void)
       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
     {
-      fprintf(stderr, "%08x: unexpected byte\n", pos);
-      exit(1);
+      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);
+        }
     }
 
-  match_byte_assert(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);
-  match_u32_assert(2);
+  if (!match_u32(0))
+    match_u32_assert(2);
   if (!match_byte(0))
     match_byte_assert(1);
   match_byte(0);