diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-06-19 11:46:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 11:46:32 -0400 |
| commit | 85422d7aeadc453ec621d0624f394c3f4e3f619f (patch) | |
| tree | a079e4ca9620ca618b7c0e09aa8e99df1e2a4ae5 /src/codegen.cpp | |
| parent | 9f2324389d4aec5d38e840ab09fd9af558a77913 (diff) | |
| parent | 811539f8ee88366fea744ecfe251413b5dd774cc (diff) | |
| download | zig-85422d7aeadc453ec621d0624f394c3f4e3f619f.tar.gz zig-85422d7aeadc453ec621d0624f394c3f4e3f619f.zip | |
Merge pull request #1136 from alexnask/typeinfo_improvements
@typeInfo now uses optional types instead of @typeOf(undefined)
Diffstat (limited to 'src/codegen.cpp')
| -rw-r--r-- | src/codegen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index 21520e0dd0..5f7fd60392 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -6638,7 +6638,7 @@ Buf *codegen_generate_builtin_source(CodeGen *g) { "\n" " pub const Union = struct {\n" " layout: ContainerLayout,\n" - " tag_type: type,\n" + " tag_type: ?type,\n" " fields: []UnionField,\n" " defs: []Definition,\n" " };\n" @@ -6655,20 +6655,20 @@ Buf *codegen_generate_builtin_source(CodeGen *g) { " pub const FnArg = struct {\n" " is_generic: bool,\n" " is_noalias: bool,\n" - " arg_type: type,\n" + " arg_type: ?type,\n" " };\n" "\n" " pub const Fn = struct {\n" " calling_convention: CallingConvention,\n" " is_generic: bool,\n" " is_var_args: bool,\n" - " return_type: type,\n" - " async_allocator_type: type,\n" + " return_type: ?type,\n" + " async_allocator_type: ?type,\n" " args: []FnArg,\n" " };\n" "\n" " pub const Promise = struct {\n" - " child: type,\n" + " child: ?type,\n" " };\n" "\n" " pub const Definition = struct {\n" |