authorgravatar for 35231115+Rocknest@users.noreply.github.comRocknest <35231115+Rocknest@users.noreply.github.com> 2019-10-11 04:09:01+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2019-10-11 04:09:01+03:00
logb0cd64c019a77366abb69cf1645d84f416543df3
tree754b01b69926c3146ca82c1be1c68b7ca26c4aef
parent2bb2a2fcea5d4c22e7dfed529b318b9ba88e2ac9
parent6082c147533cbefe9f27d8f32b6485c8c43a738f
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge branch 'master' into docs-local

4 files changed, 34 insertions(+), 6 deletions(-)

lib/std/os.zig+5
...@@ -537,7 +537,12 @@ pub const OpenError = error{...@@ -537,7 +537,12 @@ pub const OpenError = error{
537 SystemFdQuotaExceeded,537 SystemFdQuotaExceeded,
538 NoDevice,538 NoDevice,
539 FileNotFound,539 FileNotFound,
540
541 /// Insufficient kernel memory was available, or
542 /// the named file is a FIFO and per-user hard limit on
543 /// memory allocation for pipes has been reached.
540 SystemResources,544 SystemResources,
545
541 NoSpaceLeft,546 NoSpaceLeft,
542 NotDir,547 NotDir,
543 PathAlreadyExists,548 PathAlreadyExists,
lib/std/special/docs/main.js+22-5
...@@ -27,6 +27,7 @@...@@ -27,6 +27,7 @@
27 var domFnErrorsAnyError = document.getElementById("fnErrorsAnyError");27 var domFnErrorsAnyError = document.getElementById("fnErrorsAnyError");
28 var domFnExamples = document.getElementById("fnExamples");28 var domFnExamples = document.getElementById("fnExamples");
29 var domFnNoExamples = document.getElementById("fnNoExamples");29 var domFnNoExamples = document.getElementById("fnNoExamples");
30 var domDeclNoRef = document.getElementById("declNoRef");
30 var domSearch = document.getElementById("search");31 var domSearch = document.getElementById("search");
31 var domSectSearchResults = document.getElementById("sectSearchResults");32 var domSectSearchResults = document.getElementById("sectSearchResults");
32 var domListSearchResults = document.getElementById("listSearchResults");33 var domListSearchResults = document.getElementById("listSearchResults");
...@@ -112,6 +113,7 @@...@@ -112,6 +113,7 @@
112 domSectFnErrors.classList.add("hidden");113 domSectFnErrors.classList.add("hidden");
113 domFnExamples.classList.add("hidden");114 domFnExamples.classList.add("hidden");
114 domFnNoExamples.classList.add("hidden");115 domFnNoExamples.classList.add("hidden");
116 domDeclNoRef.classList.add("hidden");
115 domFnErrorsAnyError.classList.add("hidden");117 domFnErrorsAnyError.classList.add("hidden");
116 domTableFnErrors.classList.add("hidden");118 domTableFnErrors.classList.add("hidden");
117 domSectGlobalVars.classList.add("hidden");119 domSectGlobalVars.classList.add("hidden");
...@@ -160,7 +162,12 @@...@@ -160,7 +162,12 @@
160 renderNav();162 renderNav();
161163
162 var lastDecl = curNav.declObjs[curNav.declObjs.length - 1];164 var lastDecl = curNav.declObjs[curNav.declObjs.length - 1];
163 if (lastDecl.kind === 'var') {165 if (lastDecl.pubDecls != null) {
166 renderContainer(lastDecl);
167 }
168 if (lastDecl.kind == null) {
169 return renderUnknownDecl(lastDecl);
170 } else if (lastDecl.kind === 'var') {
164 return renderVar(lastDecl);171 return renderVar(lastDecl);
165 } else if (lastDecl.kind === 'const' && lastDecl.type != null) {172 } else if (lastDecl.kind === 'const' && lastDecl.type != null) {
166 var typeObj = zigAnalysis.types[lastDecl.type];173 var typeObj = zigAnalysis.types[lastDecl.type];
...@@ -169,13 +176,21 @@...@@ -169,13 +176,21 @@
169 } else {176 } else {
170 return renderValue(lastDecl);177 return renderValue(lastDecl);
171 }178 }
172 }179 } else {
173 if (lastDecl.kind != null) {
174 renderType(lastDecl);180 renderType(lastDecl);
175 }181 }
176 if (lastDecl.pubDecls != null) {182 }
177 renderContainer(lastDecl);183
184 function renderUnknownDecl(decl) {
185 domDeclNoRef.classList.remove("hidden");
186
187 var docs = zigAnalysis.astNodes[decl.src].docs;
188 if (docs != null) {
189 domFnDocs.innerHTML = markdown(docs);
190 } else {
191 domFnDocs.innerHTML = '<p>There are no doc comments for this declaration.</p>';
178 }192 }
193 domFnDocs.classList.remove("hidden");
179 }194 }
180195
181 function typeIsErrSet(typeIndex) {196 function typeIsErrSet(typeIndex) {
...@@ -423,6 +438,8 @@...@@ -423,6 +438,8 @@
423 name += "]";438 name += "]";
424 name += typeIndexName(typeObj.elem, wantHtml, wantSubLink, null);439 name += typeIndexName(typeObj.elem, wantHtml, wantSubLink, null);
425 return name;440 return name;
441 case typeKinds.Optional:
442 return "?" + typeIndexName(typeObj.child, wantHtml, wantSubLink, fnDecl, linkFnNameDecl);
426 case typeKinds.Pointer:443 case typeKinds.Pointer:
427 var name = "";444 var name = "";
428 switch (typeObj.len) {445 switch (typeObj.len) {
src/analyze.cpp+2-1
...@@ -8304,7 +8304,8 @@ static void resolve_llvm_types_integer(CodeGen *g, ZigType *type) {...@@ -8304,7 +8304,8 @@ static void resolve_llvm_types_integer(CodeGen *g, ZigType *type) {
8304 }8304 }
8305 }8305 }
83068306
8307 type->llvm_di_type = ZigLLVMCreateDebugBasicType(g->dbuilder, buf_ptr(&type->name), type->size_in_bits, dwarf_tag);8307 type->llvm_di_type = ZigLLVMCreateDebugBasicType(g->dbuilder, buf_ptr(&type->name),
8308 type->abi_size * 8, dwarf_tag);
8308 type->llvm_type = LLVMIntType(type->size_in_bits);8309 type->llvm_type = LLVMIntType(type->size_in_bits);
8309}8310}
83108311
src/dump_analysis.cpp+5
...@@ -991,6 +991,11 @@ static void anal_dump_type(AnalDumpCtx *ctx, ZigType *ty) {...@@ -991,6 +991,11 @@ static void anal_dump_type(AnalDumpCtx *ctx, ZigType *ty) {
991 }991 }
992 break;992 break;
993 }993 }
994 case ZigTypeIdOptional: {
995 jw_object_field(jw, "child");
996 anal_dump_type_ref(ctx, ty->data.maybe.child_type);
997 break;
998 }
994 case ZigTypeIdPointer: {999 case ZigTypeIdPointer: {
995 switch (ty->data.pointer.ptr_len) {1000 switch (ty->data.pointer.ptr_len) {
996 case PtrLenSingle:1001 case PtrLenSingle: