WTBUILD-278 Make modstat outputs more readable

- Changed the order so that functions are printed before macros.

Author: mm-ng

layercparse/scan_sources_tool.py

@@ -515,19 +515,19 @@ def list_modules(modules: list[Module]) -> None:
     print_columns(output)
 
 def list_contents() -> None:
-    if _args.macros:
-        print("  == Macros:")
-        for _, defn in _globals.macros.items():
-            if not defn.offset or not want_list(defn):
-                continue
-            print(f"{defn.locationStr()} {'private' if defn.is_private else 'public'}")
     if _args.calls:
         print("  == Functions:")
         for defn in itertools.chain(_globals.names.values(),
                                     (v for vv in _globals.static_names.values() for v in vv.values())):
             if not want_list(defn):
                 continue
             print(f"{defn.locationStr()} {'private' if defn.is_private else 'public'}")
+    if _args.macros:
+        print("  == Macros:")
+        for _, defn in _globals.macros.items():
+            if not defn.offset or not want_list(defn):
+                continue
+            print(f"{defn.locationStr()} {'private' if defn.is_private else 'public'}")
     if _args.fields:
         print("  == Fields:")
         for recname, recdefn in _globals.fields.items():