@colbymchenry/codegraph-darwin-x64 1.1.1 → 1.1.2

package/lib/dist/resolution/c-fnptr-synthesizer.js

@@ -1,6 +1,90 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cFnPointerDispatchEdges = cFnPointerDispatchEdges;
+/**
+ * C/C++ function-pointer dispatch synthesis (#932).
+ *
+ * C/C++ polymorphism is the function pointer: a struct carries a fn-pointer
+ * field (`int (*fn)(int)`, or a fn-pointer-typedef field `hook_func func`),
+ * concrete functions are *registered* into it through a table
+ * (`static struct cmd cmds[] = {{"add", cmd_add}, …}`, a designated
+ * `.fn = cmd_add`, or `x->fn = cmd_add`), and the dispatcher calls through it
+ * indirectly (`p->fn(argv)`). Static extraction captures neither the
+ * registration→field binding nor the indirect call, so the dispatcher→handler
+ * edge is missing and `git`'s `run_builtin` looks like it calls nothing, the
+ * hooks in `hook_demo.c` are unreachable, etc.
+ *
+ * This bridges it, keyed by **(struct type, fn-pointer field)**:
+ *   • registrations — a function bound to `S.field` via a positional
+ *     initializer (matched by field index), a designated `.field = fn`, or a
+ *     direct `x.field = fn` / `x->field = fn` assignment;
+ *   • dispatch — `recv->field(…)` / `recv.field(…)` where `recv` resolves to a
+ *     value of struct type `S` (from the enclosing function's params / locals,
+ *     or by walking a chained/array receiver `c->cmd->proc` across field types),
+ *     falling back to the field name when it is unique to one struct;
+ *   • field←field propagation — `a->f = b->g` merges `B.g`'s handlers into
+ *     `A.f`, so a generic single-slot hook that is reassigned from a registry
+ *     (the `hook_demo.c` shape: `h->func = found->fn`) still resolves.
+ *
+ * Also handles **macro-built tables** (#991) — the dominant real-world shape,
+ * e.g. redis' command table, sqlite's builtin functions, and vim's `:ex` /
+ * normal-mode commands. The fn-pointer arg lives inside a macro call
+ * (`MAKE_CMD(…,proc,…)` / `FUNCTION(…,xFunc)` / `EXCMD(…,fn,…)`) in a generated
+ * or `#include`-d file; the table's struct type may itself be an object-macro
+ * alias; the field may use a function-TYPE typedef; the struct may be defined
+ * INLINE with the array; and the whole thing may sit behind `#ifdef` switched on
+ * by the includer. The registration pass reads each `#include`-d file as a unit
+ * with the includer's effective macro env (own + headers) in scope, evaluates
+ * its `#ifdef`s against the includer's defined set, expands object/function
+ * macros, peels a brace-wrapped element, and parses an inline struct in place —
+ * then reads the positional/designated bindings. Dispatch additionally resolves
+ * an array subscript through a file-scope table (`(cmdnames[i].cmd_func)(…)`).
+ *
+ * Also bridges **bare arrays of function pointers** (no struct, no field) —
+ * `opcode_t *opcodes[256] = {nop,…}` dispatched `opcodes[op](…)` (SameBoy's CPU),
+ * `zend_rc_dtor_func_t t[] = {[IS_STRING]=(cast)fn,…}` dispatched `t[GC_TYPE(p)](…)`
+ * (php's Zend) — keyed by the array VARIABLE name. The element type must be a
+ * function typedef (the precision gate), entries are literal function names, and
+ * the same-file table wins on a name collision (two file-local `opcodes[256]`).
+ *
+ * Whole-graph pass after base resolution; all edges are `provenance:'heuristic'`
+ * (`synthesizedBy:'fn-pointer-dispatch'`). High precision via the (type, field)
+ * key + a real-function gate; a project with no fn-pointer dispatch is a no-op.
+ */
+const path = __importStar(require("node:path"));
 const strip_comments_1 = require("./strip-comments");
 const C_CPP_EXT = /\.(c|h|cc|cpp|cxx|hpp|hh|hxx|cppm|ipp|inl|tcc)$/i;
 const FN_KINDS = new Set(['function', 'method']);
@@ -44,26 +128,257 @@ function splitTopLevel(body, sep) {
     out.push(body.slice(start));
     return out;
 }
