X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=c247c4af661be8c50ef6312aa18f05c524088b68;hb=38a126b38f4963ba033120754e7a4f026e9fa01e;hp=e9a068699e005fba3778c5597181c93d0f8a6d4a;hpb=368df5e381894c9fa6bb2b51596a1a58b0d869a8;p=pspp

diff --git a/dump.c b/dump.c
index e9a068699e..c247c4af66 100644
--- a/dump.c
+++ b/dump.c
@@ -219,13 +219,9 @@ get_string(const char *where)
 #define get_string() get_string(WHERE)
 
 static char *
-dump_nested_string(void)
+dump_counted_string(void)
 {
   char *s = NULL;
-
-  match_byte_assert (0);
-  match_byte_assert (0);
-  int outer_end = pos + get_u32();
   int inner_end = pos + get_u32();
   if (pos != inner_end)
     {
@@ -240,6 +236,18 @@ dump_nested_string(void)
           exit(1);
         }
     }
+  return s;
+}
+
+static char *
+dump_nested_string(void)
+{
+  char *s = NULL;
+
+  match_byte_assert (0);
+  match_byte_assert (0);
+  int outer_end = pos + get_u32();
+  s = dump_counted_string();
   match_byte_assert(0x58);
   match_byte_assert(0x58);
   if (pos != outer_end)
@@ -260,7 +268,11 @@ dump_optional_value(FILE *stream)
         {
           if (match_u32 (1))
             {
-              /* Only "a" observed as a sample value (although it appears 44 times in the corpus). */
+              /* Corpus frequencies:
+                 124 "a"
+                 12 "b"
+                 8 "a, b"
+              */
               get_string();
             }
           else
@@ -283,25 +295,10 @@ dump_optional_value(FILE *stream)
             }
 
           int outer_end = pos + get_u32();
-          int inner_end = pos + get_u32();
-          if (pos != inner_end)
-            {
-              match_u32_assert(0);
-              if (match_byte(0x31))
-                {
-                  /* Appears to be a template string, e.g. '^1 cells (^2) expf < 5. Min exp = ^3...'.
-                     Probably doesn't actually appear in output because many examples look unpolished,
-                     e.g. 'partial list cases value ^1 shown upper...' */
-                  get_string();
-                }
-              else
-                match_byte_assert(0x58);
-              if (pos != inner_end)
-                {
-                  fprintf(stderr, "inner end discrepancy\n");
-                  exit(1);
-                }
-            }
+
+          /* This counted-string appears to be a template string,
+             e.g. "Design\: [:^1:]1 Within Subjects Design\: [:^1:]2". */
+          dump_counted_string();
 
           if (match_byte(0x31))
             {
@@ -358,7 +355,7 @@ dump_optional_value(FILE *stream)
           match_byte_assert(0);
           if (!match_u32 (2) && !match_u32(1))
             match_u32_assert(3);
-          dump_nested_string(); /* Our corpus doesn't contain any examples with strings though. */
+          dump_nested_string();
         }
       else
         {
@@ -435,32 +432,16 @@ dump_value(FILE *stream, int level)
   for (int i = 0; i <= level; i++)
     fprintf (stream, "    ");
 
-  if (match_byte (3))
-    {
-      char *text = get_string();
-      dump_optional_value(stream);
-      char *identifier = get_string();
-      char *text_eng = get_string();
-      fprintf (stream, "<string c=\"%s\"", text_eng);
-      if (identifier[0])
-        fprintf (stream, " identifier=\"%s\"", identifier);
-      if (strcmp(text_eng, text))
-        fprintf (stream, " local=\"%s\"", text);
-      fprintf (stream, "/>\n");
-      if (!match_byte (0))
-        match_byte_assert(1);
-    }
-  else if (match_byte (5))
+  if (match_byte (1))
     {
+      unsigned int format;
+      double value;
+
       dump_optional_value(stream);
-      char *name = get_string ();
-      char *label = get_string ();
-      fprintf (stream, "<variable name=\"%s\"", name);
-      if (label[0])
-        fprintf (stream, " label=\"%s\"", label);
-      fprintf (stream, "/>\n");
-      if (!match_byte(1) && !match_byte(2))
-        match_byte_assert(3);
+      format = get_u32 ();
+      value = get_double ();
+      fprintf (stream, "<number value=\"%.*g\" format=\"%s%d.%d\"/>\n",
+               DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
     }
   else if (match_byte (2))
     {
@@ -483,12 +464,27 @@ dump_value(FILE *stream, int level)
       if (!match_byte (1) && !match_byte(2))
         match_byte_assert (3);
     }
+  else if (match_byte (3))
+    {
+      char *text =  get_string();
+      dump_optional_value(stream);
+      char *identifier = get_string();
+      char *text_eng = get_string();
+      fprintf (stream, "<string c=\"%s\"", text_eng);
+      if (identifier[0])
+        fprintf (stream, " identifier=\"%s\"", identifier);
+      if (strcmp(text_eng, text))
+        fprintf (stream, " local=\"%s\"", text);
+      fprintf (stream, "/>\n");
+      if (!match_byte (0))
+        match_byte_assert(1);
+    }
   else if (match_byte (4))
     {
       unsigned int format;
       char *var, *vallab, *value;
 
-      match_byte_assert (0x58);
+      dump_optional_value(stream);
       format = get_u32 ();
       vallab = get_string ();
       var = get_string ();
@@ -503,16 +499,17 @@ dump_value(FILE *stream, int level)
         fprintf (stream, " label=\"%s\"/>\n", vallab);
       fprintf (stream, "/>\n");
     }
-  else if (match_byte (1))
+  else if (match_byte (5))
     {
-      unsigned int format;
-      double value;
-
       dump_optional_value(stream);
-      format = get_u32 ();
-      value = get_double ();
-      fprintf (stream, "<number value=\"%.*g\" format=\"%s%d.%d\"/>\n",
-               DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
+      char *name = get_string ();
+      char *label = get_string ();
+      fprintf (stream, "<variable name=\"%s\"", name);
+      if (label[0])
+        fprintf (stream, " label=\"%s\"", label);
+      fprintf (stream, "/>\n");
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert(3);
     }
   else
     {
@@ -579,10 +576,15 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
   int merge = data[pos];
   if (!match_byte(0))
     match_byte_assert (1);
+
   match_byte_assert (0);
+
   int unindexed = data[pos];
   if (!match_byte(0))
     match_byte_assert (1);
+
+  int x = get_u32 ();
+  pos -= 4;
   if (!match_u32 (0))
     match_u32_assert (2);
 
@@ -604,6 +606,11 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
           fprintf(stderr, "index not -1 but merged\n");
           exit(1);
         }
+      if (x != 2)
+        {
+          fprintf(stderr, "index not -1 but x != 2\n");
+          exit(1);
+        }
       if (n_categories != 0)
         {
           fprintf(stderr, "index not -1 but subcategories\n");
@@ -638,7 +645,7 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
   printf ("</category>\n");
 }
 
-static void
+static int
 dump_dim(int indx)
 {
   int n_categories;
@@ -669,36 +676,60 @@ dump_dim(int indx)
   check_permutation(indexes, n_indexes, "categories");
 
   fprintf (stdout, "</dimension>\n");
+  return n_indexes;
 }
 
 int n_dims;
+static int dim_n_cats[64];
+#define MAX_DIMS (sizeof dim_n_cats / sizeof *dim_n_cats)
+
 static void
 dump_dims(void)
 {
   n_dims = get_u32();
+  assert(n_dims < MAX_DIMS);
   for (int i = 0; i < n_dims; i++)
-    dump_dim (i);
+    dim_n_cats[i] = dump_dim (i);
 }
 
 static void
 dump_data(void)
 {
   /* The first three numbers add to the number of dimensions. */
-  int t = get_u32();
-  t += get_u32();
-  match_u32_assert(n_dims - t);
+  int l = get_u32();
+  int r = get_u32();
+  int c = n_dims - l - r;
+  match_u32_assert(c);
 
   /* The next n_dims numbers are a permutation of the dimension numbers. */
   int a[n_dims];
   for (int i = 0; i < n_dims; i++)
-    a[i] = get_u32();
+    {
+      int dim = get_u32();
+      a[i] = dim;
+
+      const char *name = i < l ? "layer" : i < l + r ? "row" : "column";
+      printf ("<%s dimension=\"%d\"/>\n", name, dim);
+    }
   check_permutation(a, n_dims, "dimensions");
 
   int x = get_u32();
   printf ("<data>\n");
   for (int i = 0; i < x; i++)
     {
-      printf ("    <datum index=\"%d\">\n", get_u32());
+      unsigned int indx = get_u32();
+      printf ("    <datum index=\"%d\" coords=", indx);
+
+      int coords[MAX_DIMS];
+      for (int i = n_dims; i-- > 0; )
+        {
+          coords[i] = indx % dim_n_cats[i];
+          indx /= dim_n_cats[i];
+        }
+      for (int i = 0; i < n_dims; i++)
+        printf("%c%d", i ? ',' : '"', coords[i]);
+
+      printf ("\">\n");
       match_u32_assert(0);
       if (version == 1)
         match_byte(0);