diff --git a/lib/docs/main.js b/lib/docs/main.js
index 28f8142f33..7dcf8a1757 100644
--- a/lib/docs/main.js
+++ b/lib/docs/main.js
@@ -32,18 +32,6 @@
} TypeKind
*/
-/**
- * @typedef {
- | WalkResult
- | { unspecified: {} }
- | { anytype: {} }
- | { type: number }
- | { comptimeExpr: number }
- | { call: number }
- | { hasCte: boolean; declPath: number[] }
- } TypeRef
-*/
-
/**
* @typedef {
| { void: {} }
@@ -52,16 +40,16 @@
| { type: number }
| { comptimeExpr: number }
| { call: number }
- | { int: { typeRef: TypeRef; value: number } }
- | { float: { typeRef: TypeRef; value: number } }
+ | { int: { typeRef: WalkResult; value: number } }
+ | { float: { typeRef: WalkResult; value: number } }
| { bool: boolean }
- | { undefined: TypeRef }
- | { null: TypeRef }
+ | { undefined: WalkResult }
+ | { null: WalkResult }
| { typeOf: WalkResult }
| { compileError: string }
| { string: string }
| { struct: Struct }
- | { hasCte: boolean; declPath: number[] }
+ | { refPath: WalkResult[] }
| { array: ZigArray }
| { enumLiteral: string }
} WalkResult
@@ -75,8 +63,8 @@
| { len: WalkResult; child: TypeRef } // Array
| { name: string; fields: { name: string; docs: string }[] } // ErrorSet
| { size: "One" | "Many" | "Slice" | "C"; child: TypeRef } // Pointer
- | { name: string; src?: number; privDecls: number[]; pubDecls: number[]; fields?: TypeRef[] } // Struct, Enum, Union
- | { name: string; src?: number; ret: TypeRef; params?: TypeRef[] } // Fn
+ | { name: string; src: number; privDecls: number[]; pubDecls: number[]; fields: WalkResult[] } // Struct, Enum, Union
+ | { name: string; src: number; ret: WalkResult; params: WalkResult[] } // Fn
)
} Type
*/
@@ -85,14 +73,14 @@
* @typedef {{
name: string,
src: number | null,
- ret: TypeRef,
- params: TypeRef[] | null,
+ ret: WalkResult,
+ params: WalkResult[] | null,
}} Fn
*/
/**
* @typedef {{
- func: TypeRef,
+ func: WalkResult,
args: WalkResult[],
ret: WalkResult,
}} Call
@@ -135,21 +123,21 @@
src?: number,
privDecls: number[],
pubDecls: number[],
- fields?: TypeRef[],
+ fields?: WalkResult[],
}} Struct
*/
/**
* @typedef {{
len: WalkResult,
- child: TypeRef,
+ child: WalkResult,
}} ZigArray
*/
/**
* @typedef {{
code: string,
- typeRef: TypeRef,
+ typeRef: WalkResult,
}} ComptimeExpr
*/
@@ -219,6 +207,7 @@ var zigAnalysis;
var domSectSearchNoResults = document.getElementById("sectSearchNoResults");
var domSectInfo = document.getElementById("sectInfo");
var domTdTarget = document.getElementById("tdTarget");
+ var domPrivDeclsBox = document.getElementById("privDeclsBox");
var domTdZigVer = document.getElementById("tdZigVer");
var domHdrName = document.getElementById("hdrName");
var domHelpModal = document.getElementById("helpDialog");
@@ -238,6 +227,7 @@ var zigAnalysis;
var canonTypeDecls = null; // lazy; use getCanonTypeDecl
var curNav = {
+ showPrivDecls: false,
// each element is a package name, e.g. @import("a") then within there @import("b")
// starting implicitly from root package
pkgNames: [],
@@ -264,6 +254,18 @@ var zigAnalysis;
// var nodesToCallsMap = indexNodesToCalls();
domSearch.addEventListener('keydown', onSearchKeyDown, false);
+ domPrivDeclsBox.addEventListener('change', function() {
+ if (this.checked != curNav.showPrivDecls) {
+ if (this.checked && location.hash.length > 1 && location.hash[1] != '*'){
+ location.hash = "#*" + location.hash.substring(1);
+ return;
+ }
+ if (!this.checked && location.hash.length > 1 && location.hash[1] == '*') {
+ location.hash = "#" + location.hash.substring(2);
+ return;
+ }
+ }
+ }, false);
window.addEventListener('hashchange', onHashChange, false);
window.addEventListener('keydown', onWindowKeyDown, false);
onHashChange();
@@ -323,19 +325,13 @@ var zigAnalysis;
return typeKind === typeKinds.ErrorSet || typeKindIsContainer(typeKind);
}
- function findCteInDeclPath(path) {
+ function findCteInRefPath(path) {
for (var i = path.length - 1; i >= 0; i -= 1) {
- const decl = zigAnalysis.decls[path[i]];
- if ("comptimeExpr" in decl.value) {
- return decl;
- }
-
- if ("declPath" in decl.value) {
- const res = findCteInDeclPath(decl.value.declPath);
- if (res !== null) {
- return res;
- }
- }
+ const ref = path[i];
+ if ("string" in ref) continue;
+ if ("comptimeExpr" in ref) return ref;
+ if ("refPath" in ref) return findCteinRefPath(ref.refPath);
+ return null;
}
return null;
@@ -346,14 +342,15 @@ var zigAnalysis;
while(i < 1000) {
i += 1;
- if ("declPath" in value) {
- if (value.hasCte) {
- return findCteInDeclPath(value.declPath).value;
- }
- value = zigAnalysis.decls[value.declPath[0]].value;
+ if ("refPath" in value) {
+ value = value.refPath[value.refPath.length -1];
continue;
}
+ if ("declRef" in value) {
+ value = zigAnalysis.decls[value.declRef].value;
+ }
+
return value;
}
@@ -369,13 +366,15 @@ var zigAnalysis;
return { type: typeTypeId };
}
- if ("declPath" in decl.value) {
- if (decl.value.hasCte) {
- decl = findCteInDeclPath(decl.value.declPath);
- } else {
- decl = zigAnalysis.decls[decl.value.declPath[0]];
- }
+ if ("refPath" in decl.value) {
+ decl = {
+ value: decl.value.refPath[decl.value.refPath.length -1]
+ };
+ continue;
+ }
+ if ("declRef" in decl.value) {
+ decl = zigAnalysis.decls[decl.value.declRef];
continue;
}
@@ -402,8 +401,14 @@ var zigAnalysis;
if ("call" in decl.value) {
const fn_call = zigAnalysis.calls[decl.value.call];
- console.assert("declPath" in fn_call.func);
- const fn_decl = zigAnalysis.decls[fn_call.func.declPath[0]];
+ var fn_decl = undefined;
+ if ("declRef" in fn_call.func) {
+ fn_decl = zigAnalysis.decls[fn_call.func.declRef];
+ } else if ("refPath" in fn_call.func) {
+ console.assert("declRef" in fn_call.func.refPath[fn_call.func.refPath.length -1]);
+ fn_decl = zigAnalysis.decls[fn_call.func.refPath[fn_call.func.refPath.length -1].declRef.value];
+ } else throw {};
+
const fn_decl_value = resolveValue(fn_decl.value);
console.assert("type" in fn_decl_value); //TODO handle comptimeExpr
const fn_type = zigAnalysis.types[fn_decl_value.type];
@@ -456,6 +461,8 @@ var zigAnalysis;
renderInfo();
renderPkgList();
+ domPrivDeclsBox.checked = curNav.showPrivDecls;
+
if (curNavSearch !== "") {
return renderSearch();
}
@@ -547,7 +554,7 @@ var zigAnalysis;
var typeObj = zigAnalysis.types[typeIndex];
if (typeObj.kind !== typeKinds.Struct)
return false;
- return !typeObj.fields;
+ return typeObj.fields.length == 0;
}
function typeIsGenericFn(typeIndex) {
@@ -850,22 +857,14 @@ var zigAnalysis;
if ("comptimeExpr" in typeValue) {
return "[ComptimeExpr]";
}
- if ("declPath" in typeValue) {
+ if ("refPath" in typeValue) {
var result = "";
- for (var j = typeValue.declPath.length - 1; j >= 0; j--) {
- var decl = zigAnalysis.decls[typeValue.declPath[j]];
+ for (var j = 0; j < typeValue.refPath.length; j++) {
- // TODO: handle nested decl paths properly!
- if (typeValue.hasCte) {
- if (wantHtml)
- result += "
[ComptimeExpr]";
- else
- result += "[ComptimeExpr]";
- break;
- }
- var name = escapeHtml(decl.name);
+ var name = "[RefPath]";
if (wantHtml) {
- result += '
';
+ //result += '';
+ result += '';
result += '' +
name + '';
result += '';
@@ -1182,24 +1181,11 @@ var zigAnalysis;
if (isVarArgs && i === typeObj.params.length - 1) {
payloadHtml += '...';
- } else if ("declPath" in value) {
- if (value.hasCte) {
- var cte = findCteInDeclPath(value.declPath);
- payloadHtml += "[ComptimeExpr]";
- } else {
- var decl = zigAnalysis.decls[value.declPath[0]];
- var val = resolveValue(decl.value);
- if ("comptimeExpr" in val) {
- payloadHtml += "[ComptimeExpr]";
- } else {
- console.assert("type" in val);
- var valType = zigAnalysis.types[val.type];
- var valTypeName = typeShorthandName(valType);
- payloadHtml += '
';
- payloadHtml += '' + escapeHtml(decl.name) + '';
- payloadHtml += '';
- }
- }
+ } else if ("refPath" in value) {
+ payloadHtml += '
';
+ payloadHtml += '[Ref Path]';
+ payloadHtml += '';
+
} else if ("type" in value) {
var name = typeValueName(value, false);
payloadHtml += '
' + escapeHtml(name) + '';
@@ -1422,6 +1408,59 @@ var zigAnalysis;
domFnProto.classList.remove("hidden");
}
+
+ function categorizeDecls(decls,
+ typesList, namespacesList, errSetsList,
+ fnsList, varsList, valsList) {
+
+ for (var i = 0; i < decls.length; i += 1) {
+ var decl = zigAnalysis.decls[decls[i]];
+ var declValue = resolveValue(decl.value);
+
+ if (decl.kind === 'var') {
+ varsList.push(decl);
+ continue;
+ }
+
+ if (decl.kind === 'const') {
+ if ("call" in declValue) {
+ let c = zigAnalysis.calls[declValue.call];
+ console.assert("comptimeExpr" in c.ret);
+ let fDecl = resolveValue(c.func);
+ console.assert("type" in fDecl);
+ let fType = zigAnalysis.types[fDecl.type];
+ console.assert("type" in fType.ret);
+ if (fType.ret.type === typeTypeId) {
+ typesList.push(decl);
+ } else {
+ valsList.push(decl);
+ }
+ } else if (!("type" in declValue)){
+ valsList.push(decl);
+ } else {
+ var value = zigAnalysis.types[declValue.type];
+ var kind = value.kind;
+ if (kind === typeKinds.Fn) {
+ // TODO: handle CTE return types when we know their type.
+ const resVal = resolveValue(value.ret);
+ if ("type" in resVal && resVal.type == typeTypeId) {
+ typesList.push(decl);
+ } else {
+ fnsList.push(decl);
+ }
+
+ } else if (typeIsErrSet(declValue.type)) {
+ errSetsList.push(decl);
+ } else if (typeIsStructWithNoFields(declValue.type)) {
+ namespacesList.push(decl);
+ } else {
+ typesList.push(decl);
+ }
+ }
+ }
+ }
+ }
+
function renderContainer(container) {
var typesList = [];
var namespacesList = [];
@@ -1430,77 +1469,13 @@ var zigAnalysis;
var varsList = [];
var valsList = [];
- var declLen = container.pubDecls ? container.pubDecls.length : 0;
- for (var i = 0; i < declLen; i += 1) {
- var decl = zigAnalysis.decls[container.pubDecls[i]];
- var declValue = resolveValue(decl.value);
+ categorizeDecls(container.pubDecls,
+ typesList, namespacesList, errSetsList,
+ fnsList, varsList, valsList);
+ if (curNav.showPrivDecls) categorizeDecls(container.privDecls,
+ typesList, namespacesList, errSetsList,
+ fnsList, varsList, valsList);
- if (decl.kind === 'var') {
- varsList.push(decl);
- continue;
- }
-
- if (decl.kind === 'const') {
- if (!("type" in declValue)){
- valsList.push(decl);
- } else {
- var value = zigAnalysis.types[declValue.type];
- var kind = value.kind;
- if (kind === typeKinds.Fn) {
- // TODO: handle CTE return types when we know their type.
- const resVal = resolveValue(value.ret);
- if ("type" in resVal && resVal.type == typeTypeId) {
- typesList.push(decl);
- } else {
- fnsList.push(decl);
- }
-
- } else if (typeIsErrSet(declValue.type)) {
- errSetsList.push(decl);
- } else if (typeIsStructWithNoFields(declValue.type)) {
- namespacesList.push(decl);
- } else {
- typesList.push(decl);
- }
- }
- }
- }
-
- declLen = container.privDecls ? container.privDecls.length : 0;
- for (var i = 0; i < declLen; i += 1) {
- var decl = zigAnalysis.decls[container.privDecls[i]];
- var declValue = resolveValue(decl.value);
-
- if (decl.kind === 'var') {
- varsList.push(decl);
- continue;
- }
-
- if (decl.kind === 'const') {
- if (!("type" in declValue)){
- valsList.push(decl);
- } else {
- var value = zigAnalysis.types[declValue.type];
- var kind = value.kind;
- if (kind === typeKinds.Fn) {
- // TODO: handle CTE return types when we know their type.
- const resVal = resolveValue(value.ret);
- if ("type" in resVal && resVal.type == typeTypeId) {
- typesList.push(decl);
- } else {
- fnsList.push(decl);
- }
-
- } else if (typeIsErrSet(declValue.type)) {
- errSetsList.push(decl);
- } else if (typeIsStructWithNoFields(declValue.type)) {
- namespacesList.push(decl);
- } else {
- typesList.push(decl);
- }
- }
- }
- }
typesList.sort(byNameProperty);
namespacesList.sort(byNameProperty);
@@ -1712,6 +1687,7 @@ var zigAnalysis;
function updateCurNav() {
curNav = {
+ showPrivDecls: false,
pkgNames: [],
pkgObjs: [],
declNames: [],
@@ -1721,6 +1697,11 @@ var zigAnalysis;
if (location.hash[0] === '#' && location.hash.length > 1) {
var query = location.hash.substring(1);
+ if (query[0] === '*') {
+ curNav.showPrivDecls = true;
+ query = query.substring(1);
+ }
+
var qpos = query.indexOf("?");
var nonSearchPart;
if (qpos === -1) {
diff --git a/src/Autodoc.zig b/src/Autodoc.zig
index fd43274586..59a7c1bbd5 100644
--- a/src/Autodoc.zig
+++ b/src/Autodoc.zig
@@ -608,6 +608,7 @@ const DocData = struct {
\\, "value": {s}1 }} }}
, .{neg});
// TODO: uncomment once float panic is fixed in stdlib
+ // See: https://github.com/ziglang/zig/issues/11283
// try w.print(
// \\, "value": {s}{e} }} }}
// , .{ neg, v.value });
@@ -621,7 +622,6 @@ const DocData = struct {
.@"null" => |v| try std.json.stringify(v, options, w),
.typeOf, .sizeOf => |v| try std.json.stringify(v, options, w),
.compileError => |v| try std.json.stringify(v, options, w),
- .string => |v| try std.json.stringify(v, options, w),
.fieldRef => |v| try std.json.stringify(
struct { fieldRef: FieldRef }{ .fieldRef = v },
options,
@@ -645,6 +645,11 @@ const DocData = struct {
options,
w,
),
+ .string => |v| try std.json.stringify(
+ struct { string: []const u8 }{ .string = v },
+ options,
+ w,
+ ),
.enumLiteral => |v| try std.json.stringify(
struct { @"enumLiteral": []const u8 }{ .@"enumLiteral" = v },
options,