Changeset 5014 for trunk/Ohana/src/libautocode/generate

Timestamp:

Sep 12, 2005, 3:04:48 PM (21 years ago)

Author:

eugene

Message:

substantial work to enable mode and format selections for DVO:image and DVO:secfilt

File:

• trunk/Ohana/src/libautocode/generate (modified) (2 diffs)

trunk/Ohana/src/libautocode/generate

@@ -35 +35 @@
         ($key, $value) = split (" ", $line, 2);
         
+        # strip white space from the following
+        if ($key eq "TYPE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
+        if ($key eq "SIZE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
+        if ($key eq "STRUCT")  { ($value) = $value =~ m|\s*(\S+)\s*|; }
+        if ($key eq "EXTNAME") { ($value) = $value =~ m|\s*(\S+)\s*|; }
+
         &set_keypair ($key, $value);
 
         # there are used internally (not just a replacement)
-        if ($key eq "TYPE")   { $TYPE = $value;   }
-        if ($key eq "SIZE")   { $SIZE = $value;   }
-        if ($key eq "STRUCT") { $STRUCT = $value; }
+        if ($key eq "TYPE")    { $TYPE = $value;   }
+        if ($key eq "SIZE")    { $SIZE = $value;   }
+        if ($key eq "STRUCT")  { $STRUCT = $value; }
 
         # not a simple key/value entry
@@ -54 +60 @@
         }
     }
+    $Nexpect = 0;
     if ($TYPE eq "BINTABLE") { $Nexpect = &count_bintablesize; }
     if ($TYPE eq "TABLE")    { $Nexpect = &count_tablesize;    }
+    if (! $Nexpect) { die "missing valid TYPE\n"; }
     if ($Nexpect != $SIZE) { die "size mismatch: $Nexpect vs $SIZE\n"; }
 }