From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 1 Nov 2014 05:11:19 +0000 (-0700)
Subject: Fix some more.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896cd6b923b09916b7ba8e07dd69ee22687f713d;p=pspp

Fix some more.
---

diff --git a/dump.c b/dump.c
index 24804ea13d..0716a739d0 100644
--- a/dump.c
+++ b/dump.c
@@ -253,7 +253,8 @@ dump_value(int level)
       format = get_u32 ();
       vallab = get_string ();
       var = get_string ();
-      match_byte_assert (2);
+      if (!match_byte(1))
+        match_byte_assert (2);
       value = get_string ();
       printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
@@ -446,7 +447,8 @@ dump_category(int level)
   else if (match_byte (1))
     {
       match_byte (0);
-      match_u32_assert (1);
+      if (!match_u32 (2))
+        match_u32_assert (1);
       match_byte (0);
       get_u32();
     }
diff --git a/notes b/notes
index e3119b7d87..f127db5e39 100644
--- a/notes
+++ b/notes
@@ -1058,6 +1058,26 @@ web/a57e5529f1f2d4b25f5b9ad78f91864e/00000000031021_lightTableData.bin (POSTHOC
 
     ...
 
+web/a57e5529f1f2d4b25f5b9ad78f91864e/00000000034_lightTableData.bin (Between-Subjects Factors):
+
+    i2
+
+    03 "Factor Levels" 58 "factor_levels" "Factor Levels" 01 00 00 i2 01 00 i1 00 i2
+	05 58 "Lakes" 00 00 00 00 02 00 00 01 i2 ff ff ff ff i3
+	    04 58 A16.0 "" "Lakes" 01 "Greene's Lake" 00 00 00 i2 00 00 00 00 00 00 00 00
+	    04 58 00 10 i1 00 00 "Lakes" 01 "Lake Genesereth" 00 00 00 i2 i1 00 00 00 00
+	    04 58 00 10 i1 00 00 "Lakes" 01 "Lake Michigan" 00 00 00 i2 i2 00 00 00 00
+	05 58 "Treatments" 00 00 00 00 02 00 00 01 i2 ff ff ff ff i4
+	    04 58 00 03 i1 00 00 "Treatments" 01 "C" 00 00 00 i2 i3 00 00 00 00
+	    04 58 00 03 i1 00 00 "Treatments" 01 "N" 00 00 00 i2 i4 00 00 00 00
+	    04 58 00 03 i1 00 00 "Treatments" 01 "NP" 00 00 00 i2 i5 00 00 00 00
+	    04 58 00 03 i1 00 00 "Treatments" 01 "P" 00 00 00 i2 i6 00 00 00 00
+
+    03 "Properties" 58 "properties_dimension" "Properties" 01 00 01 i2 01 00 01 i1 i2
+	03 "Value Label" 58 "value_labels_2" "Value Label" i1 i2 00 00 00 00 00 00 00 00
+	03 "N" 58 "n" "N" i1 i2 i1 00 00 00 00 00 00 00 00
+
+
 Data: tdump21 (germano/Crosstabs.pdf)
 -------------