Small improvement.

diff --git a/dump.c b/dump.c
index e8f865062e58ccd6b5e47adec2e8377a1769f9dd..bd12c3eb23a22db2ea5fc968408e0ef3fe639a78 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -205,7 +205,7 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
       match_byte (0);
       match_byte (0);
       match_byte (0);

-      match_byte (1);
+      match_byte (1) || match_byte(3);

       match_byte (1);
       match_byte (0);
       match_byte (0);
       match_byte (1);
       match_byte (0);
       match_byte (0);


@@ -284,7 +284,6 @@ dump_value(int level)
   else if (match_byte (0x31))
     {
       int subn;
   else if (match_byte (0x31))
     {
       int subn;

-      int total_subs = 1;

 
       if (match_u32 (1))
         {
 
       if (match_u32 (1))
         {


@@ -304,14 +303,14 @@ dump_value(int level)
           pos += subn;
         }
       printf ("; \"%s\", substitutions:", get_string());
           pos += subn;
         }
       printf ("; \"%s\", substitutions:", get_string());

-      for (;;)
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)

         {
         {

-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);

         }
         }

+      printf (" (total %d)", total_subs);

 
       for (int i = 0; i < total_subs; i++)
         {
 
       for (int i = 0; i < total_subs; i++)
         {


@@ -321,18 +320,17 @@ dump_value(int level)
     }
   else
     {
     }
   else
     {

-      int total_subs = 1;

 
       match_byte_assert (0x58);
       printf ("\"%s\" with substitutions:", get_string());
 
       match_byte_assert (0x58);
       printf ("\"%s\" with substitutions:", get_string());

-      for (;;)
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)

         {
         {

-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);

         }
         }

