#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)
{
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)
{
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
}
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))
{
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
{
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))
{
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 ();
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
{
}
static void
-dump_category(int level, int *indexes, int *n_indexes, int max_indexes)
+dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_indexes)
{
for (int i = 0; i <= level; i++)
- fprintf (stdout, " ");
+ fprintf (stream, " ");
printf ("<category>\n");
- dump_value (stdout, level + 1);
- match_byte(1);
- match_byte(0);
- match_byte(0);
- match_byte(0);
+ dump_value (stream, level + 1);
+
+ int merge = data[pos];
+ if (!match_byte(0))
+ match_byte_assert (1);
- if (match_byte (1))
- {
- if (!match_byte (0) && !match_byte (1))
- match_byte_assert (2);
- }
- else if (!match_byte (2))
- match_byte_assert (0);
- match_byte_assert (0);
- match_byte_assert (0);
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);
+
int indx = get_u32();
int n_categories = get_u32();
- if (indx != -1)
+ if (indx == -1)
+ {
+ if (merge)
+ {
+ for (int i = 0; i <= level + 1; i++)
+ fprintf (stream, " ");
+ fprintf (stream, "<merge/>\n");
+ }
+ }
+ else
{
+ if (merge)
+ {
+ 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");
}
indexes[(*n_indexes)++] = indx;
}
+
+ int expected_unindexed = indx == -1;
+ if (unindexed != expected_unindexed)
+ {
+ fprintf(stderr, "unindexed (%d) mismatch with indx (%d)\n",
+ unindexed, indx);
+ exit(1);
+ }
+
if (n_categories == 0)
{
for (int i = 0; i <= level + 1; i++)
- fprintf (stdout, " ");
- fprintf (stdout, "<category-index>%d</category-index>\n", indx);
+ fprintf (stream, " ");
+ fprintf (stream, "<category-index>%d</category-index>\n", indx);
}
for (int i = 0; i < n_categories; i++)
- dump_category (level + 1, indexes, n_indexes, max_indexes);
+ dump_category (stream, level + 1, indexes, n_indexes, max_indexes);
for (int i = 0; i <= level; i++)
- fprintf (stdout, " ");
+ fprintf (stream, " ");
printf ("</category>\n");
}
-static void
+static int
dump_dim(int indx)
{
int n_categories;
int indexes[2048];
int n_indexes = 0;
for (int i = 0; i < n_categories; i++)
- dump_category (0, indexes, &n_indexes, sizeof indexes / sizeof *indexes);
+ dump_category (stdout, 0, indexes, &n_indexes, sizeof indexes / sizeof *indexes);
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);
projects / pspp / blobdiff