pr: fix typos, amend printouts

example.c

@@ -0,0 +1,6 @@
+#include <fcntl.h>
+#include <unistd.h>
+
+void test(int name) {
+    close(name);
+}

extract_func.py

@@ -23,44 +23,46 @@ def parse(literal: str):
         return None
 
 class fdef:
-    def __init__(self, signature: str, line: int, ref):
+    def __init__(self, signature: str, line: int, filename: str, ref):
         self.signature = signature
         self.line = line
         self.ref = ref
+        self.filename = filename
 
     @staticmethod
-    def parse(literal: str, line: int):
+    def parse(literal: str, line: int, filename: str):
         if m := re.search(r"hl.func @([^:^\s]+)", literal):
             mm = re.search(r"loc\(#loc(\d+)\)", literal)
             if mm == None:
                 mm = re.search(r'loc\(("[^"]+"):(\d+):(\d+)\)', literal)
                 if mm == None:
-                    print(f"Debug: Could not find reference for function def in literal '{literal}'")
-                    return fdef(m.group(1), line, None)
+                    print(f"\033[93mWARNING Assuming '{literal.strip()}' ({filename}:{line}) as local function\033[0m ")
+                    return fdef(m.group(1), line, filename, None)
                 else: 
-                    return fdef(m.group(1), line, mm.group(1))
+                    return fdef(m.group(1), line, filename, mm.group(1))
             else: 
-                return fdef(m.group(1), line, mm.group(1))
+                return fdef(m.group(1), line, filename, mm.group(1))
 
         return None
 
     def __str__(self):
-        return self.signature + ":" + str(self.line)
+        return self.signature + ":" + self.filename + ":" + str(self.line)
 
 class fcall:
-    def __init__(self, definition: fdef, line: int, ref = None):
+    def __init__(self, definition: fdef, line: int, filename: str, ref = None):
         self.function = definition
         self.line = line
         self.ref = ref
+        self.filename = filename
 
     @staticmethod
-    def parse(literal: str, line: int):
+    def parse(literal: str, line: int, filename: str):
         if m := re.search(r"hl.call @([^\)]+\))", literal):
             mm = re.search(r"loc\(#loc(\d+)\)", literal)
             if mm == None:
                 print(f"Error: function call '{literal}' does not have refernce check")
                 exit(1)
-            return fcall(m.group(1), line, mm.group(1))
+            return fcall(m.group(1), line, filename, mm.group(1))
         else:
             print(f"literal {literal} is not a valid function call.")
             return None
@@ -69,55 +71,66 @@ def __str__(self):
         return self.function.__str__() + " call"
 
 
-def smart_parse(line: str, loc: int):
+def smart_parse(line: str, loc: int, filename: str):
     if re.search(r"hl.call @([^:^\s]+)", line):
-        return fcall.parse(line, loc)
+        return fcall.parse(line, loc, filename)
     if re.match(r'#loc(\d+) = loc\(("[^"]+"):(\d+):(\d+)\)', line):
         return location.parse(line)
     if re.search(r"hl.func @([^:^\s]+)", line):
-        return fdef.parse(line, loc)
+        return fdef.parse(line, loc, filename)
 
     return None
 
 def main():
-    if len(sys.argv) != 2:
-        print("USAGE: python3 extract_func.py <path to mlir file>")
+    if len(sys.argv) != 3:
+        print("USAGE: python3 extract_func.py <path to mlir file(s)> <path to output>")
         exit(0)
 
-    if not os.path.exists(sys.argv[1]) or not os.path.isfile(sys.argv[1]):
-        print(f"file {sys.argv[1]} does not exist, or is not a file.")
+    if not os.path.exists(sys.argv[1]):
+        print(f"file {sys.argv[1]} does not exist.")
         exit(1)
 
     locations: List[location] = []
     functions: List[fdef] = []
     calls: List[fcall] = []
 
