zig

commit d635dcacbf2d8ab8af97e75fda69b66e7b1ea1cf (tree)
parent 8c27e7ed916dfdc7d2727ac28c5119a27c45818e
Author: Loris Cro <kappaloris@gmail.com>
Date:   Tue, 23 Aug 2022 15:46:26 +0200

Merge pull request #12542 from der-teufel-programming/compileError-input

autodoc: show compileErrors correctly
Diffstat:
M
lib/docs/main.js
 | 
2
+-
M
src/Autodoc.zig
 | 
12
+++++-------

2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/lib/docs/main.js b/lib/docs/main.js
@@ -866,7 +866,7 @@ var zigAnalysis;
       }
       case "compileError": {
         let compileError = expr.compileError;
-        return compileError;
+        return "@compileError(" + exprName(zigAnalysis.exprs[compileError], opts) + ")";
       }
       case "enumLiteral": {
         let literal = expr.enumLiteral;
diff --git a/src/Autodoc.zig b/src/Autodoc.zig
@@ -632,7 +632,7 @@ const DocData = struct {
         sizeOf: usize, // index in `exprs`
         bitSizeOf: usize, // index in `exprs`
         enumToInt: usize, // index in `exprs`
-        compileError: []const u8,
+        compileError: usize, //index in `exprs`
         errorSets: usize,
         string: []const u8, // direct value
         sliceIndex: usize,
@@ -1027,13 +1027,11 @@ fn walkInstruction(
                 false,
             );
 
+            const operand_index = self.exprs.items.len;
+            try self.exprs.append(self.arena, operand.expr);
+
             return DocData.WalkResult{
-                .expr = .{
-                    .compileError = switch (operand.expr) {
-                        .string => |s| s,
-                        else => "TODO: non-string @compileError arguments",
-                    },
-                },
+                .expr = .{ .compileError = operand_index },
             };
         },
         .enum_literal => {