Skip to content

Commit 8b97a1a

Browse files
authored
Merge pull request #3033 from ziglang/rewrite-coroutines
rework async function semantics
2 parents 7298072 + d367249 commit 8b97a1a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+5702
-5149
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,6 @@ set(ZIG_MAIN_SRC "${CMAKE_SOURCE_DIR}/src/main.cpp")
426426
set(ZIG0_SHIM_SRC "${CMAKE_SOURCE_DIR}/src/userland.cpp")
427427

428428
set(ZIG_SOURCES
429-
"${CMAKE_SOURCE_DIR}/src/glibc.cpp"
430429
"${CMAKE_SOURCE_DIR}/src/analyze.cpp"
431430
"${CMAKE_SOURCE_DIR}/src/ast_render.cpp"
432431
"${CMAKE_SOURCE_DIR}/src/bigfloat.cpp"
@@ -438,6 +437,7 @@ set(ZIG_SOURCES
438437
"${CMAKE_SOURCE_DIR}/src/compiler.cpp"
439438
"${CMAKE_SOURCE_DIR}/src/errmsg.cpp"
440439
"${CMAKE_SOURCE_DIR}/src/error.cpp"
440+
"${CMAKE_SOURCE_DIR}/src/glibc.cpp"
441441
"${CMAKE_SOURCE_DIR}/src/ir.cpp"
442442
"${CMAKE_SOURCE_DIR}/src/ir_print.cpp"
443443
"${CMAKE_SOURCE_DIR}/src/libc_installation.cpp"

build.zig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ fn addLibUserlandStep(b: *Builder) void {
375375
artifact.bundle_compiler_rt = true;
376376
artifact.setTarget(builtin.arch, builtin.os, builtin.abi);
377377
artifact.linkSystemLibrary("c");
378-
artifact.linkSystemLibrary("ntdll");
378+
if (builtin.os == .windows) {
379+
artifact.linkSystemLibrary("ntdll");
380+
}
379381
const libuserland_step = b.step("libuserland", "Build the userland compiler library for use in stage1");
380382
libuserland_step.dependOn(&artifact.step);
381383

doc/docgen.zig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,6 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok
750750
.Keyword_async,
751751
.Keyword_await,
752752
.Keyword_break,
753-
.Keyword_cancel,
754753
.Keyword_catch,
755754
.Keyword_comptime,
756755
.Keyword_const,
@@ -770,7 +769,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok
770769
.Keyword_or,
771770
.Keyword_orelse,
772771
.Keyword_packed,
773-
.Keyword_promise,
772+
.Keyword_anyframe,
774773
.Keyword_pub,
775774
.Keyword_resume,
776775
.Keyword_return,

0 commit comments

Comments
 (0)