authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-09 18:36:01-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-03-09 18:36:01-04:00
log638d5c3aca7ce1e4fd10060079caa0acb66144c0
tree7001b05a51eea62061ad9dfcba8b99d904ea1be5
parent52c01840ce36f6ed6528fc62c6f3c1426bdce914
parent3fd2cd43678d52ca2f737d991edaddfd8b73c2a4
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4700 from Vexu/noasync

Implement new noasync syntax

12 files changed, 224 insertions(+), 46 deletions(-)

lib/std/zig/ast.zig+25-3
......@@ -431,6 +431,7 @@ pub const Node = struct {
431431 ContainerDecl,
432432 Asm,
433433 Comptime,
434 Noasync,
434435 Block,
435436
436437 // Misc
......@@ -1078,6 +1079,29 @@ pub const Node = struct {
10781079 }
10791080 };
10801081
1082 pub const Noasync = struct {
1083 base: Node = Node{ .id = .Noasync },
1084 noasync_token: TokenIndex,
1085 expr: *Node,
1086
1087 pub fn iterate(self: *Noasync, index: usize) ?*Node {
1088 var i = index;
1089
1090 if (i < 1) return self.expr;
1091 i -= 1;
1092
1093 return null;
1094 }
1095
1096 pub fn firstToken(self: *const Noasync) TokenIndex {
1097 return self.noasync_token;
1098 }
1099
1100 pub fn lastToken(self: *const Noasync) TokenIndex {
1101 return self.expr.lastToken();
1102 }
1103 };
1104
10811105 pub const Payload = struct {
10821106 base: Node = Node{ .id = .Payload },
10831107 lpipe: TokenIndex,
......@@ -1560,9 +1584,7 @@ pub const Node = struct {
15601584 pub const Op = union(enum) {
15611585 AddressOf,
15621586 ArrayType: ArrayInfo,
1563 Await: struct {
1564 noasync_token: ?TokenIndex = null,
1565 },
1587 Await,
15661588 BitNot,
15671589 BoolNot,
15681590 Cancel,
lib/std/zig/parse.zig+49-25
......@@ -462,6 +462,7 @@ fn parseContainerField(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*No
462462/// Statement
463463/// <- KEYWORD_comptime? VarDecl
464464/// / KEYWORD_comptime BlockExprStatement
465/// / KEYWORD_noasync BlockExprStatement
465466/// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)
466467/// / KEYWORD_defer BlockExprStatement
467468/// / KEYWORD_errdefer BlockExprStatement
......@@ -493,6 +494,19 @@ fn parseStatement(arena: *Allocator, it: *TokenIterator, tree: *Tree) Error!?*No
493494 return &node.base;
494495 }
495496
497 if (eatToken(it, .Keyword_noasync)) |noasync_token| {
498 const block_expr = try expectNode(arena, it, tree, parseBlockExprStatement, .{
499 .ExpectedBlockOrAssignment = .{ .token = it.index },
500 });
501
502 const node = try arena.create(Node.Noasync);
503 node.* = .{
504 .noasync_token = noasync_token,
505 .expr = block_expr,
506 };
507 return &node.base;
508 }
509
496510 if (eatToken(it, .Keyword_suspend)) |suspend_token| {
497511 const semicolon = eatToken(it, .Semicolon);
498512
......@@ -856,6 +870,7 @@ fn parsePrefixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
856870/// / IfExpr
857871/// / KEYWORD_break BreakLabel? Expr?
858872/// / KEYWORD_comptime Expr
873/// / KEYWORD_noasync Expr
859874/// / KEYWORD_continue BreakLabel?
860875/// / KEYWORD_resume Expr
861876/// / KEYWORD_return Expr?
......@@ -870,7 +885,7 @@ fn parsePrimaryExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
870885 const label = try parseBreakLabel(arena, it, tree);
871886 const expr_node = try parseExpr(arena, it, tree);
872887 const node = try arena.create(Node.ControlFlowExpression);
873 node.* = Node.ControlFlowExpression{
888 node.* = .{
874889 .ltoken = token,
875890 .kind = Node.ControlFlowExpression.Kind{ .Break = label },
876891 .rhs = expr_node,
......@@ -883,7 +898,7 @@ fn parsePrimaryExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
883898 .ExpectedExpr = AstError.ExpectedExpr{ .token = it.index },
884899 });
885900 const node = try arena.create(Node.Comptime);
886 node.* = Node.Comptime{
901 node.* = .{
887902 .doc_comments = null,
888903 .comptime_token = token,
889904 .expr = expr_node,
......@@ -891,10 +906,22 @@ fn parsePrimaryExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
891906 return &node.base;
892907 }
893908
909 if (eatToken(it, .Keyword_noasync)) |token| {
910 const expr_node = try expectNode(arena, it, tree, parseExpr, AstError{
911 .ExpectedExpr = AstError.ExpectedExpr{ .token = it.index },
912 });
913 const node = try arena.create(Node.Noasync);
914 node.* = .{
915 .noasync_token = token,
916 .expr = expr_node,
917 };
918 return &node.base;
919 }
920
894921 if (eatToken(it, .Keyword_continue)) |token| {
895922 const label = try parseBreakLabel(arena, it, tree);
896923 const node = try arena.create(Node.ControlFlowExpression);
897 node.* = Node.ControlFlowExpression{
924 node.* = .{
898925 .ltoken = token,
899926 .kind = Node.ControlFlowExpression.Kind{ .Continue = label },
900927 .rhs = null,
......@@ -907,7 +934,7 @@ fn parsePrimaryExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
907934 .ExpectedExpr = AstError.ExpectedExpr{ .token = it.index },
908935 });
909936 const node = try arena.create(Node.PrefixOp);
910 node.* = Node.PrefixOp{
937 node.* = .{
911938 .op_token = token,
912939 .op = Node.PrefixOp.Op.Resume,
913940 .rhs = expr_node,
......@@ -918,7 +945,7 @@ fn parsePrimaryExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
918945 if (eatToken(it, .Keyword_return)) |token| {
919946 const expr_node = try parseExpr(arena, it, tree);
920947 const node = try arena.create(Node.ControlFlowExpression);
921 node.* = Node.ControlFlowExpression{
948 node.* = .{
922949 .ltoken = token,
923950 .kind = Node.ControlFlowExpression.Kind.Return,
924951 .rhs = expr_node,
......@@ -1126,19 +1153,18 @@ fn parseErrorUnionExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*No
11261153
11271154/// SuffixExpr
11281155/// <- KEYWORD_async PrimaryTypeExpr SuffixOp* FnCallArguments
1129/// / KEYWORD_noasync PrimaryTypeExpr SuffixOp* FnCallArguments
11301156/// / PrimaryTypeExpr (SuffixOp / FnCallArguments)*
11311157fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
1132 const maybe_async = eatAnnotatedToken(it, .Keyword_async) orelse eatAnnotatedToken(it, .Keyword_noasync);
1158 const maybe_async = eatToken(it, .Keyword_async);
11331159 if (maybe_async) |async_token| {
11341160 const token_fn = eatToken(it, .Keyword_fn);
1135 if (async_token.ptr.id == .Keyword_async and token_fn != null) {
1161 if (token_fn != null) {
11361162 // HACK: If we see the keyword `fn`, then we assume that
11371163 // we are parsing an async fn proto, and not a call.
11381164 // We therefore put back all tokens consumed by the async
11391165 // prefix...
11401166 putBackToken(it, token_fn.?);
1141 putBackToken(it, async_token.index);
1167 putBackToken(it, async_token);
11421168 return parsePrimaryTypeExpr(arena, it, tree);
11431169 }
11441170 // TODO: Implement hack for parsing `async fn ...` in ast_parse_suffix_expr
......@@ -1167,7 +1193,7 @@ fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
11671193 .op = Node.SuffixOp.Op{
11681194 .Call = Node.SuffixOp.Op.Call{
11691195 .params = params.list,
1170 .async_token = async_token.index,
1196 .async_token = async_token,
11711197 },
11721198 },
11731199 .rtoken = params.rparen,
......@@ -1224,6 +1250,7 @@ fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
12241250/// / IfTypeExpr
12251251/// / INTEGER
12261252/// / KEYWORD_comptime TypeExpr
1253/// / KEYWORD_noasync TypeExpr
12271254/// / KEYWORD_error DOT IDENTIFIER
12281255/// / KEYWORD_false
12291256/// / KEYWORD_null
......@@ -1255,13 +1282,22 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N
12551282 if (eatToken(it, .Keyword_comptime)) |token| {
12561283 const expr = (try parseTypeExpr(arena, it, tree)) orelse return null;
12571284 const node = try arena.create(Node.Comptime);
1258 node.* = Node.Comptime{
1285 node.* = .{
12591286 .doc_comments = null,
12601287 .comptime_token = token,
12611288 .expr = expr,
12621289 };
12631290 return &node.base;
12641291 }
1292 if (eatToken(it, .Keyword_noasync)) |token| {
1293 const expr = (try parseTypeExpr(arena, it, tree)) orelse return null;
1294 const node = try arena.create(Node.Noasync);
1295 node.* = .{
1296 .noasync_token = token,
1297 .expr = expr,
1298 };
1299 return &node.base;
1300 }
12651301 if (eatToken(it, .Keyword_error)) |token| {
12661302 const period = try expectToken(it, tree, .Period);
12671303 const identifier = try expectNode(arena, it, tree, parseIdentifier, AstError{
......@@ -1269,7 +1305,7 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N
12691305 });
12701306 const global_error_set = try createLiteral(arena, Node.ErrorType, token);
12711307 const node = try arena.create(Node.InfixOp);
1272 node.* = Node.InfixOp{
1308 node.* = .{
12731309 .op_token = period,
12741310 .lhs = global_error_set,
12751311 .op = Node.InfixOp.Op.Period,
......@@ -1281,7 +1317,7 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N
12811317 if (eatToken(it, .Keyword_null)) |token| return createLiteral(arena, Node.NullLiteral, token);
12821318 if (eatToken(it, .Keyword_anyframe)) |token| {
12831319 const node = try arena.create(Node.AnyFrameType);
1284 node.* = Node.AnyFrameType{
1320 node.* = .{
12851321 .anyframe_token = token,
12861322 .result = null,
12871323 };
......@@ -2180,18 +2216,6 @@ fn parsePrefixOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
21802216 .Ampersand => ops{ .AddressOf = {} },
21812217 .Keyword_try => ops{ .Try = {} },
21822218 .Keyword_await => ops{ .Await = .{} },
2183 .Keyword_noasync => if (eatToken(it, .Keyword_await)) |await_tok| {
2184 const node = try arena.create(Node.PrefixOp);
2185 node.* = Node.PrefixOp{
2186 .op_token = await_tok,
2187 .op = .{ .Await = .{ .noasync_token = token.index } },
2188 .rhs = undefined, // set by caller
2189 };
2190 return &node.base;
2191 } else {
2192 putBackToken(it, token.index);
2193 return null;
2194 },
21952219 else => {
21962220 putBackToken(it, token.index);
21972221 return null;
lib/std/zig/render.zig+6-3
......@@ -390,6 +390,12 @@ fn renderExpression(
390390 try renderToken(tree, stream, comptime_node.comptime_token, indent, start_col, Space.Space);
391391 return renderExpression(allocator, stream, tree, indent, start_col, comptime_node.expr, space);
392392 },
393 .Noasync => {
394 const noasync_node = @fieldParentPtr(ast.Node.Noasync, "base", base);
395
396 try renderToken(tree, stream, noasync_node.noasync_token, indent, start_col, Space.Space);
397 return renderExpression(allocator, stream, tree, indent, start_col, noasync_node.expr, space);
398 },
393399
394400 .Suspend => {
395401 const suspend_node = @fieldParentPtr(ast.Node.Suspend, "base", base);
......@@ -590,9 +596,6 @@ fn renderExpression(
590596 },
591597
592598 .Await => |await_info| {
593 if (await_info.noasync_token) |tok| {
594 try renderToken(tree, stream, tok, indent, start_col, Space.Space);
595 }
596599 try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);
597600 },
598601 }
src/all_types.hpp+12-1
......@@ -651,6 +651,7 @@ enum NodeType {
651651 NodeTypeSwitchProng,
652652 NodeTypeSwitchRange,
653653 NodeTypeCompTime,
654 NodeTypeNoAsync,
654655 NodeTypeBreak,
655656 NodeTypeContinue,
656657 NodeTypeAsmExpr,
......@@ -991,6 +992,10 @@ struct AstNodeCompTime {
991992 AstNode *expr;
992993};
993994
995struct AstNodeNoAsync {
996 AstNode *expr;
997};
998
994999struct AsmOutput {
9951000 Buf *asm_symbolic_name;
9961001 Buf *constraint;
......@@ -1148,7 +1153,6 @@ struct AstNodeErrorType {
11481153};
11491154
11501155struct AstNodeAwaitExpr {
1151 Token *noasync_token;
11521156 AstNode *expr;
11531157};
11541158
......@@ -1199,6 +1203,7 @@ struct AstNode {
11991203 AstNodeSwitchProng switch_prong;
12001204 AstNodeSwitchRange switch_range;
12011205 AstNodeCompTime comptime_expr;
1206 AstNodeNoAsync noasync_expr;
12021207 AstNodeAsmExpr asm_expr;
12031208 AstNodeFieldAccessExpr field_access_expr;
12041209 AstNodePtrDerefExpr ptr_deref_expr;
......@@ -2325,6 +2330,7 @@ enum ScopeId {
23252330 ScopeIdRuntime,
23262331 ScopeIdTypeOf,
23272332 ScopeIdExpr,
2333 ScopeIdNoAsync,
23282334};
23292335
23302336struct Scope {
......@@ -2457,6 +2463,11 @@ struct ScopeCompTime {
24572463 Scope base;
24582464};
24592465
2466// This scope is created for a noasync expression.
2467// NodeTypeNoAsync
2468struct ScopeNoAsync {
2469 Scope base;
2470};
24602471
24612472// This scope is created for a function definition.
24622473// NodeTypeFnDef
src/analyze.cpp+9
......@@ -106,6 +106,7 @@ static ScopeExpr *find_expr_scope(Scope *scope) {
106106 case ScopeIdDecls:
107107 case ScopeIdFnDef:
108108 case ScopeIdCompTime:
109 case ScopeIdNoAsync:
109110 case ScopeIdVarDecl:
110111 case ScopeIdCImport:
111112 case ScopeIdSuspend:
......@@ -226,6 +227,12 @@ Scope *create_comptime_scope(CodeGen *g, AstNode *node, Scope *parent) {
226227 return &scope->base;
227228}
228229
230Scope *create_noasync_scope(CodeGen *g, AstNode *node, Scope *parent) {
231 ScopeNoAsync *scope = heap::c_allocator.create<ScopeNoAsync>();
232 init_scope(g, &scope->base, ScopeIdNoAsync, node, parent);
233 return &scope->base;
234}
235
229236Scope *create_typeof_scope(CodeGen *g, AstNode *node, Scope *parent) {
230237 ScopeTypeOf *scope = heap::c_allocator.create<ScopeTypeOf>();
231238 init_scope(g, &scope->base, ScopeIdTypeOf, node, parent);
......@@ -3755,6 +3762,7 @@ void scan_decls(CodeGen *g, ScopeDecls *decls_scope, AstNode *node) {
37553762 case NodeTypeCompTime:
37563763 preview_comptime_decl(g, node, decls_scope);
37573764 break;
3765 case NodeTypeNoAsync:
37583766 case NodeTypeParamDecl:
37593767 case NodeTypeReturnExpr:
37603768 case NodeTypeDefer:
......@@ -6176,6 +6184,7 @@ static void mark_suspension_point(Scope *scope) {
61766184 case ScopeIdDecls:
61776185 case ScopeIdFnDef:
61786186 case ScopeIdCompTime:
6187 case ScopeIdNoAsync:
61796188 case ScopeIdCImport:
61806189 case ScopeIdSuspend:
61816190 case ScopeIdTypeOf:
src/analyze.hpp+1
......@@ -125,6 +125,7 @@ ScopeLoop *create_loop_scope(CodeGen *g, AstNode *node, Scope *parent);
125125ScopeSuspend *create_suspend_scope(CodeGen *g, AstNode *node, Scope *parent);
126126ScopeFnDef *create_fndef_scope(CodeGen *g, AstNode *node, Scope *parent, ZigFn *fn_entry);
127127Scope *create_comptime_scope(CodeGen *g, AstNode *node, Scope *parent);
128Scope *create_noasync_scope(CodeGen *g, AstNode *node, Scope *parent);
128129Scope *create_runtime_scope(CodeGen *g, AstNode *node, Scope *parent, IrInstSrc *is_comptime);
129130Scope *create_typeof_scope(CodeGen *g, AstNode *node, Scope *parent);
130131ScopeExpr *create_expr_scope(CodeGen *g, AstNode *node, Scope *parent);
src/ast_render.cpp+8
......@@ -220,6 +220,8 @@ static const char *node_type_str(NodeType node_type) {
220220 return "SwitchRange";
221221 case NodeTypeCompTime:
222222 return "CompTime";
223 case NodeTypeNoAsync:
224 return "NoAsync";
223225 case NodeTypeBreak:
224226 return "Break";
225227 case NodeTypeContinue:
......@@ -1091,6 +1093,12 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
10911093 render_node_grouped(ar, node->data.comptime_expr.expr);
10921094 break;
10931095 }
1096 case NodeTypeNoAsync:
1097 {
1098 fprintf(ar->f, "noasync ");
1099 render_node_grouped(ar, node->data.noasync_expr.expr);
1100 break;
1101 }
10941102 case NodeTypeForExpr:
10951103 {
10961104 if (node->data.for_expr.name != nullptr) {
src/codegen.cpp+3-1
......@@ -687,6 +687,7 @@ static ZigLLVMDIScope *get_di_scope(CodeGen *g, Scope *scope) {
687687 case ScopeIdLoop:
688688 case ScopeIdSuspend:
689689 case ScopeIdCompTime:
690 case ScopeIdNoAsync:
690691 case ScopeIdRuntime:
691692 case ScopeIdTypeOf:
692693 case ScopeIdExpr:
......@@ -968,7 +969,7 @@ static Buf *panic_msg_buf(PanicMsgId msg_id) {
968969 case PanicMsgIdResumedFnPendingAwait:
969970 return buf_create_from_str("resumed an async function which can only be awaited");
970971 case PanicMsgIdBadNoAsyncCall:
971 return buf_create_from_str("async function called with noasync suspended");
972 return buf_create_from_str("async function called in noasync scope suspended");
972973 case PanicMsgIdResumeNotSuspendedFn:
973974 return buf_create_from_str("resumed a non-suspended function");
974975 case PanicMsgIdBadSentinel:
......@@ -3934,6 +3935,7 @@ static void render_async_var_decls(CodeGen *g, Scope *scope) {
39343935 case ScopeIdLoop:
39353936 case ScopeIdSuspend:
39363937 case ScopeIdCompTime:
3938 case ScopeIdNoAsync:
39373939 case ScopeIdRuntime:
39383940 case ScopeIdTypeOf:
39393941 case ScopeIdExpr:
src/ir.cpp+46-2
......@@ -4978,6 +4978,7 @@ static void ir_count_defers(IrBuilderSrc *irb, Scope *inner_scope, Scope *outer_
49784978 case ScopeIdLoop:
49794979 case ScopeIdSuspend:
49804980 case ScopeIdCompTime:
4981 case ScopeIdNoAsync:
49814982 case ScopeIdRuntime:
49824983 case ScopeIdTypeOf:
49834984 case ScopeIdExpr:
......@@ -5033,6 +5034,7 @@ static bool ir_gen_defers_for_block(IrBuilderSrc *irb, Scope *inner_scope, Scope
50335034 case ScopeIdLoop:
50345035 case ScopeIdSuspend:
50355036 case ScopeIdCompTime:
5037 case ScopeIdNoAsync:
50365038 case ScopeIdRuntime:
50375039 case ScopeIdTypeOf:
50385040 case ScopeIdExpr:
......@@ -7307,6 +7309,18 @@ static IrInstSrc *ir_gen_builtin_fn_call(IrBuilderSrc *irb, Scope *scope, AstNod
73077309 zig_unreachable();
73087310}
73097311
7312static ScopeNoAsync *get_scope_noasync(Scope *scope) {
7313 while (scope) {
7314 if (scope->id == ScopeIdNoAsync)
7315 return (ScopeNoAsync *)scope;
7316 if (scope->id == ScopeIdFnDef)
7317 return nullptr;
7318
7319 scope = scope->parent;
7320 }
7321 return nullptr;
7322}
7323
73107324static IrInstSrc *ir_gen_fn_call(IrBuilderSrc *irb, Scope *scope, AstNode *node, LVal lval,
73117325 ResultLoc *result_loc)
73127326{
......@@ -7315,8 +7329,19 @@ static IrInstSrc *ir_gen_fn_call(IrBuilderSrc *irb, Scope *scope, AstNode *node,
73157329 if (node->data.fn_call_expr.modifier == CallModifierBuiltin)
73167330 return ir_gen_builtin_fn_call(irb, scope, node, lval, result_loc);
73177331
7332 bool is_noasync = get_scope_noasync(scope) != nullptr;
7333 CallModifier modifier = node->data.fn_call_expr.modifier;
7334 if (is_noasync) {
7335 if (modifier == CallModifierAsync) {
7336 add_node_error(irb->codegen, node,
7337 buf_sprintf("async call in noasync scope"));
7338 return irb->codegen->invalid_inst_src;
7339 }
7340 modifier = CallModifierNoAsync;
7341 }
7342
73187343 AstNode *fn_ref_node = node->data.fn_call_expr.fn_ref_expr;
7319 return ir_gen_fn_call_with_args(irb, scope, node, fn_ref_node, node->data.fn_call_expr.modifier,
7344 return ir_gen_fn_call_with_args(irb, scope, node, fn_ref_node, modifier,
73207345 nullptr, node->data.fn_call_expr.params.items, node->data.fn_call_expr.params.length, lval, result_loc);
73217346}
73227347
......@@ -9170,6 +9195,14 @@ static IrInstSrc *ir_gen_comptime(IrBuilderSrc *irb, Scope *parent_scope, AstNod
91709195 return ir_gen_node_extra(irb, node->data.comptime_expr.expr, child_scope, lval, nullptr);
91719196}
91729197
9198static IrInstSrc *ir_gen_noasync(IrBuilderSrc *irb, Scope *parent_scope, AstNode *node, LVal lval) {
9199 assert(node->type == NodeTypeNoAsync);
9200
9201 Scope *child_scope = create_noasync_scope(irb->codegen, node, parent_scope);
9202 // purposefully pass null for result_loc and let EndExpr handle it
9203 return ir_gen_node_extra(irb, node->data.comptime_expr.expr, child_scope, lval, nullptr);
9204}
9205
91739206static IrInstSrc *ir_gen_return_from_block(IrBuilderSrc *irb, Scope *break_scope, AstNode *node, ScopeBlock *block_scope) {
91749207 IrInstSrc *is_comptime;
91759208 if (ir_should_inline(irb->exec, break_scope)) {
......@@ -9750,6 +9783,10 @@ static IrInstSrc *ir_gen_fn_proto(IrBuilderSrc *irb, Scope *parent_scope, AstNod
97509783
97519784static IrInstSrc *ir_gen_resume(IrBuilderSrc *irb, Scope *scope, AstNode *node) {
97529785 assert(node->type == NodeTypeResume);
9786 if (get_scope_noasync(scope) != nullptr) {
9787 add_node_error(irb->codegen, node, buf_sprintf("resume in noasync scope"));
9788 return irb->codegen->invalid_inst_src;
9789 }
97539790
97549791 IrInstSrc *target_inst = ir_gen_node_extra(irb, node->data.resume_expr.expr, scope, LValPtr, nullptr);
97559792 if (target_inst == irb->codegen->invalid_inst_src)
......@@ -9763,7 +9800,7 @@ static IrInstSrc *ir_gen_await_expr(IrBuilderSrc *irb, Scope *scope, AstNode *no
97639800{
97649801 assert(node->type == NodeTypeAwaitExpr);
97659802
9766 bool is_noasync = node->data.await_expr.noasync_token != nullptr;
9803 bool is_noasync = get_scope_noasync(scope) != nullptr;
97679804
97689805 AstNode *expr_node = node->data.await_expr.expr;
97699806 if (expr_node->type == NodeTypeFnCallExpr && expr_node->data.fn_call_expr.modifier == CallModifierBuiltin) {
......@@ -9809,6 +9846,11 @@ static IrInstSrc *ir_gen_suspend(IrBuilderSrc *irb, Scope *parent_scope, AstNode
98099846 add_node_error(irb->codegen, node, buf_sprintf("suspend outside function definition"));
98109847 return irb->codegen->invalid_inst_src;
98119848 }
9849 if (get_scope_noasync(parent_scope) != nullptr) {
9850 add_node_error(irb->codegen, node, buf_sprintf("suspend in noasync scope"));
9851 return irb->codegen->invalid_inst_src;
9852 }
9853
98129854 ScopeSuspend *existing_suspend_scope = get_scope_suspend(parent_scope);
98139855 if (existing_suspend_scope) {
98149856 if (!existing_suspend_scope->reported_err) {
......@@ -9938,6 +9980,8 @@ static IrInstSrc *ir_gen_node_raw(IrBuilderSrc *irb, AstNode *node, Scope *scope
99389980 return ir_gen_switch_expr(irb, scope, node, lval, result_loc);
99399981 case NodeTypeCompTime:
99409982 return ir_expr_wrap(irb, scope, ir_gen_comptime(irb, scope, node, lval), result_loc);
9983 case NodeTypeNoAsync:
9984 return ir_expr_wrap(irb, scope, ir_gen_noasync(irb, scope, node, lval), result_loc);
99419985 case NodeTypeErrorType:
99429986 return ir_lval_wrap(irb, scope, ir_gen_error_type(irb, scope, node), lval, result_loc);
99439987 case NodeTypeBreak:
src/parser.cpp+34-11
......@@ -876,6 +876,7 @@ static AstNode *ast_parse_container_field(ParseContext *pc) {
876876// Statement
877877// <- KEYWORD_comptime? VarDecl
878878// / KEYWORD_comptime BlockExprStatement
879// / KEYWORD_noasync BlockExprStatement
879880// / KEYWORD_suspend (SEMICOLON / BlockExprStatement)
880881// / KEYWORD_defer BlockExprStatement
881882// / KEYWORD_errdefer BlockExprStatement
......@@ -899,6 +900,14 @@ static AstNode *ast_parse_statement(ParseContext *pc) {
899900 return res;
900901 }
901902
903 Token *noasync = eat_token_if(pc, TokenIdKeywordNoAsync);
904 if (noasync != nullptr) {
905 AstNode *statement = ast_expect(pc, ast_parse_block_expr_statement);
906 AstNode *res = ast_create_node(pc, NodeTypeNoAsync, noasync);
907 res->data.noasync_expr.expr = statement;
908 return res;
909 }
910
902911 Token *suspend = eat_token_if(pc, TokenIdKeywordSuspend);
903912 if (suspend != nullptr) {
904913 AstNode *statement = nullptr;
......@@ -1237,6 +1246,7 @@ static AstNode *ast_parse_prefix_expr(ParseContext *pc) {
12371246// / IfExpr
12381247// / KEYWORD_break BreakLabel? Expr?
12391248// / KEYWORD_comptime Expr
1249// / KEYWORD_noasync Expr
12401250// / KEYWORD_continue BreakLabel?
12411251// / KEYWORD_resume Expr
12421252// / KEYWORD_return Expr?
......@@ -1271,6 +1281,14 @@ static AstNode *ast_parse_primary_expr(ParseContext *pc) {
12711281 return res;
12721282 }
12731283
1284 Token *noasync = eat_token_if(pc, TokenIdKeywordNoAsync);
1285 if (noasync != nullptr) {
1286 AstNode *expr = ast_expect(pc, ast_parse_expr);
1287 AstNode *res = ast_create_node(pc, NodeTypeNoAsync, noasync);
1288 res->data.noasync_expr.expr = expr;
1289 return res;
1290 }
1291
12741292 Token *continue_token = eat_token_if(pc, TokenIdKeywordContinue);
12751293 if (continue_token != nullptr) {
12761294 Token *label = ast_parse_break_label(pc);
......@@ -1459,13 +1477,11 @@ static AstNode *ast_parse_error_union_expr(ParseContext *pc) {
14591477
14601478// SuffixExpr
14611479// <- KEYWORD_async PrimaryTypeExpr SuffixOp* FnCallArguments
1462// / KEYWORD_noasync PrimaryTypeExpr SuffixOp* FnCallArguments
14631480// / PrimaryTypeExpr (SuffixOp / FnCallArguments)*
14641481static AstNode *ast_parse_suffix_expr(ParseContext *pc) {
1465 Token *async_token = eat_token(pc);
1466 bool is_async = async_token->id == TokenIdKeywordAsync;
1467 if (is_async || async_token->id == TokenIdKeywordNoAsync) {
1468 if (is_async && eat_token_if(pc, TokenIdKeywordFn) != nullptr) {
1482 Token *async_token = eat_token_if(pc, TokenIdKeywordAsync);
1483 if (async_token) {
1484 if (eat_token_if(pc, TokenIdKeywordFn) != nullptr) {
14691485 // HACK: If we see the keyword `fn`, then we assume that
14701486 // we are parsing an async fn proto, and not a call.
14711487 // We therefore put back all tokens consumed by the async
......@@ -1515,13 +1531,12 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) {
15151531 assert(args->type == NodeTypeFnCallExpr);
15161532
15171533 AstNode *res = ast_create_node(pc, NodeTypeFnCallExpr, async_token);
1518 res->data.fn_call_expr.modifier = is_async ? CallModifierAsync : CallModifierNoAsync;
1534 res->data.fn_call_expr.modifier = CallModifierAsync;
15191535 res->data.fn_call_expr.seen = false;
15201536 res->data.fn_call_expr.fn_ref_expr = child;
15211537 res->data.fn_call_expr.params = args->data.fn_call_expr.params;
15221538 return res;
15231539 }
1524 put_back_token(pc);
15251540
15261541 AstNode *res = ast_parse_primary_type_expr(pc);
15271542 if (res == nullptr)
......@@ -1582,6 +1597,7 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) {
15821597// / IfTypeExpr
15831598// / INTEGER
15841599// / KEYWORD_comptime TypeExpr
1600// / KEYWORD_noasync TypeExpr
15851601// / KEYWORD_error DOT IDENTIFIER
15861602// / KEYWORD_false
15871603// / KEYWORD_null
......@@ -1683,6 +1699,14 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) {
16831699 return res;
16841700 }
16851701
1702 Token *noasync = eat_token_if(pc, TokenIdKeywordNoAsync);
1703 if (noasync != nullptr) {
1704 AstNode *expr = ast_expect(pc, ast_parse_type_expr);
1705 AstNode *res = ast_create_node(pc, NodeTypeNoAsync, noasync);
1706 res->data.noasync_expr.expr = expr;
1707 return res;
1708 }
1709
16861710 Token *error = eat_token_if(pc, TokenIdKeywordError);
16871711 if (error != nullptr) {
16881712 Token *dot = expect_token(pc, TokenIdDot);
......@@ -2599,14 +2623,10 @@ static AstNode *ast_parse_prefix_op(ParseContext *pc) {
25992623 return res;
26002624 }
26012625
2602 Token *noasync_token = eat_token_if(pc, TokenIdKeywordNoAsync);
26032626 Token *await = eat_token_if(pc, TokenIdKeywordAwait);
26042627 if (await != nullptr) {
26052628 AstNode *res = ast_create_node(pc, NodeTypeAwaitExpr, await);
2606 res->data.await_expr.noasync_token = noasync_token;
26072629 return res;
2608 } else if (noasync_token != nullptr) {
2609 put_back_token(pc);
26102630 }
26112631
26122632 return nullptr;
......@@ -3125,6 +3145,9 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont
31253145 case NodeTypeCompTime:
31263146 visit_field(&node->data.comptime_expr.expr, visit, context);
31273147 break;
3148 case NodeTypeNoAsync:
3149 visit_field(&node->data.comptime_expr.expr, visit, context);
3150 break;
31283151 case NodeTypeBreak:
31293152 // none
31303153 break;
test/compile_errors.zig+15
......@@ -2,6 +2,21 @@ const tests = @import("tests.zig");
22const std = @import("std");
33
44pub fn addCases(cases: *tests.CompileErrorContext) void {
5 cases.addTest("combination of noasync and async",
6 \\export fn entry() void {
7 \\ noasync {
8 \\ const bar = async foo();
9 \\ suspend;
10 \\ resume bar;
11 \\ }
12 \\}
13 \\fn foo() void {}
14 , &[_][]const u8{
15 "tmp.zig:3:21: error: async call in noasync scope",
16 "tmp.zig:4:9: error: suspend in noasync scope",
17 "tmp.zig:5:9: error: resume in noasync scope",
18 });
19
520 cases.addTest("@TypeOf with no arguments",
621 \\export fn entry() void {
722 \\ _ = @TypeOf();
test/stage1/behavior/async_fn.zig+16
......@@ -1531,3 +1531,19 @@ test "noasync await" {
15311531 S.doTheTest();
15321532 expect(S.finished);
15331533}
1534
1535test "noasync on function calls" {
1536 const S0 = struct {
1537 b: i32 = 42,
1538 };
1539 const S1 = struct {
1540 fn c() S0 {
1541 return S0{};
1542 }
1543 fn d() !S0 {
1544 return S0{};
1545 }
1546 };
1547 expectEqual(@as(i32, 42), noasync S1.c().b);
1548 expectEqual(@as(i32, 42), (try noasync S1.d()).b);
1549}