-    with open(sys.argv[1], 'r') as f:
-        for (index, line) in enumerate(f.readlines()):
-            obj = smart_parse(line, index+1)
-
-            if not obj: continue
-
-            if isinstance(obj, location):
-                # line location -> location info.
-                locations.append(obj)
-            elif isinstance(obj, fdef):
-                functions.append(obj)
-            elif isinstance(obj, fcall):
-                calls.append(obj)
-
-        f.close()
+    files = []
+
+    if os.path.isfile(sys.argv[1]):
+        files = [sys.argv[1]]
+    else:
+        files = [f for f in os.listdir(sys.argv[1]) if os.path.isfile(sys.argv[1] + f) and f.endswith(".mlir")]
+
+    for file in files:
+        with open(sys.argv[1] + file, 'r') as f:
+            for (index, line) in enumerate(f.readlines()):
+                obj = smart_parse(line, index+1, file)
+
+                if not obj: continue
+
+                if isinstance(obj, location):
+                    # line location -> location info.
+                    locations.append(obj)
+                elif isinstance(obj, fdef):
+                    functions.append(obj)
+                elif isinstance(obj, fcall):
+                    calls.append(obj)
+
+            f.close()
 
     consolidated_calls = {}
 
     for function_call in calls:
         if function_call.function in consolidated_calls.keys():
-            consolidated_calls[function_call.function][0].append(function_call.line)
+            consolidated_calls[function_call.function][0].append((function_call.filename, function_call.line))
             consolidated_calls[function_call.function][1].append(function_call.ref)
         else:
-            consolidated_calls[function_call.function] =  [[function_call.line], [function_call.ref]]
+            consolidated_calls[function_call.function] =  [[(function_call.filename, function_call.line)], [function_call.ref]]
 
-    with open("analysis.yaml", "w") as f:
+    # sort 
+    consolidated_calls = dict(sorted(consolidated_calls.items()))
+
+    with open(sys.argv[2], "w") as f:
 
         for function in consolidated_calls.keys():
 
@@ -141,7 +154,10 @@ def main():
 
             for definition in functions:
                 if definition.signature == function_friendly_name:
-                    defs.add(definition.line) 
+                    defs.add((definition.filename, definition.line)) 
+
+                    if definition.ref == None:
+                        continue 
 
                     found = False
                     for l in locations:
@@ -150,25 +166,31 @@ def main():
                             found = True
                             break
                     if not found:
-                        print(f"cannot find ref {definition.ref} of {definition.signature} on line {definition.line}, considering as file name")
+                        if os.path.isfile(definition.ref.replace("\"", "").replace("\'", "")):
+                            filerefs.add(definition.ref)
+                            continue
+                        print(f"\033[93mcannot find file or ref '{definition.ref}' of {definition.signature} ({definition.filename}:{definition.line})\033[0m")
                         filerefs.add(definition.ref)
 
 
             # write to yaml
+            consolidated_calls[function][0].sort()
+
             f.write(f" - signature: {function}\n\t call lines: ")
 
-            f.writelines(["\n\t\t- " + str(i) if i != None else "" for i in consolidated_calls[function][0]])
+            f.writelines(["\n\t\t- " + i[0] + ":" + str(i[1]) if i != None else "" for i in consolidated_calls[function][0]])
 
             f.write("\n\t definitions: ")
 
-            f.writelines(["\n\t\t- " + str(d) if d != None else "" for d in defs])
+            f.writelines(["\n\t\t- " + d[0] + ":" + str(d[1]) if d != None else "" for d in defs])
 
             f.write("\n\t file references: ")
 
             f.writelines(["\n\t\t- " + (f if f != None else "unknown") for f in filerefs])
 
             f.write("\n")
-
+
+    print(f"\033[92mWrote to {sys.argv[2]}\033[0m") 
 
 if __name__ == '__main__':
     if sys.version_info < (3, 8):