pull request fixups

 * clean up parser code
 * fix stage2 parse and render code
 * remove redundant test
 * make stage1 compile tests leaner

1 files changed, 21 insertions, 30 deletions

diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index f4b289f70d..948d212e58 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -2,6 +2,27 @@ const tests = @import("tests.zig");
 
 pub fn addCases(cases: *tests.CompileErrorContext) void {
     cases.add(
+        "@handle() called outside of function definition",
+        \\var handle_undef: promise = undefined;
+        \\var handle_dummy: promise = @handle();
+        \\export fn entry() bool {
+        \\    return handle_undef == handle_dummy;
+        \\}
+    ,
+        ".tmp_source.zig:2:29: error: @handle() called outside of function definition",
+    );
+
+    cases.add(
+        "@handle() in non-async function",
+        \\export fn entry() bool {
+        \\    var handle_undef: promise = undefined;
+        \\    return handle_undef == @handle();
+        \\}
+    ,
+        ".tmp_source.zig:3:28: error: @handle() in non-async function",
+    );
+
+    cases.add(
         "while loop body expression ignored",
         \\fn returns() usize {
         \\    return 2;
@@ -4738,34 +4759,4 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
     ,
         ".tmp_source.zig:3:36: error: @ArgType could not resolve the type of arg 0 because 'fn(var)var' is generic",
     );
-
-    cases.add(
-        "@handle() called outside of function definition",
-        \\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
-        \\    @import("std").os.exit(126);
-        \\}
-        \\
-        \\var handle_undef: promise = undefined;
-        \\var handle_dummy: promise = @handle();
-        \\
-        \\pub fn main() void {
-        \\    if (handle_undef == handle_dummy) return 0;
-        \\}
-    ,
-        ".tmp_source.zig:6:29: error: @handle() called outside of function definition",
-    );
-
-    cases.add(
-        "@handle() in non-async function",
-        \\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
-        \\    @import("std").os.exit(126);
-        \\}
-        \\
-        \\pub fn main() void {
-        \\    var handle_undef: promise = undefined;
-        \\    if (handle_undef == @handle()) return 0;
-        \\}
-    ,
-        ".tmp_source.zig:7:25: error: @handle() in non-async function",
-    );
 }