docgen: more fixes

resources/docs.html

@@ -302,36 +302,16 @@
 			font-weight: bold;
 		}
 
-		.kind-function {
-			background: var(--hl-func);
-			color: var(--hl-text);
-		}
-
+		.kind-function,
 		.kind-macro {
 			background: var(--hl-func);
 			color: var(--hl-text);
 		}
 
-		.kind-struct {
-			background: var(--hl-type);
-			color: var(--hl-text);
-		}
-
-		.kind-union {
-			background: var(--hl-type);
-			color: var(--hl-text);
-		}
-
-		.kind-bitstruct {
-			background: var(--hl-type);
-			color: var(--hl-text);
-		}
-
-		.kind-enum {
-			background: var(--hl-type);
-			color: var(--hl-text);
-		}
-
+		.kind-struct,
+		.kind-union,
+		.kind-bitstruct,
+		.kind-enum,
 		.kind-interface {
 			background: var(--hl-type);
 			color: var(--hl-text);
@@ -366,10 +346,7 @@
 		}
 
 		.c3-function,
-		.c3-method {
-			color: var(--hl-func);
-		}
-
+		.c3-method,
 		.c3-macro,
 		.c3-macro_method {
 			color: var(--hl-func);
@@ -381,26 +358,20 @@
 
 		.c3-variable,
 		.c3-const,
-		.c3-constdef {
+		.c3-constdef,
+		.c3-number {
 			color: var(--hl-const);
 		}
 
 		.c3-string {
 			color: var(--hl-str);
 		}
 
-		.c3-attribute {
-			color: var(--hl-comment);
-		}
-
+		.c3-attribute,
 		.c3-comment {
 			color: var(--hl-comment);
 		}
 
-		.c3-number {
-			color: var(--hl-const);
-		}
-
 		.secondary-text {
 			color: var(--filter-fg);
 			font-size: 0.8em;
@@ -959,7 +930,7 @@
 		.contract-table td {
 			padding: 4px 8px;
 			border-bottom: 1px solid var(--table-border);
-			vertical-align: top;
+			vertical-align: middle;
 			word-break: break-word;
 		}
 
@@ -1184,7 +1155,7 @@
 			border: 1px solid var(--border);
 			color: var(--filter-fg);
 			font-weight: 600;
-			transition: all 0.2s;
+			transition: border-color 0.2s, color 0.2s, background-color 0.2s;
 			user-select: none;
 		}
 
@@ -1490,7 +1461,28 @@
 			});
 		}
 
+		function preprocessDecl(decl) {
+			if (!decl) return;
+			const fixMembers = (members) => {
+				if (!members) return;
+				members.forEach(m => {
+					if (m.is_vararg && m.type && m.type.name && m.type.name.endsWith('[]')) {
+						m.type.name = m.type.name.slice(0, -2) + '...';
+					}
+					if (m.members) fixMembers(m.members);
+					if (m.params) fixMembers(m.params);
+				});
+			};
+			fixMembers(decl.members);
+			if (decl.variants) {
+				decl.variants.forEach(v => {
+					if (v.decl) preprocessDecl(v.decl);
+				});
+			}
+		}
+
 		function addOrMergeDeclaration(decl) {
+			preprocessDecl(decl);
 			const cleanDecl = { ...decl };
 			delete cleanDecl.targetName;
 			const declJson = JSON.stringify(cleanDecl);
@@ -1834,23 +1826,33 @@ <h1 class="overview-title">Project Overview</h1>
 		}
 
 		function parseMarkdownInline(text) {
-			// First escape to be safe
-			let escaped = escapeHtml(text);
+			// 1. Extract raw inline code blocks first to prevent them from being escaped or formatted by other markdown rules
+			const codes = [];
+			let processed = text.replace(/`([^`]+)`/g, (m, p1) => {
+				const placeholder = `\x00CODE_${codes.length}\x00`;
+				codes.push(`<code class="inline-code">${highlightC3(p1)}</code>`);
+				return placeholder;
+			});
 
-			// 1. Inline code `code` (using highlightC3 for types/links)
-			escaped = escaped.replace(/`([^`]+)`/g, (m, p1) => `<code class="inline-code">${highlightC3(p1)}</code>`);
+			// 2. Escape HTML for the rest of the text
+			let escaped = escapeHtml(processed);
 
-			// 2. Bold **text** or __text__
+			// 3. Bold **text** or __text__
 			escaped = escaped.replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>');
 			escaped = escaped.replace(/__([^_]+)__/g, '<strong>$1</strong>');
 
-			// 3. Italic *text* or _text_
+			// 4. Italic *text* or _text_
 			escaped = escaped.replace(/\*([^*]+)\*/g, '<em>$1</em>');
 			escaped = escaped.replace(/_([^_]+)_/g, '<em>$1</em>');
 
-			// 4. Links [text](url)
+			// 5. Links [text](url)
 			escaped = escaped.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" class="type-link">$1</a>');
 
+			// 6. Restore the preserved inline code blocks
+			for (let i = 0; i < codes.length; i++) {
+				escaped = escaped.replace(`\x00CODE_${i}\x00`, codes[i]);
+			}
+
 			return escaped;
 		}
 
