This function is not tested or referenced.
diff --git a/lib/std/special/docs/main.js b/lib/std/special/docs/main.js
index f2a17cf7cd30f147c53f9c6728d4f5a647036157..679e6f35c7d8fa70e56ba864af0c1f6a720840d7 100644
--- a/lib/std/special/docs/main.js
+++ b/lib/std/special/docs/main.js
@@ -13,7 +13,10 @@
var domFnProto = document.getElementById("fnProto");
var domFnProtoCode = document.getElementById("fnProtoCode");
var domFnDocs = document.getElementById("fnDocs");
- var domFnErrors = document.getElementById("fnErrors");
+ var domSectFnErrors = document.getElementById("sectFnErrors");
+ var domListFnErrors = document.getElementById("listFnErrors");
+ var domTableFnErrors = document.getElementById("tableFnErrors");
+ var domFnErrorsAnyError = document.getElementById("fnErrorsAnyError");
var domFnExamples = document.getElementById("fnExamples");
var domFnNoExamples = document.getElementById("fnNoExamples");
var domSearch = document.getElementById("search");
@@ -36,6 +39,7 @@
var typeKindFloatId;
var typeKindIntId;
var typeKindBoolId;
+ var typeKindVoidId;
var typeKindErrSetId;
var typeKindErrUnionId;
findTypeKinds();
@@ -102,9 +106,11 @@
domSectInfo.classList.add("hidden");
domHdrName.classList.add("hidden");
domSectNav.classList.add("hidden");
- domFnErrors.classList.add("hidden");
+ domSectFnErrors.classList.add("hidden");
domFnExamples.classList.add("hidden");
domFnNoExamples.classList.add("hidden");
+ domFnErrorsAnyError.classList.add("hidden");
+ domTableFnErrors.classList.add("hidden");
renderTitle();
renderInfo();
@@ -202,6 +208,51 @@
docsSource = srcNode.docs;
}
+ var errSetTypeIndex = null;
+ if (typeObj.ret != null) {
+ var retType = zigAnalysis.types[typeObj.ret];
+ if (retType.kind === typeKindErrSetId) {
+ errSetTypeIndex = typeObj.ret;
+ } else if (retType.kind === typeKindErrUnionId) {
+ errSetTypeIndex = retType.err;
+ }
+ }
+ if (errSetTypeIndex != null) {
+ var errSetType = zigAnalysis.types[errSetTypeIndex];
+ if (errSetType.errors == null) {
+ domFnErrorsAnyError.classList.remove("hidden");
+ } else {
+ var errorList = [];
+ for (var i = 0; i < errSetType.errors.length; i += 1) {
+ var errObj = zigAnalysis.errors[errSetType.errors[i]];
+ var srcObj = zigAnalysis.astNodes[errObj.src];
+ errorList.push({
+ err: errObj,
+ docs: srcObj.docs,
+ });
+ }
+ errorList.sort(function(a, b) {
+ return operatorCompare(a.err.name.toLowerCase(), b.err.name.toLowerCase());
+ });
+
+ resizeDomList(domListFnErrors, errorList.length, '
| |
');
+ for (var i = 0; i < errorList.length; i += 1) {
+ var trDom = domListFnErrors.children[i];
+ var nameTdDom = trDom.children[0];
+ var descTdDom = trDom.children[1];
+ nameTdDom.textContent = errorList[i].err.name;
+ var docs = errorList[i].docs;
+ if (docs != null) {
+ descTdDom.innerHTML = markdown(docs);
+ } else {
+ descTdDom.textContent = "";
+ }
+ }
+ domTableFnErrors.classList.remove("hidden");
+ }
+ domSectFnErrors.classList.remove("hidden");
+ }
+
var protoSrcIndex;
if (typeIsGenericFn(fnDecl.type)) {
protoSrcIndex = fnDecl.value;
@@ -285,9 +336,11 @@
var list = [];
for (var key in rootPkg.table) {
if (key === "root" && rootIsStd) continue;
+ var pkgIndex = rootPkg.table[key];
+ if (zigAnalysis.packages[pkgIndex] == null) continue;
list.push({
name: key,
- pkg: rootPkg.table[key],
+ pkg: pkgIndex,
});
}
list.sort(function(a, b) {
@@ -447,6 +500,12 @@
} else {
return "bool";
}
+ case typeKindVoidId:
+ if (wantHtml) {
+ return '
void';
+ } else {
+ return "void";
+ }
case typeKindErrSetId:
if (typeObj.errors == null) {
if (wantHtml) {
@@ -580,6 +639,7 @@
return false;
}
var stdPkg = zigAnalysis.packages[rootPkg.table["std"]];
+ if (stdPkg == null) return false;
return rootPkg.file === stdPkg.file;
}
@@ -597,6 +657,8 @@
typeKindIntId = i;
} else if (zigAnalysis.typeKinds[i] === "Bool") {
typeKindBoolId = i;
+ } else if (zigAnalysis.typeKinds[i] === "Void") {
+ typeKindVoidId = i;
} else if (zigAnalysis.typeKinds[i] === "ErrorSet") {
typeKindErrSetId = i;
} else if (zigAnalysis.typeKinds[i] === "ErrorUnion") {
@@ -621,6 +683,9 @@
if (typeKindBoolId == null) {
throw new Error("No type kind 'Bool' found");
}
+ if (typeKindVoidId == null) {
+ throw new Error("No type kind 'Void' found");
+ }
if (typeKindErrSetId == null) {
throw new Error("No type kind 'ErrorSet' found");
}
@@ -702,10 +767,11 @@
for (var key in item.pkg.table) {
var childPkgIndex = item.pkg.table[key];
if (list[childPkgIndex] != null) continue;
+ var childPkg = zigAnalysis.packages[childPkgIndex];
+ if (childPkg == null) continue;
var newPath = item.path.concat([key])
list[childPkgIndex] = newPath;
- var childPkg = zigAnalysis.packages[childPkgIndex];
stack.push({
path: newPath,
pkg: childPkg,
diff --git a/src/all_types.hpp b/src/all_types.hpp
index e6fdc43ea7c2fef658901f633538f7f32307143b..c9f905118f12114a14cfa5e8236d4ce99190832f 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -2146,6 +2146,7 @@ struct ErrorTableEntry {
Buf name;
uint32_t value;
AstNode *decl_node;
+ ErrorTableEntry *other; // null, or another error decl that was merged into this
ZigType *set_with_only_this_in_it;
// If we generate a constant error name value for this error, we memoize it here.
// The type of this is array
diff --git a/src/dump_analysis.cpp b/src/dump_analysis.cpp
index 78f69d60a78a911e477fd6d4b35272aee83bff8c..168d86a21f4ef4958f6724c6bb343918f55f8b1e 100644
--- a/src/dump_analysis.cpp
+++ b/src/dump_analysis.cpp
@@ -892,6 +892,9 @@ static void anal_dump_type(AnalDumpCtx *ctx, ZigType *ty) {
if (type_is_global_error_set(ty)) {
break;
}
+ jw_object_field(jw, "name");
+ jw_string(jw, buf_ptr(&ty->name));
+
if (ty->data.error_set.infer_fn != nullptr) {
jw_object_field(jw, "fn");
anal_dump_fn_ref(ctx, ty->data.error_set.infer_fn);
diff --git a/src/ir.cpp b/src/ir.cpp
index 7e2b39fe1bf7878e2b7c2e6a3e516f098830f402..f29870e039f455774e55a0e52de2c79c0a043000 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -7892,11 +7892,14 @@ static ZigType *get_error_set_union(CodeGen *g, ErrorTableEntry **errors, ZigTyp
}
uint32_t index = set1->data.error_set.err_count;
+ bool need_comma = false;
for (uint32_t i = 0; i < set2->data.error_set.err_count; i += 1) {
ErrorTableEntry *error_entry = set2->data.error_set.errors[i];
if (errors[error_entry->value] == nullptr) {
errors[error_entry->value] = error_entry;
- buf_appendf(&err_set_type->name, "%s,", buf_ptr(&error_entry->name));
+ const char *comma = need_comma ? "," : "";
+ need_comma = true;
+ buf_appendf(&err_set_type->name, "%s%s", comma, buf_ptr(&error_entry->name));
err_set_type->data.error_set.errors[index] = error_entry;
index += 1;
}
@@ -7927,6 +7930,17 @@ static ZigType *make_err_set_with_one_item(CodeGen *g, Scope *parent_scope, AstN
return err_set_type;
}
+static AstNode *ast_field_to_symbol_node(AstNode *err_set_field_node) {
+ if (err_set_field_node->type == NodeTypeSymbol) {
+ return err_set_field_node;
+ } else if (err_set_field_node->type == NodeTypeErrorSetField) {
+ assert(err_set_field_node->data.err_set_field.field_name->type == NodeTypeSymbol);
+ return err_set_field_node->data.err_set_field.field_name;
+ } else {
+ return err_set_field_node;
+ }
+}
+
static IrInstruction *ir_gen_err_set_decl(IrBuilder *irb, Scope *parent_scope, AstNode *node) {
assert(node->type == NodeTypeErrorSetDecl);
@@ -7946,18 +7960,10 @@ static IrInstruction *ir_gen_err_set_decl(IrBuilder *irb, Scope *parent_scope, A
for (uint32_t i = 0; i < err_count; i += 1) {
AstNode *field_node = node->data.err_set_decl.decls.at(i);
- AstNode *symbol_node;
- if (field_node->type == NodeTypeSymbol) {
- symbol_node = field_node;
- } else if (field_node->type == NodeTypeErrorSetField) {
- symbol_node = field_node->data.err_set_field.field_name;
- } else {
- zig_unreachable();
- }
- assert(symbol_node->type == NodeTypeSymbol);
+ AstNode *symbol_node = ast_field_to_symbol_node(field_node);
Buf *err_name = symbol_node->data.symbol_expr.symbol;
ErrorTableEntry *err = allocate
(1);
- err->decl_node = symbol_node;
+ err->decl_node = field_node;
buf_init_from_buf(&err->name, err_name);
auto existing_entry = irb->codegen->error_table.put_unique(err_name, err);
@@ -7973,8 +7979,10 @@ static IrInstruction *ir_gen_err_set_decl(IrBuilder *irb, Scope *parent_scope, A
ErrorTableEntry *prev_err = errors[err->value];
if (prev_err != nullptr) {
- ErrorMsg *msg = add_node_error(irb->codegen, err->decl_node, buf_sprintf("duplicate error: '%s'", buf_ptr(&err->name)));
- add_error_note(irb->codegen, msg, prev_err->decl_node, buf_sprintf("other error here"));
+ ErrorMsg *msg = add_node_error(irb->codegen, ast_field_to_symbol_node(err->decl_node),
+ buf_sprintf("duplicate error: '%s'", buf_ptr(&err->name)));
+ add_error_note(irb->codegen, msg, ast_field_to_symbol_node(prev_err->decl_node),
+ buf_sprintf("other error here"));
return irb->codegen->invalid_instruction;
}
errors[err->value] = err;
@@ -9479,6 +9487,14 @@ static void populate_error_set_table(ErrorTableEntry **errors, ZigType *set) {
}
}
+static ErrorTableEntry *better_documented_error(ErrorTableEntry *preferred, ErrorTableEntry *other) {
+ if (preferred->decl_node->type == NodeTypeErrorSetField)
+ return preferred;
+ if (other->decl_node->type == NodeTypeErrorSetField)
+ return other;
+ return preferred;
+}
+
static ZigType *get_error_set_intersection(IrAnalyze *ira, ZigType *set1, ZigType *set2,
AstNode *source_node)
{
@@ -9505,12 +9521,17 @@ static ZigType *get_error_set_intersection(IrAnalyze *ira, ZigType *set1, ZigTyp
buf_resize(&err_set_type->name, 0);
buf_appendf(&err_set_type->name, "error{");
+ bool need_comma = false;
for (uint32_t i = 0; i < set2->data.error_set.err_count; i += 1) {
ErrorTableEntry *error_entry = set2->data.error_set.errors[i];
ErrorTableEntry *existing_entry = errors[error_entry->value];
if (existing_entry != nullptr) {
- intersection_list.append(existing_entry);
- buf_appendf(&err_set_type->name, "%s,", buf_ptr(&existing_entry->name));
+ // prefer the one with docs
+ const char *comma = need_comma ? "," : "";
+ need_comma = true;
+ ErrorTableEntry *existing_entry_with_docs = better_documented_error(existing_entry, error_entry);
+ intersection_list.append(existing_entry_with_docs);
+ buf_appendf(&err_set_type->name, "%s%s", comma, buf_ptr(&existing_entry_with_docs->name));
}
}
free(errors);
@@ -12058,7 +12079,7 @@ static void report_recursive_error(IrAnalyze *ira, AstNode *source_node, ConstCa
ZigList *missing_errors = &cast_result->data.error_set_mismatch->missing_errors;
for (size_t i = 0; i < missing_errors->length; i += 1) {
ErrorTableEntry *error_entry = missing_errors->at(i);
- add_error_note(ira->codegen, parent_msg, error_entry->decl_node,
+ add_error_note(ira->codegen, parent_msg, ast_field_to_symbol_node(error_entry->decl_node),
buf_sprintf("'error.%s' not a member of destination error set", buf_ptr(&error_entry->name)));
}
break;
diff --git a/src/parser.cpp b/src/parser.cpp
index 2aab416f20c82c0d3dfac0f4a161f9cad8630e66..9fcf233e2d4c4ef3d75e71bb9801702f5e765d71 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -498,8 +498,12 @@ static AstNode *ast_parse_root(ParseContext *pc) {
}
static Token *ast_parse_doc_comments(ParseContext *pc, Buf *buf) {
+ Token *first_doc_token = nullptr;
Token *doc_token = nullptr;
while ((doc_token = eat_token_if(pc, TokenIdDocComment))) {
+ if (first_doc_token == nullptr) {
+ first_doc_token = doc_token;
+ }
if (buf->list.length == 0) {
buf_resize(buf, 0);
}
@@ -507,7 +511,7 @@ static Token *ast_parse_doc_comments(ParseContext *pc, Buf *buf) {
buf_append_mem(buf, buf_ptr(pc->buf) + doc_token->start_pos + 3,
doc_token->end_pos - doc_token->start_pos - 3);
}
- return doc_token;
+ return first_doc_token;
}
// ContainerMembers