X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=a52cafddf0d414cb06ddd8464c9795949b91e2d9;hb=c82a9402434b9fc310c85754a03cca114b69f04e;hp=70ecab632058cf56a7146983f0da940f1e3c09d5;hpb=86009a9088ecdfddfacd7974f30b88cb89937d55;p=pspp
diff --git a/dump.c b/dump.c
index 70ecab6320..a52cafddf0 100644
--- a/dump.c
+++ b/dump.c
@@ -218,15 +218,18 @@ get_string(const char *where)
}
#define get_string() get_string(WHERE)
+static int
+get_end(void)
+{
+ int len = get_u32();
+ return pos + len;
+}
+
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();
+ int inner_end = get_end();
if (pos != inner_end)
{
match_u32_assert(0);
@@ -240,7 +243,60 @@ dump_nested_string(void)
exit(1);
}
}
- match_byte_assert(0x58);
+ return s;
+}
+
+static void __attribute__((unused))
+hex_dump(int ofs, int n)
+{
+ for (int i = 0; i < n; i++)
+ {
+ int c = data[ofs + i];
+#if 1
+ if (i && !(i % 16))
+ fprintf(stderr, "-");
+ else
+ fprintf(stderr, " ");
+#endif
+ fprintf(stderr, "%02x", c);
+ //fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
+ }
+ fprintf(stderr, "\n");
+}
+
+static void
+dump_style(FILE *stream)
+{
+ match_byte(1);
+ match_byte(0);
+ match_byte(0);
+ match_byte(0);
+ match_byte_assert(1);
+ char *fg = get_string(); /* foreground */
+ char *bg = get_string(); /* background */
+ char *font = get_string(); /* font */
+ int size = data[pos];
+ if (!match_byte(14))
+ match_byte_assert(12); /* size? */
+ fprintf(stream, " fgcolor=\"%s\" bgcolor=\"%s\" font=\"%s\" size=\"%d\"",
+ fg, bg, font, size);
+}
+
+static char *
+dump_nested_string(FILE *stream)
+{
+ char *s = NULL;
+
+ match_byte_assert (0);
+ match_byte_assert (0);
+ int outer_end = get_end();
+ s = dump_counted_string();
+ if (s)
+ fprintf(stream, " \"%s\"", s);
+ if (match_byte(0x31))
+ dump_style(stream);
+ else
+ match_byte_assert(0x58);
match_byte_assert(0x58);
if (pos != outer_end)
{
@@ -252,16 +308,23 @@ dump_nested_string(void)
}
static void
-dump_optional_value(FILE *stream)
+dump_value_modifier(FILE *stream)
{
if (match_byte (0x31))
{
if (match_u32 (0))
{
+ fprintf(stream, "\n");
return;
}
- 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);
- }
- }
+ int outer_end = get_end();
+
+ /* This counted-string appears to be a template string,
+ e.g. "Design\: [:^1:]1 Within Subjects Design\: [:^1:]2". */
+ char *template = dump_counted_string();
+ if (template)
+ fprintf(stream, " template=\"%s\"", template);
if (match_byte(0x31))
- {
- /* Only one example in the corpus. */
- match_byte(1);
- match_byte(0);
- match_byte(0);
- match_byte(0);
- match_byte_assert(1);
- get_string(); /* foreground */
- get_string(); /* background */
- get_string(); /* font */
- if (!match_byte(14))
- match_byte_assert(12); /* size? */
- }
+ dump_style(stream);
else
match_byte_assert(0x58);
if (match_byte(0x31))
@@ -344,32 +383,36 @@ dump_optional_value(FILE *stream)
fprintf(stderr, "outer end discrepancy\n");
exit(1);
}
+ fprintf(stream, "/>\n");
}
else if (match_u32 (1))
{
- fprintf(stream, "(footnote %d) ", get_u32());
- dump_nested_string();
+ fprintf(stream, "\n");
}
else if (match_u32 (2))
{
- fprintf(stream, "(special 2)");
- if (!match_byte(0))
+ fprintf(stream, "\n");
}
else
{
+ fprintf(stream, "\n");
}
}
else
@@ -435,32 +478,16 @@ dump_value(FILE *stream, int level)
for (int i = 0; i <= level; i++)
fprintf (stream, " ");
- if (match_byte (3))
+ if (match_byte (1))
{
- char *text = get_string();
- dump_optional_value(stream);
- char *identifier = get_string();
- char *text_eng = get_string();
- fprintf (stream, "\n");
- if (!match_byte (0))
- match_byte_assert(1);
- }
- else if (match_byte (5))
- {
- dump_optional_value(stream);
- char *name = get_string ();
- char *label = get_string ();
- fprintf (stream, "\n");
- if (!match_byte(1) && !match_byte(2))
- match_byte_assert(3);
+ unsigned int format;
+ double value;
+
+ dump_value_modifier(stream);
+ format = get_u32 ();
+ value = get_double ();
+ fprintf (stream, "\n",
+ DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
}
else if (match_byte (2))
{
@@ -468,7 +495,7 @@ dump_value(FILE *stream, int level)
char *var, *vallab;
double value;
- dump_optional_value (stream);
+ dump_value_modifier (stream);
format = get_u32 ();
value = get_double ();
var = get_string ();
@@ -478,17 +505,32 @@ dump_value(FILE *stream, int level)
if (var[0])
fprintf (stream, " variable=\"%s\"", var);
if (vallab[0])
- fprintf (stream, " label=\"%s\"/>\n", vallab);
+ fprintf (stream, " label=\"%s\"", vallab);
fprintf (stream, "/>\n");
if (!match_byte (1) && !match_byte(2))
match_byte_assert (3);
}
+ else if (match_byte (3))
+ {
+ char *text = get_string();
+ dump_value_modifier(stream);
+ char *identifier = get_string();
+ char *text_eng = get_string();
+ 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_value_modifier(stream);
format = get_u32 ();
vallab = get_string ();
var = get_string ();
@@ -503,20 +545,21 @@ 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, "\n",
- DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
+ dump_value_modifier(stream);
+ char *name = get_string ();
+ char *label = get_string ();
+ fprintf (stream, "\n");
+ if (!match_byte(1) && !match_byte(2))
+ match_byte_assert(3);
}
else
{
- dump_optional_value(stream);
+ dump_value_modifier(stream);
char *base = get_string();
int x = get_u32();
@@ -648,7 +691,7 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
printf ("\n");
}
-static void
+static int
dump_dim(int indx)
{
int n_categories;
@@ -679,36 +722,60 @@ dump_dim(int indx)
check_permutation(indexes, n_indexes, "categories");
fprintf (stdout, "\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 ("\n");
for (int i = 0; i < x; i++)
{
- printf (" \n", get_u32());
+ unsigned int indx = get_u32();
+ printf (" \n");
match_u32_assert(0);
if (version == 1)
match_byte(0);
@@ -808,8 +875,8 @@ dump_fonts(void)
match_u32_assert(5);
if (!match_u32(10) && !match_u32(11) && !match_u32(5))
match_u32_assert(9);
- if (!match_u32(0))
- match_u32_assert(1);
+ if (!match_u32(0) && !match_u32(1))
+ match_u32_assert(2);
}
else
{
@@ -833,25 +900,21 @@ dump_fonts(void)
match_u32_assert(18);
pos += 18;
- if (match_u32(117))
- pos += 117;
- else if (match_u32(142))
- pos += 142;
- else if (match_u32(143))
- pos += 143;
- else if (match_u32(150))
- pos += 150;
- else
+ int x3 = get_u32();
+ if (version == 3)
{
- match_u32_assert(16);
- pos += 16;
+ assert(x3 >= 117);
+ int len = data[pos + 0x34];
+ if (len)
+ printf("%.*s\n", len, &data[pos + 0x35]);
}
+ pos += x3;
int count = get_u32();
pos += 4 * count;
- const char *encoding = get_string();
- printf ("%s\n", encoding);
+ const char *locale = get_string();
+ printf ("%s\n", locale);
if (!match_u32(0))
match_u32_assert(UINT32_MAX);
@@ -862,8 +925,9 @@ dump_fonts(void)
match_byte_assert(1);
if (version > 1)
{
- if (!match_byte(0x97) && !match_byte(0x98) && !match_byte(0x99))
- match_byte_assert(0x9a);
+ if (!match_byte(0x97) && !match_byte(0x98)
+ && !match_byte(0x99) && !match_byte(0x9a))
+ match_byte_assert(0x9b);
match_byte_assert(7);
match_byte_assert(0);
match_byte_assert(0);
@@ -895,8 +959,111 @@ dump_fonts(void)
}
else
match_u32_assert(0);
- int skip = get_u32();
- pos += skip;
+
+ /* The last chunk is an outer envelope that contains two inner envelopes.
+ The second inner envelope has some interesting data like the encoding and
+ the locale. */
+ if (version == 3)
+ {
+ int outer_end = get_end();
+
+ /* First inner envelope: byte*33 int[n] int*[n]. */
+ pos = get_end();
+
+ /* Second inner envelope. */
+ assert(get_end() == outer_end);
+
+ match_byte_assert(1);
+ match_byte_assert(0);
+ if (!match_byte(3) && !match_byte(4))
+ match_byte_assert(5);
+ match_byte_assert(0);
+ match_byte_assert(0);
+ match_byte_assert(0);
+
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+
+ if (!match_byte(0))
+ match_byte_assert(1);
+ match_byte_assert(0);
+ if (!match_byte(0))
+ match_byte_assert(1);
+ if (!match_byte(0))
+ match_byte_assert(1);
+
+ if (!match_byte(0x97) && !match_byte(0x98)
+ && !match_byte(0x99) && !match_byte(0x9a))
+ match_byte_assert(0x9b);
+ match_byte_assert(7);
+ match_byte_assert(0);
+ match_byte_assert(0);
+
+ if (match_byte('.'))
+ {
+ if (!match_byte(',') && !match_byte('\''))
+ match_byte_assert(' ');
+ }
+ else
+ {
+ match_byte_assert(',');
+ if (!match_byte('.') && !match_byte(' '))
+ match_byte_assert(0);
+ }
+
+ pos += 8;
+ match_byte_assert(1);
+
+ if (outer_end - pos > 6)
+ {
+ /* There might be a pair of strings representing a dataset and
+ datafile name, or there might be a set of custom currency strings.
+ The custom currency strings start with a pair of integers, so we
+ can distinguish these from a string by checking for a null byte; a
+ small 32-bit integer will always contain a null and a text string
+ never will. */
+ int save_pos = pos;
+ int len = get_u32();
+ bool has_dataset = !memchr(&data[pos], '\0', len);
+ pos = save_pos;
+
+ if (has_dataset)
+ {
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+
+ match_u32_assert(0);
+ get_u32();
+ match_u32_assert(0);
+ }
+ }
+
+ if (match_u32(5))
+ {
+ for (int i = 0; i < 5; i++)
+ printf("%s\n", 'A' + i, get_string(), 'A' + i);
+ }
+ else
+ match_u32_assert(0);
+
+ match_byte_assert(0x2e);
+ if (!match_byte(0))
+ match_byte_assert(1);
+
+ if (pos < outer_end)
+ {
+ match_u32_assert(2000000);
+ match_u32_assert(0);
+ }
+ assert(pos == outer_end);
+
+ pos = outer_end;
+ }
+ else
+ match_u32_assert(0);
}
int
@@ -978,7 +1145,7 @@ main(int argc, char *argv[])
/* This might be a version number of some kind, because value 1 seems
to only appear in an SPV file that also required its own weird
- special cases in dump_optional_value(). */
+ special cases in dump_value_modifier(). */
version = get_u32();
pos -= 4;
if (!match_u32(1))