From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 7 Nov 2014 03:22:28 +0000 (-0800)
Subject: More dump_data_value().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f799c10d8ca6d673fde7486ec90e6ab85b0d6d;p=pspp

More dump_data_value().
---

diff --git a/dump.c b/dump.c
index a7d7e0d167..cbf4e3a51f 100644
--- a/dump.c
+++ b/dump.c
@@ -801,25 +801,9 @@ dump_data(void)
           match_byte (0);
           match_byte (0);
         }
-      else if (match_byte(0x31))
+      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
-            {
-              match_u32_assert (0);
-              match_u32_assert (0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
+          dump_data_value_31();
           char *base = get_string();
           int x = get_u32();
           printf ("\"%s\"; %d variables:\n", base, x);
@@ -877,55 +861,6 @@ dump_data(void)
                 }
             }
         }
-      else
-        {
-          match_byte_assert (0x58);
-          char *base = get_string();
-          int x = get_u32();
-          printf ("\"%s\" with %d variables:\n", base, x);
-          for (int i = 0; i < x; i++)
-            {
-              int y = get_u32();
-              if (!y)
-                y = 1;
-              else
-                match_u32_assert(0);
-              for (int j = 0; j <= 0; 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 <= 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 if (match_byte (1))
-                    {
-                      unsigned int format;
-                      double value;
-
-                      dump_data_value_31();
-                      format = get_u32 ();
-                      value = get_double ();
-                      printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
-                    }
-                  else
-                    dump_value (1);
-                  putchar('\n');
-                }
-            }
-        }
       putchar('\n');
     }
 }