@@ -2189,6 +2191,10 @@ <h1 class="overview-title">Project Overview</h1>
 					return `<span class="c3-keyword">@body</span>(${bodyParams})`;
 				}
 				if (m.name === 'self') {
+					if (m.type) {
+						const selfType = renderTypeName(m.type);
+						return `${selfType} <span class="c3-variable">${m.is_ref ? '&' : ''}self</span>`;
+					}
 					return `<span class="c3-variable">${m.is_ref ? '&' : ''}self</span>`;
 				}
 				const type = renderTypeName(m.type);
@@ -2382,14 +2388,18 @@ <h1 class="overview-title">Project Overview</h1>
 			}
 
 			const anyDesc = hasAnyDescription(vd.members);
-			const isFunction = vd.kind === 'function' || vd.kind === 'macro' || (vd.kind === 'type_alias' && vd.return_type);
+			const isFunction = vd.kind === 'function' || vd.kind === 'macro' || vd.kind === 'method' || vd.kind === 'macro_method' || (vd.kind === 'type_alias' && vd.return_type);
+			const hasAnyContract = isFunction && baseDocs && baseDocs.params && vd.members.some(m => {
+				const dp = baseDocs.params.find(p => p.name === m.name);
+				return dp && (dp.modifier || dp.by_ref);
+			});
 			let html = '';
 
 			function renderRow(m, isFunc, isValueRow, depth = 0) {
 				let rowHtml = '';
 				const docParam = (baseDocs && baseDocs.params && m.name) ? baseDocs.params.find(p => p.name === m.name) : null;
 				let modHtml = '';
-				if (isFunc) {
+				if (isFunc && hasAnyContract) {
 					if (docParam) {
 						if (docParam.modifier) modHtml += `<span class="arg-mod-badge arg-mod-${docParam.modifier}">${docParam.modifier}</span>`;
 						if (docParam.by_ref) modHtml += `<span class="arg-mod-badge arg-mod-ref">ref</span>`;
@@ -2447,7 +2457,7 @@ <h1 class="overview-title">Project Overview</h1>
 						}
 					}
 					rowHtml += `<tr>
-						${isFunc ? `<td class="col-mod">${modHtml}</td>` : ''}
+						${isFunc && hasAnyContract ? `<td class="col-mod">${modHtml}</td>` : ''}
 						<td class="col-type monospace">${prefix}${typeStr}${bitDesc}</td>
 						<td class="col-name monospace bold c3-${vd.kind === 'interface' ? 'function' : (m.kind || 'variable')}">${nameStr}</td>
 						${vd.kind === 'interface' ? `<td class="col-mod monospace">${attrHtml}</td>` : ''}
@@ -2515,7 +2525,7 @@ <h1 class="overview-title">Project Overview</h1>
 				html += `<h3>${title}</h3>`;
 				html += `<table class="contract-table">
 					<thead><tr>
-						${isFunction ? '<th class="col-mod">Contract</th>' : ''}
+						${hasAnyContract ? '<th class="col-mod">Contract</th>' : ''}
 						<th class="col-type">Type</th>
 						<th class="col-name">Name</th>
 						${vd.kind === 'interface' ? '<th class="col-mod">Attribute</th>' : ''}

src/build/build_options.c

@@ -321,7 +321,7 @@ static void docgen_usage()
 	print_opt("--json", "Output JSON to stdout.");
 	print_opt("--append", "Append to existing 'docs.html'.");
 	print_opt("--target <target>", "Generate documentation for a specific target.");
-	print_opt("--use-stdlib=<yes|no>", "Include the standard library (default: yes).");
+	print_opt("--emit-stdlib=<yes|no>", "Document the standard library. (default: yes)");
 	PRINTF("");
 	PRINTF("Other normal build options apply.");
 	PRINTF("");

src/compiler/compiler.c

@@ -1932,3 +1932,13 @@ void print_build_env(void)
 	printf("env::WIN32        : %s\n", compiler.platform.os == OS_TYPE_WIN32 ? "true" : "false");
 	printf("env::LIBC         : %s\n", link_libc() ? "true" : "false");
 }
+
+bool module_is_stdlib(Module *module)
+{
+	if (module->name->len < 3) return false;
+	if (module->name->len == 3 && strcmp(module->name->module, "std") == 0) return true;
+	if (module->name->len > 5 && memcmp(module->name->module, "std::", 5) == 0) return true;
+	if (module->name->len == 4 && strcmp(module->name->module, "libc") == 0) return true;
+	if (module->name->len > 6 && memcmp(module->name->module, "libc::", 6) == 0) return true;
+	return false;
+}

src/compiler/compiler_internal.h

@@ -2537,6 +2537,7 @@ void scratch_buffer_append_module(Module *module, bool is_export);
 Decl *module_find_symbol(Module *module, const char *symbol);
 const char *module_create_object_file_name(Module *module);
 Decl *module_find_symbol_in_unit(Module *module, CompilationUnit *unit, const char *symbol);
+bool module_is_stdlib(Module *module);
 
 bool parse_file(File *file);
 Decl **parse_include_file(File *file, CompilationUnit *unit);