Changeset 202

Timestamp:

Mar 9, 2004, 5:59:06 PM (22 years ago)

Author:

rhl

Message:

More C-parsing hacks

File:

• trunk/archive/utils/check-namespace (modified) (6 diffs)

trunk/archive/utils/check-namespace

@@ -3 +3 @@
 # Check that a set of .h files and .o and .a files satisfy the Pan-STARRS
 # rules about namespaces.
+#
+# This is a real hack; it should be rewritten to parse the .h files correctly. XXX
 #
 # Robert Lupton (rhl@astro.princeton.edu)  February 2004
@@ -34 +36 @@
 Options:
         -h, -?          Print this message
+        -d              Don't warn about symbols defined in .h files but not found by nm
         -p prefix       Change prefix from ps to \"prefix\"
         -v              Be chatty (repeat for even more output)
@@ -47 +50 @@
          $pprefix = "p_$prefix";
       }
+   } elsif($ARGV[0] eq "-d") {
+      $allow_missing_definitions = 1;      
    } elsif($ARGV[0] eq "-v") {
       $verbose++;
@@ -154 +159 @@
       # and should obey the same rules
       #
-      if (s/((typedef\s+)?enum)//) {
+      if (s/((typedef\s+)?enum)(\s*{)/$3/) {
          $typedef = $1;
          $is_enum_typedef = ($typedef =~ /typedef/) ? 1 : 0;
@@ -260 +265 @@
       }
 
-      if ($type eq "b") { $type = "d"; } # don't distinguish BSS and Data
+      if ($type eq "b") { $type = "d"; } # don't distinguish BSS, Common, and Data
       if ($type eq "B") { $type = "D"; }
+      if ($type eq "C") { $type = "D"; }
 
       if ($type !~ /[DT]/i) {   # Data or Text section
@@ -295 +301 @@
 # Now check for unused declarations
 #
-foreach $name (sort keys %declarations) {
-   if (!$used_declarations{$name} && !$typedefs{$name} && !$defines{$name}) {
-      warn "$name was declared in $declarations{$name} but not defined\n";
-   }
-}
+if (!$allow_missing_definitions) {
+   foreach $name (sort keys %declarations) {
+      if (!$used_declarations{$name} && !$typedefs{$name} && !$defines{$name}) {
+         warn "$name was declared in $declarations{$name} but not defined\n";
+      }
+   }
+}