expose parent of struct in analysis dump and use it to link from FnFrame

Author: s-ol

lib/std/special/docs/main.js

@@ -458,7 +458,20 @@
         return navLink(canonPkgPaths[pkgIndex], []);
     }
 
-    function navLinkDecl(childName) {
+    function navLinkDecl(declObj) {
+        if (declObj.container) {
+            var declNames = [declObj.name];
+            var container = zigAnalysis.types[declObj.container];
+            while (container && container.name !== '(root)') {
+                var names = container.name.split('.');
+                declNames.unshift(names[names.length - 1]);
+                container = zigAnalysis[container.parent];
+            }
+
+            return navLink(curNav.pkgNames, declNames);
+        }
+
+        // hope local lookup is correct
         return navLink(curNav.pkgNames, curNav.declNames.concat([childName]));
     }
 
@@ -730,19 +743,19 @@
                 var name = '@Frame(';
                 var fnObj = zigAnalysis.fns[typeObj.fn];
                 var declObj = fnObj.decl && zigAnalysis.decls[fnObj.decl];
-                var fn_name = declObj ? declObj.name : typeObj.fn_name;
+                var fnName = declObj ? declObj.name : typeObj.name;
                 if (wantHtml) {
                   name += '<span class="tok-fn">';
                   if (declObj) {
                     // TODO look up decl package and import path
-                    name += '<a href="' + navLinkDecl(declObj.name) + '">'
-                        + escapeHtml(fn_name) + '</a>';
+                    name += '<a href="' + navLinkDecl(declObj) + '">'
+                        + escapeHtml(fnName) + '</a>';
                   } else {
-                    name += escapeHtml(fn_name);
+                    name += escapeHtml(fnName);
                   }
                   name += '</span>';
                 } else {
-                  name += fn_name;
+                  name += fnName;
                 }
                 name += ')';
                 return name;
@@ -994,7 +1007,7 @@
                 var aDom = liDom.children[0];
                 var decl = typesList[i];
                 aDom.textContent = decl.name;
-                aDom.setAttribute('href', navLinkDecl(decl.name));
+                aDom.setAttribute('href', navLinkDecl(decl));
             }
             domListTypes.innerHTML = "";
             domListTypes.appendChild(domListTypesFragment);
@@ -1007,7 +1020,7 @@
                 var aDom = liDom.children[0];
                 var decl = namespacesList[i];
                 aDom.textContent = decl.name;
-                aDom.setAttribute('href', navLinkDecl(decl.name));
+                aDom.setAttribute('href', navLinkDecl(decl));
             }
             domListNamespaces.innerHTML = "";
             domListNamespaces.appendChild(domListNamespacesFragment);
@@ -1021,7 +1034,7 @@
                 var aDom = liDom.children[0];
                 var decl = errSetsList[i];
                 aDom.textContent = decl.name;
-                aDom.setAttribute('href', navLinkDecl(decl.name));
+                aDom.setAttribute('href', navLinkDecl(decl));
             }
             domListErrSets.innerHTML = "";
             domListErrSets.appendChild(domListErrSetsFragment);
@@ -1037,7 +1050,7 @@
                 var tdFnCode = trDom.children[0];
                 var tdDesc = trDom.children[1];
 
-                tdFnCode.innerHTML = typeIndexName(decl.type, true, true, decl, navLinkDecl(decl.name));
+                tdFnCode.innerHTML = typeIndexName(decl.type, true, true, decl, navLinkDecl(decl));
 
                 var docs = zigAnalysis.astNodes[decl.src].docs;
                 if (docs != null) {
@@ -1098,7 +1111,7 @@
                 var tdType = trDom.children[1];
                 var tdDesc = trDom.children[2];
 
-                tdNameA.setAttribute('href', navLinkDecl(decl.name));
+                tdNameA.setAttribute('href', navLinkDecl(decl));
                 tdNameA.textContent = decl.name;
 
                 tdType.innerHTML = typeIndexName(decl.type, true, true);
@@ -1127,7 +1140,7 @@
                 var tdType = trDom.children[1];
                 var tdDesc = trDom.children[2];
 
-                tdNameA.setAttribute('href', navLinkDecl(decl.name));
+                tdNameA.setAttribute('href', navLinkDecl(decl));
                 tdNameA.textContent = decl.name;
 
                 tdType.innerHTML = typeIndexName(decl.type, true, true);

src/stage1/dump_analysis.cpp

@@ -602,6 +602,22 @@ static void anal_dump_decl(AnalDumpCtx *ctx, Tld *tld) {
 
         jw_object_field(jw, "name");
         jw_string(jw, buf_ptr(tld->name));
+
+        Scope* scope = tld->parent_scope;
+        while (scope != nullptr) {
+            if (scope->id == ScopeIdDecls) {
+                ScopeDecls *parent_scope = reinterpret_cast<ScopeDecls *>(scope);
+
+                if (parent_scope->container_type) {
+                    jw_object_field(jw, "container");
+                    anal_dump_type_ref(ctx, parent_scope->container_type);
+                }
+
+                break;
+            }
+
+            scope = scope->parent;
+        }
     }
 
     switch (tld->id) {
@@ -828,6 +844,25 @@ static void anal_dump_type(AnalDumpCtx *ctx, ZigType *ty) {
                 jw_object_field(jw, "file");
                 anal_dump_file_ref(ctx, path_buf);
             }
+
+            {
+                Scope* scope = ty->data.structure.decls_scope->base.parent;
+                while (scope != nullptr) {
+                    if (scope->id == ScopeIdDecls) {
+                        ScopeDecls *parent_scope = reinterpret_cast<ScopeDecls *>(scope);
+
+                        if (parent_scope->container_type) {
+                            jw_object_field(jw, "parent");
+                            anal_dump_type_ref(ctx, parent_scope->container_type);
+                        }
+
+                        break;
+                    }
+
+                    scope = scope->parent;
+                }
+            }
+
             break;
         }
         case ZigTypeIdUnion: {
@@ -1064,7 +1099,7 @@ static void anal_dump_type(AnalDumpCtx *ctx, ZigType *ty) {
             break;
         }
         case ZigTypeIdFnFrame: {
-            jw_object_field(jw, "fn_name");
+            jw_object_field(jw, "name");
             jw_string(jw, buf_ptr(&ty->data.frame.fn->symbol_name));
 
             jw_object_field(jw, "fn");