From e4eab5f61a02dad8cd22e01d099e5e2a2ac63f6a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 6 Nov 2014 19:25:20 -0800 Subject: [PATCH] Generalize dump_value(). --- dump.c | 176 ++++++++++++++++++--------------------------------------- 1 file changed, 56 insertions(+), 120 deletions(-) diff --git a/dump.c b/dump.c index cbf4e3a51f..ff5dcfd4e2 100644 --- a/dump.c +++ b/dump.c @@ -147,6 +147,59 @@ get_string(const char *where) } #define get_string() get_string(WHERE) +static void +dump_value_31(void) +{ + if (match_byte (0x31)) + { + if (match_u32 (0)) + { + match_u32_assert (0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + else 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 if (match_u32 (2)) + { + printf("(special 2)"); + match_byte_assert(0); + match_byte_assert(0); + match_u32_assert(1); + match_byte_assert(0); + match_byte_assert(0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + else + { + match_u32_assert(3); + printf("(special 3)"); + match_byte_assert(0); + match_byte_assert(0); + match_byte_assert(1); + match_byte_assert(0); + int subn = get_u32 (); + printf ("nested %d bytes, ", subn); + pos += subn; + subn = get_u32 (); + printf ("nested %d bytes, ", subn); + pos += subn; + } + } + else + match_byte_assert (0x58); +} + static void dump_value(int level) { @@ -160,47 +213,7 @@ dump_value(int level) if (match_byte (3)) { char *s1 = get_string(); - if (match_byte (0x31)) - { - 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 if (match_u32 (2)) - { - printf("(special 2)"); - match_byte_assert(0); - match_byte_assert(0); - match_u32_assert(1); - match_byte_assert(0); - match_byte_assert(0); - int subn = get_u32 (); - printf ("nested %d bytes", subn); - pos += subn; - } - else - { - match_u32_assert(3); - printf("(special 3)"); - match_byte_assert(0); - match_byte_assert(0); - match_byte_assert(1); - match_byte_assert(0); - int subn = get_u32 (); - printf ("nested %d bytes, ", subn); - pos += subn; - subn = get_u32 (); - printf ("nested %d bytes, ", subn); - pos += subn; - } - } - else - match_byte_assert (0x58); + dump_value_31(); char *s2 = get_string(); char *s3 = get_string(); if (strcmp(s1, s3)) @@ -276,20 +289,7 @@ dump_value(int level) unsigned int format; double value; - if (match_byte (0x31)) - { - 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_byte_assert (0x58); + dump_value_31(); format = get_u32 (); value = get_double (); printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff); @@ -299,73 +299,9 @@ dump_value(int level) match_byte (0); match_byte (1); } - else if (match_byte (0x31)) - { - 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); - int subn = get_u32 (); - printf ("nested %d bytes", subn); - pos += subn; - } - char *base = get_string(); - int x = get_u32(); - printf ("\"%s\"; %d variables:\n", base, x); - if (match_u32(0)) - { - for (int i = 0; i < x; i++) - { - dump_value (level+1); - putchar('\n'); - } - } - else - { - for (int i = 0; i < x; i++) - { - int y = get_u32(); - match_u32_assert(0); - for (int j = 0; j <= level; j++) - printf (" "); - printf("variable %d has %d values:\n", i, y); - for (int j = 0; j < y; j++) - { - if (match_byte(3)) - { - char *a = get_string(); - match_byte_assert(0x58); - char *b = get_string(); - char *c = get_string(); - for (int k = 0; k <= level + 1; k++) - printf (" "); - printf ("\"%s\", \"%s\", \"%s\"", a, b, c); - match_byte(0); - match_byte(0); - match_byte(0); - match_byte(0); - match_byte(0); - } - else - dump_value (level+1); - putchar('\n'); - } - } - } - } else { - - match_byte_assert (0x58); + dump_value_31(); char *base = get_string(); int x = get_u32(); printf ("\"%s\" with %d variables:\n", base, x); -- 2.30.2