Commit c8f60b2e2f15713754ac4b0911a7d13b6057264d | zig

author	Noam Preil <noam@pixelhero.dev> 2020-06-26 04:36:17-04:00
committer	Noam Preil <noam@pixelhero.dev> 2020-06-26 04:36:17-04:00
log	c8f60b2e2f15713754ac4b0911a7d13b6057264d
tree	ebd186d28320ceae0997cdb8b63e8af07bdc2b02
parent	6510888039baaa0058a7e2bade2750569af1abbd
signature	Commit is signed but in an unrecognized format.

Stage2: handle missing function names

2 files changed, 20 insertions(+), 5 deletions(-)

src-self-hosted
- Module.zig
test
- stage2
  - compile_errors.zig

src-self-hosted/Module.zig+11-2

 @@ -1722,8 +1722,16 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
     for (decls) |src_decl, decl_i| {
         if (src_decl.cast(ast.Node.FnProto)) |fn_proto| {
             // We will create a Decl for it regardless of analysis status.
-            const name_tok = fn_proto.name_token orelse
+            const name_tok = fn_proto.name_token orelse {
-                @panic("TODO handle missing function name in the parser");
+                const err_msg = try ErrorMsg.create(self.allocator, tree.token_locs[fn_proto.firstToken()].end, "missing function name", .{});
+                // TODO: cache a single invalid decl in the Module?
+                const new_decl = try self.createNewDecl(&root_scope.base, "", decl_i, [1]u8{0} ** 16, [1]u8{0} ** 16);
+                root_scope.decls.appendAssumeCapacity(new_decl);
+                errdefer err_msg.destroy(self.allocator);
+                try self.failed_decls.putNoClobber(new_decl, err_msg);
+                continue;
+            };
             const name_loc = tree.token_locs[name_tok];
             const name = tree.tokenSliceLoc(name_loc);
             const name_hash = root_scope.fullyQualifiedNameHash(name);
 @@ -1734,6 +1742,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
                 // have been re-ordered.
                 decl.src_index = decl_i;
                 if (deleted_decls.remove(decl) == null) {
+                    decl.analysis = .sema_failure;
                     const err_msg = try ErrorMsg.create(self.allocator, tree.token_locs[name_tok].start, "redefinition of '{}'", .{decl.name});
                     errdefer err_msg.destroy(self.allocator);
                     try self.failed_decls.putNoClobber(decl, err_msg);

test/stage2/compile_errors.zig+9-3

 @@ -86,12 +86,18 @@ pub fn addCases(ctx: *TestContext) !void {
             \\export fn entry() void {}
         );
     }
+    {
+        var case = ctx.obj("missing function name", linux_x64);
+        case.addError(
+            \\fn() void {}
+        , &[_][]const u8{":1:3: error: missing function name"});
+        case.compiles(
+            \\fn a() void {}
+        );
+    }
     // TODO: re-enable these tests.
     // https://github.com/ziglang/zig/issues/1364
-    //    ctx.addError("Missing function name", linux_x64, .Zig,
-    //        \\fn() void {}
-    //    , &[_][]const u8{":1:3: error: missing function name"});
     //ctx.testCompileError(
     //    \\comptime {
     //    \\    return;