X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpfm-read.c;h=1999628c462ae7fdde3c15048d22995d37dcf464;hb=93abfcc57a1e6ff792e5ae01784172459eee783f;hp=c7a604dbf0949f2e2052dbbdc409fa48ce1381fe;hpb=4de79b34b329d1da6cdeb145993d3efd911e2967;p=pspp-builds.git

diff --git a/src/pfm-read.c b/src/pfm-read.c
index c7a604db..1999628c 100644
--- a/src/pfm-read.c
+++ b/src/pfm-read.c
@@ -540,45 +540,23 @@ read_variables (struct pfm_reader *r, struct dictionary *dict)
       convert_format (r, &fmt[3], &v->write, v);
 
       /* Range missing values. */
-      if (match (r, 'B'))
-	{
-	  v->miss_type = MISSING_RANGE;
-          v->missing[0] = parse_value (r, v);
-          v->missing[1] = parse_value (r, v);
-	}
+      if (match (r, 'B')) 
+        {
+          double x = read_float (r);
+          double y = read_float (r);
+          mv_add_num_range (&v->miss, x, y);
+        }
       else if (match (r, 'A'))
-	{
-	  v->miss_type = MISSING_HIGH;
-          v->missing[0] = parse_value (r, v);
-	}
+        mv_add_num_range (&v->miss, read_float (r), HIGHEST);
       else if (match (r, '9'))
-	{
-	  v->miss_type = MISSING_LOW;
-          v->missing[0] = parse_value (r, v);
-	}
+        mv_add_num_range (&v->miss, LOWEST, read_float (r));
 
       /* Single missing values. */
-      while (match (r, '8'))
-	{
-	  static const int map_next[MISSING_COUNT] =
-	    {
-	      MISSING_1, MISSING_2, MISSING_3, -1,
-	      MISSING_RANGE_1, MISSING_LOW_1, MISSING_HIGH_1,
-	      -1, -1, -1,
-	    };
-
-	  static const int map_ofs[MISSING_COUNT] = 
-	    {
-	      -1, 0, 1, 2, -1, -1, -1, 2, 1, 1,
-	    };
-
-	  v->miss_type = map_next[v->miss_type];
-	  if (v->miss_type == -1)
-	    error (r, _("Bad missing values for %s."), v->name);
-	  
-	  assert (map_ofs[v->miss_type] != -1);
-          v->missing[map_ofs[v->miss_type]] = parse_value (r, v);
-	}
+      while (match (r, '8')) 
+        {
+          union value value = parse_value (r, v);
+          mv_add_value (&v->miss, &value); 
+        }
 
       if (match (r, 'C')) 
         {