Refactoring step.

1 files changed, 49 insertions, 35 deletions

diff --git a/deheader b/deheader
index e9a5429..2d77881 100755
--- a/deheader
+++ b/deheader
@@ -30,6 +30,20 @@ def trim(line):
     else:
         return `line`
 
+def extract_includes(sourcefile, ignores):
+    "Extract a list of #include lines used in a given sourcfile."
+    includes = []
+    for line in open(sourcefile):
+        if line.startswith("#include"):
+            if verbose:
+                print "deheader: %s requires %s" % (sourcefile, `line`)
+            for stopper in ignores:
+                if stopper in line:
+                    break
+            else:
+                includes.append(line)
+    return includes
+
 def compile(source, msg=""):
     (stem, suffix) = os.path.splitext(source)
     derived = stem + ".o"
@@ -52,6 +66,35 @@ def compile(source, msg=""):
           % (sourcefile, msg, explain, end-start)
     return (status, end - start)
 
+def c_analyze(source, includes):
+    "Given a C file and a list of includes, return those that can be omitted."
+    # We'll remove headers in reverse order, because later unnecessary
+    # headers might depend on earlier ones
+    includes.reverse()
+    unneeded = []
+    original = sourcefile + ".orig"
+    try:
+        os.rename(sourcefile, original)
+        while True:                
+            keepgoing = False
+            for header in includes:
+                ofp = open(sourcefile, "w")
+                for line in open(original):
+                    if line != header:
+                        ofp.write(line)
+                ofp.close()
+                (st, t) = compile(sourcefile, " without %s" % trim(header))
+                if st == 0:
+                    unneeded.append(header)
+                    includes.remove(header)
+                    keepgoing = True
+            if not keepgoing:
+                break
+    finally:
+        os.remove(sourcefile)
+        os.rename(original, sourcefile)
+    return unneeded
+
 if __name__ == "__main__":
     (options, arguments) = getopt.getopt(sys.argv[1:], "hrvi:",
                                          ["help", "ignore",
@@ -74,41 +117,12 @@ if __name__ == "__main__":
         (st, t) = compile(sourcefile)
         if st != 0:
             continue
-        includes = []
-        for line in open(sourcefile):
-            if line.startswith("#include"):
-                if verbose:
-                    print "deheader: %s requires %s" % (sourcefile, `line`)
-                for stopper in ignores:
-                    if stopper in line:
-                        break
-                else:
-                    includes.append(line)
-        # We'll remove headers in reverse order, because later unnecessary
-        # headers might depend on earlier ones
-        includes.reverse()
-        unneeded = []
-        original = sourcefile + ".orig"
-        try:
-            os.rename(sourcefile, original)
-            while True:                
-                keepgoing = False
-                for header in includes:
-                    ofp = open(sourcefile, "w")
-                    for line in open(original):
-                        if line != header:
-                            ofp.write(line)
-                    ofp.close()
-                    (st, t) = compile(sourcefile, " without %s" % trim(header))
-                    if st == 0:
-                        unneeded.append(header)
-                        includes.remove(header)
-                        keepgoing = True
-                if not keepgoing:
-                    break
-        finally:
-            os.remove(sourcefile)
-            os.rename(original, sourcefile)
+        includes = extract_includes(sourcefile, ignores)
+        if sourcefile.endswith(".c") or sourcefile.endswith(".cpp"):
+            unneeded = c_analyze(sourcefile, includes)
+        else:
+            print >>sys.stderr, "deheader: can't analyze %s" % sourcefile
+            continue
         if unneeded:
             print "deheader: the following headers may be omitted from %s:" % sourcefile
             print "\n".join(map(trim, unneeded))