#define STR(x) XSTR(x)
#define WHERE __FILE__":" STR(__LINE__)
+static uint8_t
+get_byte(void)
+{
+ return data[pos++];
+}
+
static unsigned int
get_u32(void)
{
return x;
}
+static unsigned long long int
+get_u64(void)
+{
+ uint64_t x;
+ memcpy(&x, &data[pos], 8);
+ pos += 8;
+ return x;
+}
+
+static unsigned int
+get_be32(void)
+{
+ uint32_t x;
+ x = (data[pos] << 24) | (data[pos + 1] << 16) | (data[pos + 2] << 8) | data[pos + 3];
+ pos += 4;
+ return x;
+}
+
+static unsigned int
+get_u16(void)
+{
+ uint16_t x;
+ memcpy(&x, &data[pos], 2);
+ pos += 2;
+ return x;
+}
+
static double
get_double(void)
{
return x;
}
+static double __attribute__((unused))
+get_float(void)
+{
+ float x;
+ memcpy(&x, &data[pos], 4);
+ pos += 4;
+ return x;
+}
+
static bool
match_u32(uint32_t x)
{
}
#define match_u32_assert(x) match_u32_assert(x, WHERE)
+static bool __attribute__((unused))
+match_be32(uint32_t x)
+{
+ if (get_be32() == x)
+ return true;
+ pos -= 4;
+ return false;
+}
+
+static void
+match_be32_assert(uint32_t x, const char *where)
+{
+ unsigned int y = get_be32();
+ if (x != y)
+ {
+ fprintf(stderr, "%s: 0x%x: expected be%u, got be%u\n", where, pos - 4, x, y);
+ exit(1);
+ }
+}
+#define match_be32_assert(x) match_be32_assert(x, WHERE)
+
static bool
match_byte(uint8_t b)
{
}
#define get_string() get_string(WHERE)
+static char *
+get_string_be(const char *where)
+{
+ if (1
+ /*data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0*/
+ /*&& all_ascii(&data[pos + 4], data[pos])*/)
+ {
+ int len = data[pos + 2] * 256 + data[pos + 3];
+ char *s = malloc(len + 1);
+
+ memcpy(s, &data[pos + 4], len);
+ s[len] = 0;
+ pos += 4 + len;
+ return s;
+ }
+ else
+ {
+ fprintf(stderr, "%s: 0x%x: expected string\n", where, pos);
+ exit(1);
+ }
+}
+#define get_string_be() get_string_be(WHERE)
+
static int
get_end(void)
{
return pos + len;
}
+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);
+ }
+ for (int i = 0; i < n; i++)
+ {
+ int c = data[ofs + i];
+ fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
+ }
+ fprintf(stderr, "\n");
+}
+
static char *
dump_counted_string(void)
{
int inner_end = get_end();
if (pos != inner_end)
{
- match_u32_assert(0);
+ if (match_u32(5))
+ {
+ match_u32_assert(0);
+ match_byte_assert(0x58);
+ }
+ else
+ match_u32_assert(0);
if (match_byte(0x31))
s = get_string();
else
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)
{
}
fprintf(stream, "/>\n");
}
- else if (match_u32 (1))
- {
- fprintf(stream, "<footnote-ref index=%d", get_u32());
- dump_nested_string(stream);
- fprintf(stream, "/>\n");
- }
- else if (match_u32 (2))
- {
- fprintf(stream, "<special2 %d %d", data[pos], data[pos + 2]);
- if (!match_byte(0) && !match_byte(1))
- match_byte_assert(2);
- match_byte_assert(0);
- if (!match_u32 (2) && !match_u32(1))
- match_u32_assert(3);
- dump_nested_string(stream);
- fprintf(stream, "/>\n");
- }
else
{
- fprintf(stream, "<special3");
- match_u32_assert(3);
- match_byte_assert(0);
+ int count = get_u32();
+ fprintf(stream, "<footnote-ref indexes=\"");
+ for (int i = 0; i < count; i++)
+ {
+ if (i)
+ putc(' ', stream);
+ fprintf(stream, "%d", get_u16());
+ }
+ putc('"', stream);
match_byte_assert(0);
- match_byte_assert(1);
match_byte_assert(0);
- match_u32_assert(2);
- dump_nested_string(stream); /* Our corpus doesn't contain any examples with strings though. */
+ dump_nested_string(stream);
fprintf(stream, "/>\n");
}
}
}
static void
-dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_indexes)
+dump_category(FILE *stream, int level, int **indexes, int *allocated_indexes,
+ int *n_indexes)
{
for (int i = 0; i <= level; i++)
fprintf (stream, " ");
fprintf(stderr, "index not -1 but subcategories\n");
exit(1);
}
- if (*n_indexes >= max_indexes)
+ if (*n_indexes >= *allocated_indexes)
{
- fprintf(stderr, "too many categories (increase max_indexes)\n");
- exit(1);
+ *allocated_indexes = *allocated_indexes ? 2 * *allocated_indexes : 16;
+ *indexes = realloc(*indexes, *allocated_indexes * sizeof **indexes);
}
- indexes[(*n_indexes)++] = indx;
+ (*indexes)[(*n_indexes)++] = indx;
}
int expected_unindexed = indx == -1;
fprintf (stream, "<category-index>%d</category-index>\n", indx);
}
for (int i = 0; i < n_categories; i++)
- dump_category (stream, level + 1, indexes, n_indexes, max_indexes);
+ dump_category (stream, level + 1, indexes, allocated_indexes, n_indexes);
for (int i = 0; i <= level; i++)
fprintf (stream, " ");
printf ("</category>\n");
match_u32_assert(indx);
n_categories = get_u32();
- int indexes[2048];
+ int *indexes = NULL;
int n_indexes = 0;
+ int allocated_indexes = 0;
for (int i = 0; i < n_categories; i++)
- dump_category (stdout, 0, indexes, &n_indexes, sizeof indexes / sizeof *indexes);
+ dump_category (stdout, 0, &indexes, &allocated_indexes, &n_indexes);
check_permutation(indexes, n_indexes, "categories");
fprintf (stdout, "</dimension>\n");
match_byte(1);
printf ("</title-c>\n");
- match_byte(0);
- match_byte_assert(0x58);
+ if (match_byte(0x31))
+ {
+ printf ("<user-caption>\n");
+ dump_value(stdout, 0);
+ printf ("</user-caption>\n");
+ }
+ else
+ match_byte_assert(0x58);
if (match_byte(0x31))
{
printf ("<caption>\n");
dump_value(stdout, 0);
/* Custom footnote marker string. */
if (match_byte (0x31))
- dump_value(stderr, 0);
+ dump_value(stdout, 0);
else
match_byte_assert (0x58);
get_u32 ();
match_byte_assert(i);
match_byte_assert(0x31);
printf(" font=\"%s\"", get_string());
- match_byte_assert(0);
- match_byte_assert(0);
- if (!match_byte(0x40) && !match_byte(0x20) && !match_byte(0x80) && !match_byte(0x10) && !match_byte(0x70))
- match_byte_assert(0x50);
- match_byte_assert(0x41);
- if (!match_u32(0) && !match_u32(1))
- match_u32_assert(2);
- match_byte_assert(0);
- /* OK, this seems really unlikely to be totally correct, but it matches my corpus... */
- if (!match_u32(0) && !match_u32(2))
- {
- if (i == 7)
- match_u32_assert(0xfaad);
- else
- match_u32_assert(0);
- }
+ printf(" size=\"%gpt\"", get_float());
+
+ int style = get_u32();
+ if (style & 1)
+ printf(" bold=\"true\"");
+ if (style & 2)
+ printf(" italic=\"true\"");
+
+ bool underline = data[pos++];
+ if (underline)
+ printf(" underline=\"true\"");
+
+ int halign = get_u32();
+ printf("\nhalign=%d\n", halign);
+
+ int valign = get_u32();
+ printf("\nvalign=%d\n", valign);
- if (!match_u32(0) && !match_u32(1) && !match_u32(2))
- match_u32_assert(3);
printf (" fgcolor=\"%s\"", get_string());
printf (" bgcolor=\"%s\"", get_string());
+
+ if (!match_byte(0))
+ match_byte_assert(1);
match_u32_assert(0);
- match_u32_assert(0);
- match_byte_assert(0);
+ char *othercolor = get_string();
+ if (othercolor[0])
+ printf(" othercolor=\"%s\"", othercolor);
if (version > 1)
{
- if (i != 3)
- {
- if (!match_u32(8))
- match_u32_assert(5);
- if (!match_u32(10) && !match_u32(11) && !match_u32(5))
- match_u32_assert(9);
- if (!match_u32(0) && !match_u32(1))
- match_u32_assert(2);
- }
- else
- {
- get_u32();
- if (!match_u32(-1) && !match_u32(8))
- match_u32_assert(24);
- if (!match_u32(-1) && !match_u32(2))
- match_u32_assert(3);
- }
-
- /* Who knows? Ranges from -1 to 8 with no obvious pattern. */
- get_u32();
+ printf("\nfonts:");
+ for (int i = 0; i < 4; i++)
+ printf(" %2d", get_u32());
+ printf("\n");
}
printf ("/>\n");
}
- match_u32_assert(240);
- pos += 240;
+ int x1 = get_u32();
+ int x1_end = pos + x1;
+ printf("<borders>\n");
+ match_be32_assert(1);
+ int n_borders = get_be32();
+ for (int i = 0; i < n_borders; i++)
+ {
+ int type = get_be32();
+ int stroke = get_be32();
+ int color = get_be32();
+ printf(" <border type=\"%d\" stroke=\"%s\" color=\"#%06x\"/>\n",
+ type,
+ (stroke == 0 ? "none"
+ : stroke == 1 ? "solid"
+ : stroke == 2 ? "dashed"
+ : stroke == 3 ? "thick"
+ : stroke == 4 ? "thin"
+ : stroke == 5 ? "double"
+ : "<error>"),
+ color);
+ }
+ bool grid = get_byte();
+ pos += 3;
+ printf(" <grid show=\"%s\">\n", grid ? "yes" : "no");
+ printf("</borders>\n");
+ assert(pos == x1_end);
- match_u32_assert(18);
- pos += 18;
+ int skip = get_u32();
+ assert(skip == 18 || skip == 25);
+ pos += skip;
int x3 = get_u32();
+ int x3_end = pos + x3;
if (version == 3)
{
- assert(x3 >= 117);
- int len = data[pos + 0x34];
- if (len)
- printf("<tablelook>%.*s</tablelook>\n", len, &data[pos + 0x35]);
+ match_be32_assert(1);
+ get_be32();
+ printf("<settings layer=\"%d\"", get_be32());
+ if (!get_byte())
+ printf(" skipempty=\"false\"");
+ if (!get_byte())
+ printf(" showdimensionincorner=\"false\"");
+ if (!get_byte())
+ printf(" markers=\"numeric\"");
+ if (!get_byte())
+ printf(" footnoteposition=\"subscript\"");
+ get_byte();
+ pos += get_be32();
+ get_string_be();
+ char *look = get_string_be();
+ if (look[0])
+ printf(" look=\"%s\"", look);
+ printf(">\n");
}
- pos += x3;
+ pos = x3_end;
int count = get_u32();
pos += 4 * count;
const char *locale = get_string();
printf ("<locale>%s</locale>\n", locale);
- if (!match_u32(0))
- match_u32_assert(UINT32_MAX);
+ get_u32(); /* Seen: 0, UINT32_MAX, 2, 3, 4, 5, 6, 8, 9, 21, 24. */
if (!match_byte(0))
match_byte_assert(1);
match_byte_assert(0);
if (!match_byte(0))
match_byte_assert(1);
- if (version > 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);
- }
- else
- match_u32_assert(UINT32_MAX);
+ printf("<epoch>%d</epoch>\n", get_u32());
int decimal = data[pos];
int grouping = data[pos + 1];
else
{
match_byte_assert(',');
- if (!match_byte('.') && !match_byte(' '))
+ if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
match_byte_assert(0);
}
printf("<format decimal=\"%c\" grouping=\"", decimal);
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);
+ printf("<epoch2>%d</epoch2>\n", get_u32());
if (match_byte('.'))
{
else
{
match_byte_assert(',');
- if (!match_byte('.') && !match_byte(' '))
+ if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
match_byte_assert(0);
}
if (pos < outer_end)
{
- match_u32_assert(2000000);
+ printf("<seed>%d</seed>\n", get_u32());
match_u32_assert(0);
}
assert(pos == outer_end);
pos = outer_end;
}
else
- match_u32_assert(0);
+ {
+ pos = get_end();
+ }
}
int
/* Offset 8. */
match_byte_assert(0);
- match_byte_assert(0);
+ if (!match_byte(0))
+ match_byte_assert(1);
if (!match_byte(0))
match_byte_assert(1);
/* Offset 27. */
pos++;
pos++;
- match_byte_assert(0);
- match_byte_assert(0);
-
- /* Offset 31.
-
- This is the tableId, e.g. -4154297861994971133 would be 0xdca00003.
- We don't have enough context to validate it. */
- pos += 4;
+ pos++;
+ pos++;
- /* Offset 35. */
- pos += 4;
+ /* Offset 31. */
+ printf("<tableid>%lld</tableid>", get_u64());
dump_title ();
dump_fonts();
projects / pspp / blobdiff