-/** A fn-pointer field looks like `… (*name)(…)` — capture `name`. */
-const FNPTR_DECL_RE = /\(\s*\*\s*(\w+)\s*\)\s*\(/;
-/** `typedef RET (*NAME)(…)` — a function-pointer typedef. */
-const FNPTR_TYPEDEF_RE = /\btypedef\b[^;{}]*?\(\s*\*\s*(\w+)\s*\)\s*\(/g;
+/** Index of the `)` matching the `(` at `open` (which must point at a `(`). -1 if unbalanced. */
+function matchParen(src, open) {
+    let depth = 0;
+    for (let i = open; i < src.length; i++) {
+        const c = src[i];
+        if (c === '(')
+            depth++;
+        else if (c === ')') {
+            depth--;
+            if (depth === 0)
+                return i;
+        }
+    }
+    return -1;
+}
+/**
+ * Collect function-like macros from (comment-stripped) source, joining
+ * `\`-continuations first. Only object/positional table macros matter here, so
+ * variadic macros are skipped. Used to expand registration tables built through
+ * a macro (redis' `MAKE_CMD(…)`) before reading the struct-field bindings.
+ */
+function parseFunctionMacros(stripped) {
+    const out = new Map();
+    if (!stripped.includes('#define') && !stripped.includes('# define'))
+        return out;
+    const joined = stripped.replace(/\\\r?\n/g, ' ');
+    const RE = /^[ \t]*#[ \t]*define[ \t]+(\w+)\(([^)]*)\)\s+(.+)$/gm;
+    let m;
+    while ((m = RE.exec(joined))) {
+        const params = m[2].split(',').map((p) => p.trim()).filter(Boolean);
+        if (params.some((p) => p === '...' || p.endsWith('...')))
+            continue; // variadic — skip
+        out.set(m[1], { params, expansion: m[3].trim() });
+    }
+    return out;
+}
+/**
+ * Collect object-like macros `#define NAME value` (NAME not immediately followed
+ * by `(`). redis aliases the table's struct type this way:
+ * `#define COMMAND_STRUCT redisCommand`, used as `struct COMMAND_STRUCT table[]`.
+ */
+function parseObjectMacros(stripped) {
+    const out = new Map();
+    if (!stripped.includes('#define') && !stripped.includes('# define'))
+        return out;
+    const joined = stripped.replace(/\\\r?\n/g, ' ');
+    const RE = /^[ \t]*#[ \t]*define[ \t]+(\w+)[ \t]+(\S[^\n]*)$/gm;
+    let m;
+    while ((m = RE.exec(joined)))
+        out.set(m[1], m[2].trim());
+    return out;
+}
+/** All macro names a file `#define`s (value-ful or not) — the "defined" set for #ifdef. */
+function parseDefinedNames(stripped) {
+    const out = new Set();
+    if (!stripped.includes('#define') && !stripped.includes('# define'))
+        return out;
+    const RE = /^[ \t]*#[ \t]*define[ \t]+(\w+)/gm;
+    let m;
+    while ((m = RE.exec(stripped)))
+        out.add(m[1]);
+    return out;
+}
+/**
+ * Drop the inactive arms of `#ifdef`/`#ifndef`/`#if defined(X)`/`#else`/`#elif`/
+ * `#endif` given a set of defined macro names, keeping line offsets (inactive
+ * lines are blanked, not removed). A conditional whose expression we can't
+ * evaluate (`#if SOME_EXPR`) keeps its body — better to over-keep than to drop
+ * live code. This is what makes a header included with a switch macro defined
+ * (vim's `ex_cmds.h` under `DO_DECLARE_EXCMD`) expose only its active table.
+ */
+function evalConditionals(text, defined) {
+    if (!/#\s*if/.test(text))
+        return text;
+    const lines = text.split('\n');
+    // stack frame: parentActive = enclosing kept?; active = this arm kept?; taken = any arm taken yet
+    const stack = [];
+    const activeNow = () => (stack.length === 0 ? true : stack[stack.length - 1].active);
+    const condDefined = (expr) => {
+        let mm = expr.match(/^defined\s*\(?\s*(\w+)\s*\)?$/);
+        if (mm)
+            return defined.has(mm[1]);
+        mm = expr.match(/^!\s*defined\s*\(?\s*(\w+)\s*\)?$/);
+        if (mm)
+            return !defined.has(mm[1]);
+        return null; // unevaluable
+    };
+    for (let i = 0; i < lines.length; i++) {
+        const t = lines[i].trim();
+        let mm;
+        if ((mm = t.match(/^#\s*ifdef\s+(\w+)/))) {
+            const pa = activeNow();
+            const cond = defined.has(mm[1]);
+            stack.push({ parentActive: pa, active: pa && cond, taken: cond });
+            lines[i] = '';
+            continue;
+        }
+        if ((mm = t.match(/^#\s*ifndef\s+(\w+)/))) {
+            const pa = activeNow();
+            const cond = !defined.has(mm[1]);
+            stack.push({ parentActive: pa, active: pa && cond, taken: cond });
+            lines[i] = '';
+            continue;
+        }
+        if ((mm = t.match(/^#\s*if\s+(.+)$/))) {
+            const pa = activeNow();
+            const c = condDefined(mm[1].trim());
+            const cond = c === null ? true : c; // unevaluable → keep
+            stack.push({ parentActive: pa, active: pa && cond, taken: cond });
+            lines[i] = '';
+            continue;
+        }
+        if (/^#\s*elif\b/.test(t)) {
+            const top = stack[stack.length - 1];
+            if (top) {
+                top.active = top.parentActive && !top.taken;
+                top.taken = true;
+            }
+            lines[i] = '';
+            continue;
+        }
+        if (/^#\s*else\b/.test(t)) {
+            const top = stack[stack.length - 1];
+            if (top) {
+                top.active = top.parentActive && !top.taken;
+                top.taken = true;
+            }
+            lines[i] = '';
+            continue;
+        }
+        if (/^#\s*endif\b/.test(t)) {
+            stack.pop();
+            lines[i] = '';
+            continue;
+        }
+        if (!activeNow())
+            lines[i] = ''; // blank an inactive line (keep the newline)
+    }
+    return lines.join('\n');
+}
+/** Resolve a type token through object-like macro aliases (transitive, capped). */
+function resolveTypeName(name, objEnv) {
+    let n = name;
+    for (let i = 0; objEnv && i < 5; i++) {
+        const v = objEnv.get(n);
+        const t = v?.trim().match(/^(?:struct\s+)?(\w+)$/);
+        if (!t)
+            break;
+        n = t[1];
+    }
+    return n;
+}
+/** Substitute call args for the macro's params (whole-token) in its expansion. */
+function substituteMacro(def, args) {
+    const map = new Map();
+    def.params.forEach((p, i) => map.set(p, args[i] ?? ''));
+    return def.expansion.replace(/\b\w+\b/g, (tok) => (map.has(tok) ? map.get(tok) : tok));
+}
+/**
+ * Expand known function-like macro calls in `text` to a fixpoint (depth-capped).
+ * `MAKE_CMD("get",…,getCommand,…)` → the positional value list whose slots line
+ * up with the struct's fields, so the existing positional registration can read
+ * `getCommand` straight out of the `proc` slot.
+ */
+function expandMacroCalls(text, env) {
+    if (env.size === 0)
+        return text;
+    let out = text;
+    for (let pass = 0; pass < 6; pass++) {
+        let changed = false;
+        const RE = /\b(\w+)\s*\(/g;
+        let m;
+        while ((m = RE.exec(out))) {
+            const def = env.get(m[1]);
+            if (!def)
+                continue;
+            const open = m.index + m[0].length - 1; // index of the `(`
+            const close = matchParen(out, open);
+            if (close < 0)
+                continue;
+            const args = splitTopLevel(out.slice(open + 1, close), ',').map((a) => a.trim());
+            out = out.slice(0, m.index) + substituteMacro(def, args) + out.slice(close + 1);
+            changed = true;
+            break; // restart scan — offsets shifted
+        }
+        if (!changed)
+            break;
+    }
+    return out;
+}
+/** A fn-pointer field looks like `… (*name)(…)` — capture `name`. A
+ *  calling-convention / attribute macro may precede the `*`
+ *  (`(ZEND_FASTCALL *name)`), so allow leading word tokens. */
+const FNPTR_DECL_RE = /\(\s*(?:\w+\s+)*\*\s*(\w+)\s*\)\s*\(/;
+/** `typedef RET (*NAME)(…)` — a function-pointer typedef (CC/attr macro before
+ *  the `*` allowed, as in php's `typedef void (ZEND_FASTCALL *fn_t)(…)`). */
+const FNPTR_TYPEDEF_RE = /\btypedef\b[^;{}]*?\(\s*(?:\w+\s+)*\*\s*(\w+)\s*\)\s*\(/g;
+/** A whole brace-free `typedef … ;` statement — capture the guts to spot the
+ *  function-TYPE form `typedef RET NAME(params)` (no `(*name)` pointer form). */
+const FNTYPE_TYPEDEF_STMT_RE = /\btypedef\b([^;{}]*);/g;
+/** Return-type keywords that must never be mistaken for the typedef's name. */
+const C_TYPE_KEYWORDS = new Set([
+    'void', 'int', 'char', 'short', 'long', 'unsigned', 'signed', 'float', 'double',
+    'const', 'struct', 'union', 'enum', 'static', 'volatile', 'register', 'inline',
+]);
+/** `#include "local/header"` — captured from RAW source (string contents survive). */
+const INCLUDE_RE = /#[ \t]*include[ \t]+"([^"\n]+)"/g;
+/** Included files worth scanning for registration tables (e.g. a generated `.def`). */
+const INCLUDABLE_EXT = /\.(def|inc|h|hh|hpp|hxx|c|cc|cpp|cxx|ipp|tcc|tbl)$/i;
 function cFnPointerDispatchEdges(queries, ctx) {
     const files = ctx.getAllFiles().filter((f) => C_CPP_EXT.test(f));
     if (files.length === 0)
         return [];
-    // Cache stripped source per file (read once, reused across passes).
+    // Cache raw + stripped source per file (read once, reused across passes).
+    // Raw is needed for `#include "…"` directives — strip blanks string contents.
+    const rawCache = new Map();
+    const raw = (file) => {
+        if (rawCache.has(file))
+            return rawCache.get(file);
+        const r = ctx.readFile(file);
+        rawCache.set(file, r);
+        return r;
+    };
     const srcCache = new Map();
     const src = (file) => {
         if (srcCache.has(file))
             return srcCache.get(file);
-        const raw = ctx.readFile(file);
-        const s = raw == null ? '' : (0, strip_comments_1.stripCommentsForRegex)(raw, 'c');
+        const r = raw(file);
+        const s = r == null ? '' : (0, strip_comments_1.stripCommentsForRegex)(r, 'c');
         srcCache.set(file, s);
-        return raw == null ? null : s;
+        return r == null ? null : s;
+    };
+    // Resolve a quoted include relative to the includer's directory, then the
+    // project root. Returns a project-root-relative path that exists on disk
+    // (even if it was never indexed — e.g. redis' generated `commands.def`).
+    const resolveInclude = (includer, inc) => {
+        const dir = path.posix.dirname(includer.replace(/\\/g, '/'));
+        const cand = path.posix.normalize(path.posix.join(dir, inc));
+        if (ctx.fileExists(cand))
+            return cand;
+        if (ctx.fileExists(inc))
+            return inc;
+        return null;
     };
-    // ---- Pass A: function-pointer typedefs (cross-file) ----
+    // ---- Pass A: function-pointer AND function-type typedefs (cross-file) ----
+    //   fn-pointer:  typedef RET (*NAME)(…)        → a field `NAME f` is a fn ptr
+    //   fn-type:     typedef RET NAME(params)       → a field `NAME *f` is a fn ptr
+    // The fn-type form is redis' command idiom: `typedef void redisCommandProc(client*)`
+    // declared as `redisCommandProc *proc;`. Without this, `proc` reads as data.
     const fnPtrTypedefs = new Set();
+    const fnTypeTypedefs = new Set();
     for (const file of files) {
         const s = src(file);
         if (!s || !s.includes('typedef'))
@@ -72,60 +387,108 @@ function cFnPointerDispatchEdges(queries, ctx) {
         let m;
         while ((m = FNPTR_TYPEDEF_RE.exec(s)))
             fnPtrTypedefs.add(m[1]);
+        FNTYPE_TYPEDEF_STMT_RE.lastIndex = 0;
+        while ((m = FNTYPE_TYPEDEF_STMT_RE.exec(s))) {
+            const guts = m[1];
+            if (guts.includes('(*') || guts.includes('( *'))
+                continue; // pointer form — handled above
+            const fm = guts.match(/\b(\w+)\s*\(/); // last identifier before the param list
+            if (fm && !C_TYPE_KEYWORDS.has(fm[1]))
+                fnTypeTypedefs.add(fm[1]);
+        }
     }
     // ---- Pass B: struct field layouts ----
-    // structLayout: struct name → ordered fields (with fn-pointer flag).
+    // structLayout: struct name → ordered fields, for structs with ≥1 fn-pointer
+    //   field (drives positional registration + dispatch).
+    // allStructFields: EVERY struct name → ALL its field layouts (a name can be
+    //   reused across files — e.g. redis has two unrelated `client` structs), used
+    //   to walk a chained receiver's field types (`c->cmd->proc`: client.cmd →
+    //   redisCommand). The walk searches every same-named layout for the field.
     // fieldToStructs: fn-pointer field name → set of struct names that declare it.
     const structLayout = new Map();
+    const allStructFields = new Map();
     const fieldToStructs = new Map();
-    for (const st of ctx.getNodesByKind('struct')) {
-        if (!C_CPP_EXT.test(st.filePath))
-            continue;
-        const s = srcCache.get(st.filePath) ?? src(st.filePath);
-        if (!s)
-            continue;
-        const body = sliceLines(s, st.startLine, st.endLine);
-        const open = body.indexOf('{');
-        const close = open >= 0 ? matchBrace(body, open) : -1;
-        if (open < 0 || close < 0)
-            continue;
-        const inner = body.slice(open + 1, close);
+    // Parse a struct body (the text between its `{` and `}`) into ordered fields.
+    const parseStructFields = (inner) => {
         const fields = [];
         let idx = 0;
         for (const rawDecl of splitTopLevel(inner, ';')) {
             const decl = rawDecl.trim();
             if (!decl)
                 continue;
-            let name = null;
-            let isFnPtr = false;
-            const ptr = decl.match(FNPTR_DECL_RE);
-            if (ptr) {
-                name = ptr[1];
-                isFnPtr = true;
-            }
-            else {
-                // `TYPE [*]name` — fn-pointer when TYPE is a fn-pointer typedef.
-                const fm = decl.match(/(\w+)\s+\*?\s*(\w+)\s*$/);
-                if (fm) {
-                    name = fm[2];
-                    isFnPtr = fnPtrTypedefs.has(fm[1]);
+            // A field decl can declare several names sharing a leading type:
+            // `struct redisCommand *cmd, *lastcmd;`. Each declarator is its own
+            // positional slot and carries that type (so `client.cmd → redisCommand`).
+            const parts = splitTopLevel(decl, ',');
+            const firstTyped = parts[0].match(/(\w+)\s+\**\s*(\w+)\s*$/);
+            const sharedType = firstTyped ? firstTyped[1] : '';
+            for (let pi = 0; pi < parts.length; pi++) {
+                const p = parts[pi].trim();
+                let name = null;
+                let type = '';
+                let isFnPtr = false;
+                const ptr = p.match(FNPTR_DECL_RE);
+                if (ptr) {
+                    name = ptr[1]; // `… (*name)(…)` — a function pointer
+                    isFnPtr = true;
+                }
+                else if (pi === 0) {
+                    if (firstTyped) {
+                        name = firstTyped[2];
+                        type = sharedType;
+                    }
+                }
+                else {
+                    // a subsequent declarator: `*name` / `**name` / `name`
+                    const dm = p.match(/^\**\s*(\w+)/);
+                    if (dm) {
+                        name = dm[1];
+                        type = sharedType;
+                    }
                 }
+                if (!ptr && type)
+                    isFnPtr = fnPtrTypedefs.has(type) || fnTypeTypedefs.has(type);
+                // Always advance the positional index. An unparsed field (anonymous
+                // union, exotic declarator) still occupies one slot, and macro-expanded
+                // positional tables (redis' MAKE_CMD) only align if every field counts.
+                fields.push({ name: name ?? '', index: idx, isFnPtr: !!name && isFnPtr, type });
+                idx++;
             }
-            if (!name)
-                continue;
-            fields.push({ name, index: idx, isFnPtr });
-            if (isFnPtr) {
-                if (!fieldToStructs.has(name))
-                    fieldToStructs.set(name, new Set());
-                fieldToStructs.get(name).add(st.name);
+        }
+        return fields;
+    };
+    // Register a parsed struct under `name` into the three indexes.
+    const registerStructLayout = (name, fields) => {
+        if (!allStructFields.has(name))
+            allStructFields.set(name, []);
+        allStructFields.get(name).push(fields);
+        for (const f of fields) {
+            if (f.name && f.isFnPtr) {
+                if (!fieldToStructs.has(f.name))
+                    fieldToStructs.set(f.name, new Set());
+                fieldToStructs.get(f.name).add(name);
             }
-            idx++;
         }
         if (fields.some((f) => f.isFnPtr))
-            structLayout.set(st.name, fields);
+            structLayout.set(name, fields);
+    };
+    for (const st of ctx.getNodesByKind('struct')) {
+        if (!C_CPP_EXT.test(st.filePath))
+            continue;
+        const s = srcCache.get(st.filePath) ?? src(st.filePath);
+        if (!s)
+            continue;
+        const body = sliceLines(s, st.startLine, st.endLine);
+        const open = body.indexOf('{');
+        const close = open >= 0 ? matchBrace(body, open) : -1;
+        if (open < 0 || close < 0)
+            continue;
+        registerStructLayout(st.name, parseStructFields(body.slice(open + 1, close)));
     }
-    if (structLayout.size === 0)
-        return [];
+    // NB: no early return on an empty structLayout here — an inline `struct TAG
+    // { … } var[]` table whose struct never became a node (vim's `cmdname`, broken
+    // up by `#ifdef`) is discovered later during the unit scan. The `reg.size === 0`
+    // guard after registration still short-circuits when nothing bridges.
     const fnPtrFieldOf = (struct, field) => !!structLayout.get(struct)?.some((f) => f.name === field && f.isFnPtr);
     // C/C++ function + method nodes, materialized once (bounded by C/C++ files).
     const cFns = [];
@@ -157,12 +520,42 @@ function cFnPointerDispatchEdges(queries, ctx) {
         reg.get(key).add(fn.id);
         idToNode.set(fn.id, fn);
     };
+    // Bare arrays-of-fn-pointers (no struct): array VARIABLE name → per-file sets
+    // of registered function ids. Multi-entry because a file-scope `static` table
+    // name can recur across files (SameBoy declares `static opcode_t *opcodes[256]`
+    // in BOTH sm83_cpu.c and sm83_disassembler.c), so dispatch resolves same-file.
+    const arrayReg = new Map();
+    const addArrayReg = (name, file, fn) => {
+        let entries = arrayReg.get(name);
+        if (!entries) {
+            entries = [];
+            arrayReg.set(name, entries);
+        }
+        let e = entries.find((x) => x.file === file);
+        if (!e) {
+            e = { file, ids: new Set() };
+            entries.push(e);
+        }
+        e.ids.add(fn.id);
+        idToNode.set(fn.id, fn);
+    };
     // A struct value `{ … }` (one element) — register its function entries to the
     // struct's fields, by `.field = fn` designators or by positional slot.
-    const registerStructValue = (struct, valueBody, file) => {
+    const registerStructValue = (struct, valueBody, file, env) => {
         const layout = structLayout.get(struct);
         if (!layout)
             return;
+        if (env && env.size)
+            valueBody = expandMacroCalls(valueBody, env);
+        // A macro can expand to a whole brace-wrapped element (sqlite's
+        // `FUNCTION(…)` → `{nArg, …, xFunc, …}`); peel one outer layer so the
+        // positional slots are visible.
+        valueBody = valueBody.trim();
+        if (valueBody.startsWith('{')) {
+            const e = matchBrace(valueBody, 0);
+            if (e > 0 && valueBody.slice(e + 1).trim() === '')
+                valueBody = valueBody.slice(1, e);
+        }
         const items = splitTopLevel(valueBody, ',');
         let pos = 0;
         for (const rawItem of items) {
@@ -192,18 +585,221 @@ function cFnPointerDispatchEdges(queries, ctx) {
             pos++;
         }
     };
+    // Collect the literal function entries of an array-of-fn-pointers initializer
+    // and register them under the array's variable name. Entries may be positional
+    // (`fn`, `&fn`), designated by index (`[OP] = fn`), or cast-wrapped
+    // (`(handler_t)fn`, as in php's Zend dtor table). Non-identifier entries
+    // (`NULL`, `0`, a nested expression) are skipped — a miss, never a wrong edge.
+    // No index tracking: a runtime subscript fans the dispatch out to the whole
+    // set, exactly like a command table reaches every command.
+    const registerArrayValue = (name, body, file, env) => {
+        if (env && env.size)
+            body = expandMacroCalls(body, env);
+        for (const rawItem of splitTopLevel(body, ',')) {
+            let item = rawItem.trim();
+            if (!item)
+                continue;
+            const des = item.match(/^\[[^\]]*\]\s*=\s*([\s\S]*)$/); // `[IDX] = …` designator
+            if (des)
+                item = des[1].trim();
+            item = item.replace(/^\((?:[\w\s*]+)\)\s*/, '').replace(/^&\s*/, '').trim(); // (cast) / &
+            const id = item.match(/^(\w+)$/);
+            if (!id)
+                continue;
+            const fn = resolveFn(id[1], file);
+            if (fn)
+                addArrayReg(name, file, fn);
+        }
+    };
+    // Per-file macro + include parsing (any file, indexed or not), cached.
+    const fnMacroCache = new Map();
+    const fileFnMacros = (file) => {
+        let m = fnMacroCache.get(file);
+        if (!m) {
+            m = parseFunctionMacros(src(file) ?? '');
+            fnMacroCache.set(file, m);
+        }
+        return m;
+    };
+    const objMacroCache = new Map();
+    const fileObjMacros = (file) => {
+        let m = objMacroCache.get(file);
+        if (!m) {
+            m = parseObjectMacros(src(file) ?? '');
+            objMacroCache.set(file, m);
+        }
+        return m;
+    };
+    const definedCache = new Map();
+    const fileDefinedNames = (file) => {
+        let d = definedCache.get(file);
+        if (!d) {
+            d = parseDefinedNames(src(file) ?? '');
+            definedCache.set(file, d);
+        }
+        return d;
+    };
+    const includeCache = new Map();
+    const localIncludesOf = (file) => {
+        let out = includeCache.get(file);
+        if (out)
+            return out;
+        out = [];
+        const rawText = raw(file);
+        if (rawText && rawText.includes('include')) {
+            INCLUDE_RE.lastIndex = 0;
+            let im;
+            while ((im = INCLUDE_RE.exec(rawText))) {
+                if (!INCLUDABLE_EXT.test(im[1]))
+                    continue;
+                const t = resolveInclude(file, im[1]);
+                if (t)
+                    out.push(t);
+            }
+        }
+        includeCache.set(file, out);
+        return out;
+    };
+    // A file's effective macro environment = its own #defines PLUS those of the
+    // headers it #includes (redis' `MAKE_CMD` sits beside the table; sqlite's
+    // `FUNCTION` lives in `sqliteInt.h`, included by the file with the table).
+    // First writer wins, so the file's own defs override included ones; depth-2
+    // covers a macro defined in a header-of-a-header.
+    const buildEnv = (file, depth, seen, fn, obj, def) => {
+        if (depth < 0 || seen.has(file))
+            return;
+        seen.add(file);
+        for (const [k, v] of fileFnMacros(file))
+            if (!fn.has(k))
+                fn.set(k, v);
+        for (const [k, v] of fileObjMacros(file))
+            if (!obj.has(k))
+                obj.set(k, v);
+        for (const n of fileDefinedNames(file))
+            def.add(n);
+        for (const inc of localIncludesOf(file))
+            buildEnv(inc, depth - 1, seen, fn, obj, def);
+    };
+    const indexedSet = new Set(files);
+    const units = [];
+    const seenInclude = new Set();
+    for (const file of files) {
+        const env = new Map();
+        const objEnv = new Map();
+        const defined = new Set();
+        buildEnv(file, 2, new Set(), env, objEnv, defined);
+        const s = src(file);
+        if (s)
+            units.push({ text: s, file, env, objEnv });
+        for (const target of localIncludesOf(file)) {
+            if (seenInclude.has(`${file}>${target}`))
+                continue;
+            const incSrc = src(target);
+            if (!incSrc)
+                continue;
+            if (indexedSet.has(target)) {
+                // Re-scan an indexed header only when this includer unlocks guarded code.
+                const ownDef = fileDefinedNames(target);
+                const adds = [...defined].some((n) => !ownDef.has(n));
+                if (!adds || !/#\s*if/.test(incSrc))
+                    continue;
+            }
+            seenInclude.add(`${file}>${target}`);
+            // The include is pasted into the includer — evaluate its conditionals in
+            // the includer's defined set (a no-op when it has none). Re-parse the
+            // included file's OWN macros from that resolved text so a macro it defines
+            // conditionally (vim's `EXCMD`, whose plain last-wins parse picks the enum
+            // arm) overrides with the ARM THAT IS ACTUALLY ACTIVE here.
+            const text = evalConditionals(incSrc, defined);
+            const incEnv = new Map(env);
+            for (const [k, v] of parseFunctionMacros(text))
+                incEnv.set(k, v);
+            const incObjEnv = new Map(objEnv);
+            for (const [k, v] of parseObjectMacros(text))
+                incObjEnv.set(k, v);
+            units.push({ text, file: target, env: incEnv, objEnv: incObjEnv });
+        }
+    }
+    // Global variable → struct type, for resolving a dispatch through a file-scope
+    // table by subscript (`cmdnames[i].cmd_func(…)`).
+    const globalVarType = new Map();
+    // Process a `{ … }` initializer body (array of elements or a single struct).
+    const processInit = (struct, body, isArray, file, env) => {
+        if (isArray) {
+            for (const el of splitTopLevel(body, ',')) {
+                const t = el.trim();
+                if (t.startsWith('{')) {
+                    const e = matchBrace(t, 0);
+                    if (e > 0)
+                        registerStructValue(struct, t.slice(1, e), file, env);
+                }
+                else if (t) {
+                    // an element built by a macro (`MAKE_CMD(…)`/`FUNCTION(…)`) or a bare value
+                    registerStructValue(struct, t, file, env);
+                }
+            }
+        }
+        else {
+            registerStructValue(struct, body, file, env);
+        }
+    };
     // `(?:struct )?TYPE name[opt] = {` initializers, where TYPE is a struct that
     // has ≥1 fn-pointer field. Handles both single (`= {…}`) and array
-    // (`[] = { {…}, {…} }`) forms.
+    // (`[] = { {…}, {…} }`) forms. Macro calls inside an element are expanded first.
     const INIT_RE = /(?:^|[;{}])\s*(?:(?:static|const|extern|register|volatile)\s+)*(?:struct\s+)?(\w+)\s+(\w+)\s*(\[[^\]]*\])?\s*=\s*\{/g;
-    for (const file of files) {
-        const s = srcCache.get(file);
-        if (!s || !s.includes('='))
+    // `struct TAG { … } var[opt] [= {…}]` — the struct is defined INLINE with the
+    // table (vim's `cmdname`/`nv_cmd`); its layout never became a node, so parse it
+    // here and register it before reading the entries. No leading anchor: a
+    // `struct TAG {` with a brace body is always a definition (it may be preceded
+    // by a `#define …` line ending in a digit, as in vim), and the trailing
+    // `var … = {` check below is what distinguishes a TABLE from a plain type.
+    const INLINE_STRUCT_RE = /\bstruct\s+(\w+)\s*\{/g;
+    // `(?:static …)* ELEMTYPE [*] name[…] = { … }` — a bare array of function
+    // pointers (no struct wrapper). The optional `*` covers a function-TYPE
+    // typedef element (`opcode_t *opcodes[]`); a function-pointer typedef element
+    // (`zend_rc_dtor_func_t t[]`) needs none. The typedef-set membership gate
+    // (below) is what separates this from a plain data/struct array.
+    const ARRAY_TABLE_RE = /(?:^|[;{}])\s*(?:(?:static|const|extern|register|volatile)\s+)*(\w+)\s+(\*\s*)?(\w+)\s*\[[^\]]*\]\s*=\s*\{/g;
+    for (const unit of units) {
+        const s = unit.text;
+        if (!s || !s.includes('{'))
+            continue;
+        INLINE_STRUCT_RE.lastIndex = 0;
+        let im;
+        while ((im = INLINE_STRUCT_RE.exec(s))) {
+            const tag = im[1];
+            const sOpen = im.index + im[0].length - 1; // the struct body's `{`
+            const sClose = matchBrace(s, sOpen);
+            if (sClose < 0)
+                continue;
+            // After `}`, expect `var [opt] [= {…}]` to be a table; else it's a plain type.
+            const after = s.slice(sClose + 1);
+            const vm = after.match(/^\s*(\w+)\s*(\[[^\]]*\])?\s*(=\s*\{)?/);
+            if (!vm || !vm[1])
+                continue;
+            const fields = parseStructFields(s.slice(sOpen + 1, sClose));
+            if (!fields.some((f) => f.isFnPtr))
+                continue; // only tables of fn pointers matter
+            if (!structLayout.has(tag))
+                registerStructLayout(tag, fields);
+            globalVarType.set(vm[1], tag);
+            if (vm[3]) {
+                const aOpen = sClose + 1 + after.indexOf('{', vm[0].length - 1);
+                const aClose = matchBrace(s, aOpen);
+                if (aClose > 0) {
+                    processInit(tag, s.slice(aOpen + 1, aClose), !!vm[2], unit.file, unit.env);
+                    INLINE_STRUCT_RE.lastIndex = aClose;
+                }
+            }
+        }
+        if (!s.includes('='))
             continue;
         INIT_RE.lastIndex = 0;
         let m;
         while ((m = INIT_RE.exec(s))) {
-            const struct = m[1];
+            let struct = m[1];
+            if (!structLayout.has(struct))
+                struct = resolveTypeName(struct, unit.objEnv);
             if (!structLayout.has(struct))
                 continue;
             const isArray = !!m[3];
@@ -211,30 +807,32 @@ function cFnPointerDispatchEdges(queries, ctx) {
             const close = matchBrace(s, open);
             if (close < 0)
                 continue;
-            const body = s.slice(open + 1, close);
-            if (isArray) {
-                // top-level `{ … }` element groups
-                for (const el of splitTopLevel(body, ',')) {
-                    const t = el.trim();
-                    if (t.startsWith('{')) {
-                        const e = matchBrace(t, 0);
-                        if (e > 0)
-                            registerStructValue(struct, t.slice(1, e), file);
-                    }
-                    else if (t) {
-                        // array of bare values (rare for structs) — treat as one positional slot
-                        registerStructValue(struct, t, file);
-                    }
-                }
-            }
-            else {
-                registerStructValue(struct, body, file);
-            }
+            globalVarType.set(m[2], struct);
+            processInit(struct, s.slice(open + 1, close), isArray, unit.file, unit.env);
             INIT_RE.lastIndex = close;
         }
+        // Bare arrays-of-function-pointers (no struct, no field). Gated on the
+        // element type being a function typedef — a fn-TYPE typedef needs the `*`
+        // (array of pointers to it), a fn-pointer typedef does not. A data or
+        // struct array's element type is never in these sets, so it never fires.
+        ARRAY_TABLE_RE.lastIndex = 0;
+        let am;
+        while ((am = ARRAY_TABLE_RE.exec(s))) {
+            const elemType = am[1];
+            const hasStar = !!am[2];
+            if (!((fnTypeTypedefs.has(elemType) && hasStar) || fnPtrTypedefs.has(elemType)))
+                continue;
+            const open = am.index + am[0].length - 1; // the `{`
+            const close = matchBrace(s, open);
+            if (close < 0)
+                continue;
+            registerArrayValue(am[3], s.slice(open + 1, close), unit.file, unit.env);
+            ARRAY_TABLE_RE.lastIndex = close;
+        }
     }
     // ---- receiver-type resolution within a function's source ----
-    // `(?:struct )?TYPE [*]recv` declared in the params or body → TYPE (if a known struct).
+    // `(?:struct )?TYPE [*]recv` declared in the params or body → TYPE (if a known
+    //  fn-pointer-bearing struct).
     const recvTypeIn = (fnSrc, recv) => {
         const re = new RegExp(`(?:struct\\s+)?(\\w+)\\s*\\*?\\s*\\b${recv}\\b\\s*(?:[,)=;]|\\[)`, 'g');
         let m;
@@ -244,6 +842,41 @@ function cFnPointerDispatchEdges(queries, ctx) {
         }
         return null;
     };
+    // Declared type of a local/param `v` — ANY type token, not just fn-pointer
+    // structs (the base of a chained receiver needn't carry a fn pointer itself).
+    // Falls back to a file-scope table variable (`cmdnames` in `cmdnames[i].fn()`).
+    const escapeRe = (x) => x.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const varTypeIn = (fnSrc, v) => {
+        const re = new RegExp(`(?:struct\\s+)?(\\w+)\\s*\\*?\\s*\\b${escapeRe(v)}\\b\\s*(?:[,)=;]|\\[)`, 'g');
+        let m;
+        while ((m = re.exec(fnSrc))) {
+            if (!C_TYPE_KEYWORDS.has(m[1]))
+                return m[1];
+        }
+        return globalVarType.get(v) ?? null;
+    };
+    // Resolve a member-access chain (`c->cmd`, or just `p`) to a struct type,
+    // walking each segment's declared field type. `c->cmd->proc` dispatch:
+    // base chain `c->cmd` → client.cmd's type `redisCommand`, the proc owner.
+    // Array subscripts (`cmdnames[i]`) are stripped — an index yields one element.
+    const resolveChainType = (fnSrc, chain) => {
+        const segs = chain.replace(/\s*\[[^\]]*\]/g, '').split(/\s*(?:->|\.)\s*/).filter(Boolean);
+        if (segs.length === 0)
+            return null;
+        let t = varTypeIn(fnSrc, segs[0]);
+        for (let i = 1; t && i < segs.length; i++) {
+            let next = null;
+            for (const fields of allStructFields.get(t) ?? []) {
+                const f = fields.find((fl) => fl.name === segs[i] && fl.type);
+                if (f) {
+                    next = f.type;
+                    break;
+                }
+            }
+            t = next;
+        }
+        return t;
+    };
     // ---- Pass D: field←field propagation (`a->f = b->g`) ----
     // Collected as (targetStruct.field ← sourceStruct.field) pairs, then merged to
     // a fixpoint so a hook slot inherits a registry field's handlers.
@@ -286,11 +919,19 @@ function cFnPointerDispatchEdges(queries, ctx) {
         if (!changed)
             break;
     }
-    if (reg.size === 0)
+    if (reg.size === 0 && arrayReg.size === 0)
         return [];
     // ---- Pass E: dispatch sites → edges ----
-    // recv->field( or recv.field( where field is a known fn-pointer field.
-    const DISPATCH_RE = /(\w+)\s*(?:->|\.)\s*(\w+)\s*\(/g;
+    // `base->…->field(` or `base.…field(` where `field` is a known fn-pointer field.
+    // The base may be a chain (`c->cmd->proc`) or carry array subscripts
+    // (`cmdnames[i].cmd_func`). An optional `)` before the call covers the
+    // parenthesized form `(cmdnames[i].cmd_func)(&ea)` vim uses.
+    const DISPATCH_RE = /((?:\w+(?:\s*\[[^\][]*\])?\s*(?:->|\.)\s*)+)(\w+)\s*\)?\s*\(/g;
+    // Bare-array dispatch: `tbl[i](…)` or the explicit-deref `(*tbl[i])(…)`. The
+    // subscript may itself contain a call (`tbl[GC_TYPE(p)](…)`), so the index
+    // class excludes only brackets. Precision comes from the `arrayReg` gate below
+    // — this fires only when `tbl` is a known fn-pointer array.
+    const ARRAY_DISPATCH_RE = /(?:\(\s*\*\s*)?\b(\w+)\s*\[[^\][]*\]\s*\)?\s*\(/g;
     const edges = [];
     const seen = new Set();
     for (const fn of cFns) {
@@ -302,14 +943,20 @@ function cFnPointerDispatchEdges(queries, ctx) {
         let m;
         let added = 0;
         while ((m = DISPATCH_RE.exec(body)) && added < FANOUT_CAP) {
-            const recv = m[1];
+            const baseChain = m[1].replace(/\s*(?:->|\.)\s*$/, '').trim(); // receiver, minus the trailing arrow
             const field = m[2];
             const owners = fieldToStructs.get(field);
             if (!owners || owners.size === 0)
                 continue;
-            // Resolve the receiver's struct type; else fall back to a field name that
-            // belongs to exactly one struct.
-            let struct = recvTypeIn(body, recv);
+            // 1) resolve the receiver chain's struct type precisely (handles c->cmd->proc);
+            // 2) else the last segment as a simple local/param of a fn-pointer-bearing struct;
+            // 3) else fall back to a field name that belongs to exactly one struct.
+            let struct = resolveChainType(body, baseChain);
+            if (!struct || !owners.has(struct)) {
+                const lastSeg = baseChain.replace(/\s*\[[^\]]*\]/g, '').split(/\s*(?:->|\.)\s*/).pop();
+                const t = recvTypeIn(body, lastSeg);
+                struct = t && owners.has(t) ? t : null;
+            }
             if (!struct || !owners.has(struct))
                 struct = owners.size === 1 ? [...owners][0] : null;
             if (!struct)
@@ -341,6 +988,45 @@ function cFnPointerDispatchEdges(queries, ctx) {
                     break;
             }
         }
+        // ---- bare array-of-fn-pointers dispatch (`tbl[i](…)`) ----
+        if (arrayReg.size && added < FANOUT_CAP) {
+            ARRAY_DISPATCH_RE.lastIndex = 0;
+            while ((m = ARRAY_DISPATCH_RE.exec(body)) && added < FANOUT_CAP) {
+                const entries = arrayReg.get(m[1]);
+                if (!entries)
+                    continue;
+                // Same-file table wins on a name collision (two file-local `opcodes`);
+                // a unique name resolves cross-file; otherwise ambiguous — bail.
+                const ids = entries.length === 1
+                    ? entries[0].ids
+                    : (entries.find((e) => e.file === fn.filePath)?.ids ?? null);
+                if (!ids)
+                    continue;
+                const line = fn.startLine + body.slice(0, m.index).split('\n').length - 1;
+                for (const tid of ids) {
+                    if (tid === fn.id)
+                        continue;
+                    const key = `${fn.id}>${tid}`;
+                    if (seen.has(key))
+                        continue;
+                    seen.add(key);
+                    edges.push({
+                        source: fn.id,
+                        target: tid,
+                        kind: 'calls',
+                        line,
+                        provenance: 'heuristic',
+                        metadata: {
+                            synthesizedBy: 'fn-pointer-dispatch',
+                            via: `${m[1]}[]`,
+                            registeredAt: `${fn.filePath}:${line}`,
+                        },
+                    });
+                    if (++added >= FANOUT_CAP)
+                        break;
+                }
+            }
+        }
     }
     return edges;
 }