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);
vallab = get_string ();
printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
- if (!match_u32 (1) && !match_u32(2))
- match_u32_assert (3);
+ if (!match_byte (1) && !match_byte(2))
+ match_byte_assert (3);
+ match_byte (0);
+ match_byte (0);
+ match_byte (0);
match_byte (0);
match_byte (0);
match_byte (0);
else if (match_byte (0x31))
{
int subn;
- int total_subs = 1;
- match_u32_assert (0);
- match_u32_assert (0);
- subn = get_u32 ();
- printf ("nested %d bytes", subn);
- pos += subn;
+ if (match_u32 (1))
+ {
+ printf("(footnote %d) ", get_u32());
+ match_byte_assert (0);
+ match_byte_assert (0);
+ int subn = get_u32 ();
+ printf ("nested %d bytes", subn);
+ pos += subn;
+ }
+ else
+ {
+ match_u32_assert (0);
+ match_u32_assert (0);
+ subn = get_u32 ();
+ 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++)
{
}
else
{
- int total_subs = 1;
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++)
{
else
{
int subn;
- int total_subs = 1;
match_byte (0);
match_byte_assert (0x31);
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++)
{
if (!match_byte(0) && !match_byte(1))
match_byte_assert(2);
- match_u32_assert(2);
+ if (!match_u32(0))
+ match_u32_assert(2);
if (!match_byte(0))
match_byte_assert(1);
match_byte(0);