+      printf (" (total %d)", total_subs);

 
       for (int i = 0; i < total_subs; i++)
         {
 
       for (int i = 0; i < total_subs; i++)
         {


@@ -414,7 +412,6 @@ dump_dim_value(int level)
   else
     {
       int subn;
   else
     {
       int subn;

-      int total_subs = 1;

 
       match_byte (0);
       match_byte_assert (0x31);
 
       match_byte (0);
       match_byte_assert (0x31);


@@ -424,14 +421,14 @@ dump_dim_value(int level)
       printf ("nested %d bytes", subn);
       pos += subn;
       printf ("; \"%s\", substitutions:", get_string());
       printf ("nested %d bytes", subn);
       pos += subn;
       printf ("; \"%s\", substitutions:", get_string());

-      for (;;)
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)

         {
         {

-          int n_subst = get_u32();
-          if (!n_subst)
-            break;
-          printf (" %d", n_subst);
-          total_subs *= n_subst;
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);

         }
         }

+      printf (" (total %d)", total_subs);

 
       for (int i = 0; i < total_subs; i++)
         {
 
       for (int i = 0; i < total_subs; i++)
         {

diff --git a/notes b/notes
index bf780bd6b871c1d53c155eef1decff53eb96f2b1..3048de69c250c8cf87e3d054ae9141f74cdaf8d9 100644 (file)
--- a/notes
+++ b/notes
@@ -1078,42 +1078,6 @@ web/a57e5529f1f2d4b25f5b9ad78f91864e/00000000034_lightTableData.bin (Between-Sub
        03 "N" 58 "n" "N" i1 i2 i1 00 00 00 00 00 00 00 00
 
 
        03 "N" 58 "n" "N" i1 i2 i1 00 00 00 00 00 00 00 00
 
 

-web/67e54cc8a549f4a66331c0401ff4a775/00000000079_lightTableData.bin (Tests of Within-Subjects Contrasts):
-
-This one is just puzzling.
-
-    i4
-
-    03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 02 i2 00 00 i1 00 i1
-       03 "Linear" 58 "linear" "Linear" i1 i2 00 00 00 00 00 00 00 00
-
-    03 "Measure" 58 "measure_3" "Measure" 01 00 00 i2 00 00 01 i1 i1 00
-       58 "MEASURE_^1" i1 00 00 00 00
-           01 58 F40.0(1) 00 00 00 i2 00 00 00 00 00 00 00 00
-
-    03 "Source" 58 "source_of_variation" "Source" 01 00 00 i2 00 00 01 i2 i5 00
-       58 "[%1: * ^1:]1" i1 i1 00 00 00 00
-           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
-       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 i1 00 00 00 00
-           05 58 "Word_Color" 00 00 00 00 i1 i2 i1 00 00 00 00 00
-       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 i1 00 00 00 00
-           05 58 "Order" 00 00 00 00 i1 i2 i2 00 00 00 00 00
-       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-           03 "Word_Type" 58 "" "Word_Type" 00 i3 00 00 00 00
-           05 58 "Word_Color" 00 00 00 00 i1 00
-       03 " * " 58 00 00 00 00 " * " 00 00 00 00 00
-       05 58 "Order" 00 00 00 00 i1 i2 i3 00 00 00 00 00 58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
-           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 00 00 i2 i4 00 00 00 00
-
-    03 "Statistics" 58 "statistics_10" "Statistics" 01 00 01 i2 01 00 01 i3 i6
-       03 "Type III Sum of Squares" 58 "type_iii_sum_of_squares" "Type III Sum of Squares" i1 i2 00 00 00 00 00 00 00 00
-       03 "df" 58 "df" "df" i1 i2 i1 00 00 00 00
-       03 "Mean Square" 58 "mean_square" "Mean Square" i1 i2 i2 00 00 00 00
-       03 "F" 58 "f_value" "F" i1 i2 i3 00 00 00 00
-       03 "Sig." 58 "significance_level" "Sig." i1 i2 i4 00 00 00 00
-       03 "Partial Eta Squared" 58 "estimates_of_effect_size" "Partial Eta Squared" i1 i2 i5 i0

 
 web/7a17f5600db5be64b985ac37b1346aa8/00000000072_lightTableData.bin (Between-Subjects Factors):
 
 
 web/7a17f5600db5be64b985ac37b1346aa8/00000000072_lightTableData.bin (Between-Subjects Factors):
 


@@ -1235,6 +1199,162 @@ web/f1b07f87ef9cd720e78efebe4f2551fa/0000000007912_lightTableData.bin (Pairwise
     05 58 "SA_POST2" 00 00 00 00 i3 i2 i11 00 00 00 00
 
 
     05 58 "SA_POST2" 00 00 00 00 i3 i2 i11 00 00 00 00
 
 

+web/67e54cc8a549f4a66331c0401ff4a775/00000000079_lightTableData.bin (Tests of Within-Subjects Contrasts):
+
+This one is just puzzling.
+
+    i4
+
+    03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 02 i2 00 00 i1 00 i1
+       03 "Linear" 58 "linear" "Linear" i1 i2 00 00 00 00 00 00 00 00
+
+    03 "Measure" 58 "measure_3" "Measure" 01 00 00 i2 00 00 01 i1 i1 00
+       58 "MEASURE_^1" i1 00 00 00 00
+           01 58 F40.0(1) 00 00 00 i2 00 00 00 00 00 00 00 00
+
+    03 "Source" 58 "source_of_variation" "Source" 01 00 00 i2 00 00 01 i2 i5 00
+       58 "[%1: * ^1:]1" i1 i1 00 00 00 00
+           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 i1 00 00 00 00
+           05 58 "Word_Color" 00 00 00 00 i1 i2 i1 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 i1 00 00 00 00
+           05 58 "Order" 00 00 00 00 i1 i2 i2 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+           03 "Word_Type" 58 "" "Word_Type" 00 i3 00 00 00 00
+           05 58 "Word_Color" 00 00 00 00 i1 00
+       03 " * " 58 00 00 00 00 " * " 00 00 00 00 00
+       05 58 "Order" 00 00 00 00 i1 i2 i3 00 00 00 00 00 58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
+           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 00 00 i2 i4 00 00 00 00
+
+    03 "Statistics" 58 "statistics_10" "Statistics" 01 00 01 i2 01 00 01 i3 i6
+       03 "Type III Sum of Squares" 58 "type_iii_sum_of_squares" "Type III Sum of Squares" i1 i2 00 00 00 00 00 00 00 00
+       03 "df" 58 "df" "df" i1 i2 i1 00 00 00 00
+       03 "Mean Square" 58 "mean_square" "Mean Square" i1 i2 i2 00 00 00 00
+       03 "F" 58 "f_value" "F" i1 i2 i3 00 00 00 00
+       03 "Sig." 58 "significance_level" "Sig." i1 i2 i4 00 00 00 00
+       03 "Partial Eta Squared" 58 "estimates_of_effect_size" "Partial Eta Squared" i1 i2 i5 i0
+
+web/c4757deb6f4f21d5f51745073835937d/000000000171_lightTableData.bin (Averaged Multivariate Tests):
+
+    i3
+
+    ...
+
+    03 "Within Subjects Effect" 58 "within-subjects_3" "Within Subjects Effect" 01 00 00 i2 00 00 01 i1 i4 00
+       58 "[%1: * ^1:]1" i1 i1 00 00 00 00
+           03 "Time" 58 00 00 00 00 "Time" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+           03 "Time" 58 00 00 00 00 "Time" 00 i1 00 00 00 00
+           05 58 "Lakes" 00 00 00 00 i1 i2 i1 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+           03 "Time" 58 00 00 00 00 "Time" 00 i1 00 00 00 00
+           05 58 "Treatments" 00 00 00 00 i1 i2 i2 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+           03 "Time" 58 00 00 00 00 "Time" 00 i3 00 00 00 00
+           05 58 "Lakes" "" 01 i0 
+           03 " * " 58 00 00 00 00 " * " 00 00 00 00 00
+       05 58 "Treatments" 00 00 00 00 i1 i2 i3 00 00 00 00
+
+    03 "Statistics" 58 "statistics_10" "Statistics" 01 00 01 i2 01 00 01 i2 i5
+       03 "Value" 58 "value_18" "Value" i1 i2 00 00 00 00 00 00 00 00
+       03 "F" 58 "f_value" "F" i1 i2 i1 00 00 00 00
+       03 "Hypothesis df" 58 "df" "Hypothesis df" i1 i2 i2 00 00 00 00
+       03 "Error df" 58 "error_df" "Error df" i1 i2 i3 00 00 00 00
+       03 "Sig." 58 "significance_level" "Sig." i1 i2 i4 00 00 00 00 00 00 00 00
+
+web/c50e357352131aa1a8925003483b31ad/000000000161_lightTableData.bin (Custom Univariate Tests):
+
+i4
+
+03 "Epsilon Corrections" 58 "epsilon_general_loglinear" "Epsilon Corrections" 01 00 00 i2 01 00 i1 00 i4
+    03 "Sphericity Assumed" 58 "sphericity_assumed" "Sphericity Assumed" i1 i2 00 00 00 00 00 00 00 00
+    03 "Greenhouse-Geisser" 58 "greenhouse-geisser_epsilon" "Greenhouse-Geisser" i1 i2 i1 00 00 00 00
+    03 "Huynh-Feldt" 58 "huynh-feldt_epsilon" "Huynh-Feldt" i1 i2 i2 00 00 00 00
+    03 "Lower-bound" 58 "lowerbound_epsilon" "Lower-bound" i1 i2 i3 00 00 00 00
+
+03 "Measure" 58 "measure_3" "Measure" 01 00 00 i2 00 00 01 i1 i4
+    03 "ALT" 58 00 00 00 00 "ALT" 00 00 00 00 i2 00 00 00 00 00 00 00 00
+    03 "VLT" 58 00 00 00 00 "VLT" 00 00 00 00 i2 i1 00 00 00 00
+    03 "PSS" 58 00 00 00 00 "PSS" 00 00 00 00 i2 i2 00 00 00 00
+    03 "FWHM" 58 00 00 00 00 "FWHM" 00 00 00 00 i2 i3 00 00 00 00
+
+03 "Source" 58 "source_of_variation" "Source" 01 00 00 i2 00 00 01 i2 i21 00
+    58 "[%1: * ^1:]1" i1 i1 00 00 00 00
+        03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 i1 00 00 00 00
+       05 58 "Gender" "Gender" i1 i2 i1 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
+        03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 i2 i2 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1 i1 00 00 00 00
+        03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i3 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 i1 00 00 00 00
+       05 58 "Gender" "Gender" i1 i2 i4 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
+        03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i5 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1 i1 00 00 00 00
+        03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i6 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
+        03 "Area" 58 00 00 00 00 "Area" 00 i1 00 00 00 00
+        05 58 "Gender" "Gender" i1 i2 i7 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
+        03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i8 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1 i2 00 00 00 00
+        03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+        03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i9 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i2 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 i1 00 00 00 00
+       05 58 "Gender" "Gender" i1 i2 i10 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i2 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i11 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1 i2 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i12 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i2 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 i1 00 00 00 00
+       05 58 "Gender" "Gender" i1 i2 i13 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i2 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i14 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1 i2 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i15 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i2 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 i1 00 00 00 00
+        05 58 "Gender" "Gender" i1 i2 i16 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i2 00 00 00 00 03 "Size_AOI"
+       58 00 00 00 00 "Size_AOI" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i17 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1 i3 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i18 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i3 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 i1 00 00 00 00
+       05 58 "Gender" "Gender" i1 i2 i19 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1 i3 00 00 00 00
+       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 00
+       03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i20 00 00 00 00
+
+    03 "Statistics" 58 "statistics_10" "Statistics" 01 00 01 i2 01 00 01 i3 i6
+    03 "Type III Sum of Squares" 58 "type_iii_sum_of_squares" "Type III Sum of Squares" i1 i2 00 00 00 00 00 00 00 00
+    03 "df" 58 "df" "df" i1 i2 i1 00 00 00 00
+    03 "Mean Square" 58 "mean_square" "Mean Square" i1 i2 i2 00 00 00 00
+    03 "F" 58 "f_value" "F" i1 i2 i3 00 00 00 00
+    03 "Sig." 58 "significance_level" "Sig." i1 i2 i4 00 00 00 00
+    03 "Partial Eta Squared" 58 "estimates_of_effect_size" "Partial Eta Squared" i1 i2 i5 00 00 00 00 00 00 00 00
+
+

 Data: tdump21 (germano/Crosstabs.pdf)
 -------------
 
 Data: tdump21 (germano/Crosstabs.pdf)
 -------------