From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 2 Nov 2014 05:32:49 +0000 (-0700)
Subject: Fix one more.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec2b976a8db31a7f3f096842e98a6ee86d74f0bf;p=pspp

Fix one more.
---

diff --git a/dump.c b/dump.c
index 14a8472042..49f4a888b8 100644
--- a/dump.c
+++ b/dump.c
@@ -689,7 +689,10 @@ dump_data(void)
             {
               if (match_u32 (0))
                 {
-                  match_u32_assert (0);
+                  if (match_u32 (1))
+                    get_string();
+                  else
+                    match_u32_assert (0);
                   int subn = get_u32 ();
                   printf ("nested %d bytes", subn);
                   pos += subn;
@@ -731,6 +734,7 @@ dump_data(void)
               if (match_u32 (0))
                 {
                   match_u32_assert (1);
+                  get_string ();
                   int subn = get_u32 ();
                   printf ("nested %d bytes", subn);
                   pos += subn;
diff --git a/notes b/notes
index b244a47f5b..902b7d49a0 100644
--- a/notes
+++ b/notes
@@ -1412,18 +1412,36 @@ williams/00000000053_lightTableData.bin:
 
 germano/Crosstabs/00000000014_lightTableData.bin:
 
-    00 00 00 00 00 00 00 00 i2 i1 i2 00 00 00 00 i1 432
-    i0 i0 03 
-    "<5                                       " i49 00 i1 
-    "a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
-    "<5                                       " 00 i96 00 00 00 00 03 
-    "<5                                       " i49 00 i1 
-    "a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
-    "<5                                       " 00 i192 00 00 00 00 03 
-    "<5                                       " i49 00 i1 
-    "a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
-    "<5                                       " 00 20 i1 00 00 00 03 
-    "<5                                       " i49 00 i1 
+    i432
+
+    i0 i0 03 "<5                                       " 31 i0 i1 "a" i11: (i5: ("" 58) 58 58) i0 "<5                                       " 00
+    i96 i0 03 "<5                                       " 31 i0 i1 "a" i11: (i5: ("" 58) 58 58) i0 "<5                                       " 00
+    i192 i0 03 "<5                                       " 31 i0 i1 "a" i11 i5 00 00 00 00 58 58 58 i0 "<5                                       " 00
+    20 i1 00 00 00 03 "<5                                       " 31 i0 i1 "a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 "<5                                       " 00
+    80 i1 00 00 00 01 58 F40.0(12)
+    i8 00 00 00 00 01 31 i0 i1 "a" i11: (i5: (i0 58) 58 58) F40.0(5)
+    i104 00 00 00 00 03 "<5                                       " 31 i0 i1 "a" i11: (i5: ("" 58) 58 58) 00 00 00 00 
+"<5                                       " 00 i200 00 00 00 00 03 
+"<5                                       " i49 00 i1 
+"a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
+"<5                                       " 00 28 i1 00 00 00 03 
+"<5                                       " i49 00 i1 
+"a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
+"<5                                       " 00 88 i1 00 00 00 01 58 F40.0(15)
+i16 00 00 00 00 03 
+"<5                                       " i49 00 i1 
+"a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
+"<5                                       " 00 i112 00 00 00 00 03 
+"<5                                       " i49 00 i1 
+"a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
+"<5                                       " 00 i208 00 00 00 00 03 
+"<5                                       " i49 00 i1 
+"a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
+"<5                                       " 00 30 i1 00 00 00 03 
+"<5                                       " i49 00 i1 
+"a" i11 i5 00 00 00 00 58 58 58 00 00 00 00 
+"<5                                       " 00 90 i1 00 00 00 01 58 F40.0(12)
+i24 00 00 00 00 01 i49 00 i1 
 
 web/c6b0660f7afccdb067f766a44ded21ab/00000000038_lightTableData.bin (Rotated Factor Matrix):
 
@@ -1504,6 +1522,7 @@ i0 i0 00 31 i0 i0 i72: (i66: ("" 31 "Fewer than two groups for depvar ^1 in spli
 "EROTICA VIRGIN" 02 
 
 
+
 Data: tdump21 (germano/Crosstabs.pdf)
 -------------