Some minor refinements from expanding the corpus.

[pspp] / dump.c

diff --git a/dump.c b/dump.c
index 9e1bfd9f960b2f97379db046204193bcd6cdfd6a..be5139c6045a5eb2620242d9b2ca4212243e724d 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -246,6 +246,39 @@ dump_counted_string(void)
   return s;
 }
 
+static void __attribute__((unused))
+hex_dump(int ofs, int n)
+{
+  for (int i = 0; i < n; i++)
+    {
+      int c = data[ofs + i];
+#if 1
+      if (i && !(i % 16))
+        fprintf(stderr, "-");
+      else
+        fprintf(stderr, " ");
+#endif
+      fprintf(stderr, "%02x", c);
+      //fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
+    }
+  fprintf(stderr, "\n");
+}
+
+static void
+dump_style(void)
+{
+  match_byte(1);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  match_byte_assert(1);
+  get_string();     /* foreground */
+  get_string();     /* background */
+  get_string();     /* font */
+  if (!match_byte(14))
+    match_byte_assert(12); /* size? */
+}
+
 static char *
 dump_nested_string(void)
 {
@@ -255,7 +288,10 @@ dump_nested_string(void)
   match_byte_assert (0);
   int outer_end = get_end();
   s = dump_counted_string();
-  match_byte_assert(0x58);
+  if (match_byte(0x31))
+    dump_style();
+  else
+    match_byte_assert(0x58);
   match_byte_assert(0x58);
   if (pos != outer_end)
     {
@@ -308,19 +344,7 @@ dump_optional_value(FILE *stream)
           dump_counted_string();
 
           if (match_byte(0x31))
-            {
-              /* Only one example in the corpus. */
-              match_byte(1);
-              match_byte(0);
-              match_byte(0);
-              match_byte(0);
-              match_byte_assert(1);
-              get_string();     /* foreground */
-              get_string();     /* background */
-              get_string();     /* font */
-              if (!match_byte(14))
-                match_byte_assert(12); /* size? */
-            }
+            dump_style();
           else
             match_byte_assert(0x58);
           if (match_byte(0x31))
@@ -357,7 +381,7 @@ dump_optional_value(FILE *stream)
       else if (match_u32 (2))
         {
           fprintf(stream, "(special 2)");
-          if (!match_byte(0))
+          if (!match_byte(0) && !match_byte(1))
             match_byte_assert(2);
           match_byte_assert(0);
           if (!match_u32 (2) && !match_u32(1))
@@ -792,24 +816,6 @@ dump_title(void)
     }
 }
 
-static void __attribute__((unused))
-hex_dump(int ofs, int n)
-{
-  for (int i = 0; i < n; i++)
-    {
-      int c = data[ofs + i];
-#if 1
-      if (i && !(i % 16))
-        fprintf(stderr, "-");
-      else
-        fprintf(stderr, " ");
-#endif
-      fprintf(stderr, "%02x", c);
-      //fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
-    }
-  fprintf(stderr, "\n");
-}
-
 static void
 dump_fonts(void)
 {
@@ -854,8 +860,8 @@ dump_fonts(void)
                 match_u32_assert(5);
               if (!match_u32(10) && !match_u32(11) && !match_u32(5))
                 match_u32_assert(9);
-              if (!match_u32(0))
-                match_u32_assert(1);
+              if (!match_u32(0) && !match_u32(1))
+                match_u32_assert(2);
             }
           else
             {
@@ -885,7 +891,7 @@ dump_fonts(void)
       assert(x3 >= 117);
       int len = data[pos + 0x34];
       if (len)
-        fprintf(stderr, "<tablelook>%.*s</tablelook>\n", len, &data[pos + 0x35]);
+        printf("<tablelook>%.*s</tablelook>\n", len, &data[pos + 0x35]);
     }
   pos += x3;
 
@@ -904,8 +910,9 @@ dump_fonts(void)
     match_byte_assert(1);
   if (version > 1)
     {
-      if (!match_byte(0x97) && !match_byte(0x98) && !match_byte(0x99))
-        match_byte_assert(0x9a);
+      if (!match_byte(0x97) && !match_byte(0x98)
+          && !match_byte(0x99) && !match_byte(0x9a))
+        match_byte_assert(0x9b);
       match_byte_assert(7);
       match_byte_assert(0);
       match_byte_assert(0);
@@ -953,8 +960,8 @@ dump_fonts(void)
 
       match_byte_assert(1);
       match_byte_assert(0);
-      if (!match_byte(3))
-        match_byte_assert(4);
+      if (!match_byte(3) && !match_byte(4))
+        match_byte_assert(5);
       match_byte_assert(0);
       match_byte_assert(0);
       match_byte_assert(0);
@@ -973,8 +980,9 @@ dump_fonts(void)
       if (!match_byte(0))
         match_byte_assert(1);
 
-      if (!match_byte(0x97) && !match_byte(0x98) && !match_byte(0x99))
-        match_byte_assert(0x9a);
+      if (!match_byte(0x97) && !match_byte(0x98)
+          && !match_byte(0x99) && !match_byte(0x9a))
+        match_byte_assert(0x9b);
       match_byte_assert(7);
       match_byte_assert(0);
       match_byte_assert(0);
@@ -1030,6 +1038,11 @@ dump_fonts(void)
       if (!match_byte(0))
         match_byte_assert(1);
 
+      if (pos < outer_end)
+        {
+          match_u32_assert(2000000);
+          match_u32_assert(0);
+        }
       assert(pos == outer_end);
 
       pos = outer_end;