authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-04-28 16:21:07-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-04-28 16:21:07-04:00
log03dd1fca94526f78400c662b6b1e712c05aee849
tree8655669fbdba9243a2a6ef1a3105f565d69ff76b
parentdb25c78413ac4472c6d50122d96c85a42dc032bc
parent2ef0795bfb440671bffd3c6b93603c012d27c24d
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #5195 from tadeokondrak/opaquetype-to-type-opaque

@OpaqueType -> `@Type(.Opaque)

12 files changed, 158 insertions(+), 159 deletions(-)

doc/langref.html.in+30-32
......@@ -1885,7 +1885,7 @@ test "null terminated array" {
18851885 <li>Supports slice syntax: {#syntax#}ptr[start..end]{#endsyntax#}</li>
18861886 <li>Supports pointer arithmetic: {#syntax#}ptr + x{#endsyntax#}, {#syntax#}ptr - x{#endsyntax#}</li>
18871887 <li>{#syntax#}T{#endsyntax#} must have a known size, which means that it cannot be
1888 {#syntax#}c_void{#endsyntax#} or any other {#link|@OpaqueType#}.</li>
1888 {#syntax#}c_void{#endsyntax#} or any other {#link|opaque type|Opaque Types#}.</li>
18891889 </ul>
18901890 </li>
18911891 </ul>
......@@ -5392,7 +5392,7 @@ fn eql_i32(a: i32, b: i32) bool {
53925392 </p>
53935393 <p>
53945394 {#syntax#}void{#endsyntax#} is distinct from {#syntax#}c_void{#endsyntax#}, which is defined like this:
5395 {#syntax#}pub const c_void = @OpaqueType();{#endsyntax#}.
5395 {#syntax#}pub const c_void = @Type(.Opaque);{#endsyntax#}.
53965396 {#syntax#}void{#endsyntax#} has a known size of 0 bytes, and {#syntax#}c_void{#endsyntax#} has an unknown, but non-zero, size.
53975397 </p>
53985398 <p>
......@@ -7666,30 +7666,6 @@ mem.set(u8, dest, c);{#endsyntax#}</pre>
76667666 </p>
76677667 {#header_close#}
76687668
7669 {#header_open|@OpaqueType#}
7670 <pre>{#syntax#}@OpaqueType() type{#endsyntax#}</pre>
7671 <p>
7672 Creates a new type with an unknown (but non-zero) size and alignment.
7673 </p>
7674 <p>
7675 This is typically used for type safety when interacting with C code that does not expose struct details.
7676 Example:
7677 </p>
7678 {#code_begin|test_err|expected type '*Derp', found '*Wat'#}
7679const Derp = @OpaqueType();
7680const Wat = @OpaqueType();
7681
7682extern fn bar(d: *Derp) void;
7683fn foo(w: *Wat) callconv(.C) void {
7684 bar(w);
7685}
7686
7687test "call foo" {
7688 foo(undefined);
7689}
7690 {#code_end#}
7691 {#header_close#}
7692
76937669 {#header_open|@panic#}
76947670 <pre>{#syntax#}@panic(message: []const u8) noreturn{#endsyntax#}</pre>
76957671 <p>
......@@ -8274,21 +8250,21 @@ test "integer truncation" {
82748250 <li>{#syntax#}comptime_float{#endsyntax#}</li>
82758251 <li>{#syntax#}@TypeOf(undefined){#endsyntax#}</li>
82768252 <li>{#syntax#}@TypeOf(null){#endsyntax#}</li>
8253 <li>{#link|Arrays#}</li>
8254 <li>{#link|Optionals#}</li>
8255 <li>{#link|Error Union Type#}</li>
8256 <li>{#link|Vectors#}</li>
8257 <li>{#link|Opaque Types#}</li>
8258 <li>AnyFrame</li>
82778259 </ul>
82788260 <p>
82798261 For these types it is a
82808262 <a href="https://github.com/ziglang/zig/issues/2907">TODO in the compiler to implement</a>:
82818263 </p>
82828264 <ul>
8283 <li>Array</li>
8284 <li>Optional</li>
8285 <li>ErrorUnion</li>
82868265 <li>ErrorSet</li>
82878266 <li>Enum</li>
8288 <li>Opaque</li>
82898267 <li>FnFrame</li>
8290 <li>AnyFrame</li>
8291 <li>Vector</li>
82928268 <li>EnumLiteral</li>
82938269 </ul>
82948270 <p>
......@@ -8373,6 +8349,28 @@ fn foo(comptime T: type, ptr: *T) T {
83738349 {#header_close#}
83748350 {#header_close#}
83758351
8352 {#header_open|Opaque Types#}
8353 {#syntax#}@Type(.Opaque){#endsyntax#} creates a new type with an unknown (but non-zero) size and alignment.
8354 </p>
8355 <p>
8356 This is typically used for type safety when interacting with C code that does not expose struct details.
8357 Example:
8358 </p>
8359 {#code_begin|test_err|expected type '*Derp', found '*Wat'#}
8360const Derp = @Type(.Opaque);
8361const Wat = @Type(.Opaque);
8362
8363extern fn bar(d: *Derp) void;
8364fn foo(w: *Wat) callconv(.C) void {
8365 bar(w);
8366}
8367
8368test "call foo" {
8369 foo(undefined);
8370}
8371 {#code_end#}
8372 {#header_close#}
8373
83768374 {#header_open|Build Mode#}
83778375 <p>
83788376 Zig has four build modes:
lib/std/c.zig+2-2
......@@ -277,8 +277,8 @@ pub extern "c" fn pthread_cond_signal(cond: *pthread_cond_t) c_int;
277277pub extern "c" fn pthread_cond_broadcast(cond: *pthread_cond_t) c_int;
278278pub extern "c" fn pthread_cond_destroy(cond: *pthread_cond_t) c_int;
279279
280pub const pthread_t = *@OpaqueType();
281pub const FILE = @OpaqueType();
280pub const pthread_t = *@Type(.Opaque);
281pub const FILE = @Type(.Opaque);
282282
283283pub extern "c" fn dlopen(path: [*:0]const u8, mode: c_int) ?*c_void;
284284pub extern "c" fn dlclose(handle: *c_void) c_int;
lib/std/os/uefi.zig+3-3
......@@ -12,7 +12,7 @@ pub var handle: Handle = undefined;
1212pub var system_table: *tables.SystemTable = undefined;
1313
1414/// A handle to an event structure.
15pub const Event = *@OpaqueType();
15pub const Event = *@Type(.Opaque);
1616
1717/// GUIDs must be align(8)
1818pub const Guid = extern struct {
......@@ -46,7 +46,7 @@ pub const Guid = extern struct {
4646};
4747
4848/// An EFI Handle represents a collection of related interfaces.
49pub const Handle = *@OpaqueType();
49pub const Handle = *@Type(.Opaque);
5050
5151/// This structure represents time information.
5252pub const Time = extern struct {
......@@ -103,4 +103,4 @@ pub const TimeCapabilities = extern struct {
103103};
104104
105105/// File Handle as specified in the EFI Shell Spec
106pub const FileHandle = *@OpaqueType();
106pub const FileHandle = *@Type(.Opaque);
lib/std/os/uefi/protocols/hii.zig+1-1
......@@ -1,7 +1,7 @@
11const uefi = @import("std").os.uefi;
22const Guid = uefi.Guid;
33
4pub const HIIHandle = *@OpaqueType();
4pub const HIIHandle = *@Type(.Opaque);
55
66/// The header found at the start of each package.
77pub const HIIPackageHeader = packed struct {
lib/std/os/windows/bits.zig+15-15
......@@ -27,16 +27,16 @@ pub const UCHAR = u8;
2727pub const FLOAT = f32;
2828pub const HANDLE = *c_void;
2929pub const HCRYPTPROV = ULONG_PTR;
30pub const HBRUSH = *@OpaqueType();
31pub const HCURSOR = *@OpaqueType();
32pub const HICON = *@OpaqueType();
33pub const HINSTANCE = *@OpaqueType();
34pub const HMENU = *@OpaqueType();
35pub const HMODULE = *@OpaqueType();
36pub const HWND = *@OpaqueType();
37pub const HDC = *@OpaqueType();
38pub const HGLRC = *@OpaqueType();
39pub const FARPROC = *@OpaqueType();
30pub const HBRUSH = *@Type(.Opaque);
31pub const HCURSOR = *@Type(.Opaque);
32pub const HICON = *@Type(.Opaque);
33pub const HINSTANCE = *@Type(.Opaque);
34pub const HMENU = *@Type(.Opaque);
35pub const HMODULE = *@Type(.Opaque);
36pub const HWND = *@Type(.Opaque);
37pub const HDC = *@Type(.Opaque);
38pub const HGLRC = *@Type(.Opaque);
39pub const FARPROC = *@Type(.Opaque);
4040pub const INT = c_int;
4141pub const LPBYTE = *BYTE;
4242pub const LPCH = *CHAR;
......@@ -76,7 +76,7 @@ pub const WPARAM = usize;
7676pub const LPARAM = ?*c_void;
7777pub const LRESULT = ?*c_void;
7878
79pub const va_list = *@OpaqueType();
79pub const va_list = *@Type(.Opaque);
8080
8181pub const TRUE = 1;
8282pub const FALSE = 0;
......@@ -1169,10 +1169,10 @@ pub const UNICODE_STRING = extern struct {
11691169 Buffer: [*]WCHAR,
11701170};
11711171
1172const ACTIVATION_CONTEXT_DATA = @OpaqueType();
1173const ASSEMBLY_STORAGE_MAP = @OpaqueType();
1174const FLS_CALLBACK_INFO = @OpaqueType();
1175const RTL_BITMAP = @OpaqueType();
1172const ACTIVATION_CONTEXT_DATA = @Type(.Opaque);
1173const ASSEMBLY_STORAGE_MAP = @Type(.Opaque);
1174const FLS_CALLBACK_INFO = @Type(.Opaque);
1175const RTL_BITMAP = @Type(.Opaque);
11761176pub const PRTL_BITMAP = *RTL_BITMAP;
11771177const KAFFINITY = usize;
11781178
lib/std/os/windows/ws2_32.zig+1-1
......@@ -1,6 +1,6 @@
11usingnamespace @import("bits.zig");
22
3pub const SOCKET = *@OpaqueType();
3pub const SOCKET = *@Type(.Opaque);
44pub const INVALID_SOCKET = @intToPtr(SOCKET, ~@as(usize, 0));
55pub const SOCKET_ERROR = -1;
66
src-self-hosted/clang.zig+84-84
......@@ -1,89 +1,89 @@
11const builtin = @import("builtin");
22
3pub const struct_ZigClangConditionalOperator = @OpaqueType();
4pub const struct_ZigClangBinaryConditionalOperator = @OpaqueType();
5pub const struct_ZigClangAbstractConditionalOperator = @OpaqueType();
6pub const struct_ZigClangAPInt = @OpaqueType();
7pub const struct_ZigClangAPSInt = @OpaqueType();
8pub const struct_ZigClangAPFloat = @OpaqueType();
9pub const struct_ZigClangASTContext = @OpaqueType();
10pub const struct_ZigClangASTUnit = @OpaqueType();
11pub const struct_ZigClangArraySubscriptExpr = @OpaqueType();
12pub const struct_ZigClangArrayType = @OpaqueType();
13pub const struct_ZigClangAttributedType = @OpaqueType();
14pub const struct_ZigClangBinaryOperator = @OpaqueType();
15pub const struct_ZigClangBreakStmt = @OpaqueType();
16pub const struct_ZigClangBuiltinType = @OpaqueType();
17pub const struct_ZigClangCStyleCastExpr = @OpaqueType();
18pub const struct_ZigClangCallExpr = @OpaqueType();
19pub const struct_ZigClangCaseStmt = @OpaqueType();
20pub const struct_ZigClangCompoundAssignOperator = @OpaqueType();
21pub const struct_ZigClangCompoundStmt = @OpaqueType();
22pub const struct_ZigClangConstantArrayType = @OpaqueType();
23pub const struct_ZigClangContinueStmt = @OpaqueType();
24pub const struct_ZigClangDecayedType = @OpaqueType();
25pub const struct_ZigClangDecl = @OpaqueType();
26pub const struct_ZigClangDeclRefExpr = @OpaqueType();
27pub const struct_ZigClangDeclStmt = @OpaqueType();
28pub const struct_ZigClangDefaultStmt = @OpaqueType();
29pub const struct_ZigClangDiagnosticOptions = @OpaqueType();
30pub const struct_ZigClangDiagnosticsEngine = @OpaqueType();
31pub const struct_ZigClangDoStmt = @OpaqueType();
32pub const struct_ZigClangElaboratedType = @OpaqueType();
33pub const struct_ZigClangEnumConstantDecl = @OpaqueType();
34pub const struct_ZigClangEnumDecl = @OpaqueType();
35pub const struct_ZigClangEnumType = @OpaqueType();
36pub const struct_ZigClangExpr = @OpaqueType();
37pub const struct_ZigClangFieldDecl = @OpaqueType();
38pub const struct_ZigClangFileID = @OpaqueType();
39pub const struct_ZigClangForStmt = @OpaqueType();
40pub const struct_ZigClangFullSourceLoc = @OpaqueType();
41pub const struct_ZigClangFunctionDecl = @OpaqueType();
42pub const struct_ZigClangFunctionProtoType = @OpaqueType();
43pub const struct_ZigClangIfStmt = @OpaqueType();
44pub const struct_ZigClangImplicitCastExpr = @OpaqueType();
45pub const struct_ZigClangIncompleteArrayType = @OpaqueType();
46pub const struct_ZigClangIntegerLiteral = @OpaqueType();
47pub const struct_ZigClangMacroDefinitionRecord = @OpaqueType();
48pub const struct_ZigClangMacroExpansion = @OpaqueType();
49pub const struct_ZigClangMacroQualifiedType = @OpaqueType();
50pub const struct_ZigClangMemberExpr = @OpaqueType();
51pub const struct_ZigClangNamedDecl = @OpaqueType();
52pub const struct_ZigClangNone = @OpaqueType();
53pub const struct_ZigClangOpaqueValueExpr = @OpaqueType();
54pub const struct_ZigClangPCHContainerOperations = @OpaqueType();
55pub const struct_ZigClangParenExpr = @OpaqueType();
56pub const struct_ZigClangParenType = @OpaqueType();
57pub const struct_ZigClangParmVarDecl = @OpaqueType();
58pub const struct_ZigClangPointerType = @OpaqueType();
59pub const struct_ZigClangPreprocessedEntity = @OpaqueType();
60pub const struct_ZigClangRecordDecl = @OpaqueType();
61pub const struct_ZigClangRecordType = @OpaqueType();
62pub const struct_ZigClangReturnStmt = @OpaqueType();
63pub const struct_ZigClangSkipFunctionBodiesScope = @OpaqueType();
64pub const struct_ZigClangSourceManager = @OpaqueType();
65pub const struct_ZigClangSourceRange = @OpaqueType();
66pub const struct_ZigClangStmt = @OpaqueType();
67pub const struct_ZigClangStringLiteral = @OpaqueType();
68pub const struct_ZigClangStringRef = @OpaqueType();
69pub const struct_ZigClangSwitchStmt = @OpaqueType();
70pub const struct_ZigClangTagDecl = @OpaqueType();
71pub const struct_ZigClangType = @OpaqueType();
72pub const struct_ZigClangTypedefNameDecl = @OpaqueType();
73pub const struct_ZigClangTypedefType = @OpaqueType();
74pub const struct_ZigClangUnaryExprOrTypeTraitExpr = @OpaqueType();
75pub const struct_ZigClangUnaryOperator = @OpaqueType();
76pub const struct_ZigClangValueDecl = @OpaqueType();
77pub const struct_ZigClangVarDecl = @OpaqueType();
78pub const struct_ZigClangWhileStmt = @OpaqueType();
79pub const struct_ZigClangFunctionType = @OpaqueType();
80pub const struct_ZigClangPredefinedExpr = @OpaqueType();
81pub const struct_ZigClangInitListExpr = @OpaqueType();
82pub const ZigClangPreprocessingRecord = @OpaqueType();
83pub const ZigClangFloatingLiteral = @OpaqueType();
84pub const ZigClangConstantExpr = @OpaqueType();
85pub const ZigClangCharacterLiteral = @OpaqueType();
86pub const ZigClangStmtExpr = @OpaqueType();
3pub const struct_ZigClangConditionalOperator = @Type(.Opaque);
4pub const struct_ZigClangBinaryConditionalOperator = @Type(.Opaque);
5pub const struct_ZigClangAbstractConditionalOperator = @Type(.Opaque);
6pub const struct_ZigClangAPInt = @Type(.Opaque);
7pub const struct_ZigClangAPSInt = @Type(.Opaque);
8pub const struct_ZigClangAPFloat = @Type(.Opaque);
9pub const struct_ZigClangASTContext = @Type(.Opaque);
10pub const struct_ZigClangASTUnit = @Type(.Opaque);
11pub const struct_ZigClangArraySubscriptExpr = @Type(.Opaque);
12pub const struct_ZigClangArrayType = @Type(.Opaque);
13pub const struct_ZigClangAttributedType = @Type(.Opaque);
14pub const struct_ZigClangBinaryOperator = @Type(.Opaque);
15pub const struct_ZigClangBreakStmt = @Type(.Opaque);
16pub const struct_ZigClangBuiltinType = @Type(.Opaque);
17pub const struct_ZigClangCStyleCastExpr = @Type(.Opaque);
18pub const struct_ZigClangCallExpr = @Type(.Opaque);
19pub const struct_ZigClangCaseStmt = @Type(.Opaque);
20pub const struct_ZigClangCompoundAssignOperator = @Type(.Opaque);
21pub const struct_ZigClangCompoundStmt = @Type(.Opaque);
22pub const struct_ZigClangConstantArrayType = @Type(.Opaque);
23pub const struct_ZigClangContinueStmt = @Type(.Opaque);
24pub const struct_ZigClangDecayedType = @Type(.Opaque);
25pub const struct_ZigClangDecl = @Type(.Opaque);
26pub const struct_ZigClangDeclRefExpr = @Type(.Opaque);
27pub const struct_ZigClangDeclStmt = @Type(.Opaque);
28pub const struct_ZigClangDefaultStmt = @Type(.Opaque);
29pub const struct_ZigClangDiagnosticOptions = @Type(.Opaque);
30pub const struct_ZigClangDiagnosticsEngine = @Type(.Opaque);
31pub const struct_ZigClangDoStmt = @Type(.Opaque);
32pub const struct_ZigClangElaboratedType = @Type(.Opaque);
33pub const struct_ZigClangEnumConstantDecl = @Type(.Opaque);
34pub const struct_ZigClangEnumDecl = @Type(.Opaque);
35pub const struct_ZigClangEnumType = @Type(.Opaque);
36pub const struct_ZigClangExpr = @Type(.Opaque);
37pub const struct_ZigClangFieldDecl = @Type(.Opaque);
38pub const struct_ZigClangFileID = @Type(.Opaque);
39pub const struct_ZigClangForStmt = @Type(.Opaque);
40pub const struct_ZigClangFullSourceLoc = @Type(.Opaque);
41pub const struct_ZigClangFunctionDecl = @Type(.Opaque);
42pub const struct_ZigClangFunctionProtoType = @Type(.Opaque);
43pub const struct_ZigClangIfStmt = @Type(.Opaque);
44pub const struct_ZigClangImplicitCastExpr = @Type(.Opaque);
45pub const struct_ZigClangIncompleteArrayType = @Type(.Opaque);
46pub const struct_ZigClangIntegerLiteral = @Type(.Opaque);
47pub const struct_ZigClangMacroDefinitionRecord = @Type(.Opaque);
48pub const struct_ZigClangMacroExpansion = @Type(.Opaque);
49pub const struct_ZigClangMacroQualifiedType = @Type(.Opaque);
50pub const struct_ZigClangMemberExpr = @Type(.Opaque);
51pub const struct_ZigClangNamedDecl = @Type(.Opaque);
52pub const struct_ZigClangNone = @Type(.Opaque);
53pub const struct_ZigClangOpaqueValueExpr = @Type(.Opaque);
54pub const struct_ZigClangPCHContainerOperations = @Type(.Opaque);
55pub const struct_ZigClangParenExpr = @Type(.Opaque);
56pub const struct_ZigClangParenType = @Type(.Opaque);
57pub const struct_ZigClangParmVarDecl = @Type(.Opaque);
58pub const struct_ZigClangPointerType = @Type(.Opaque);
59pub const struct_ZigClangPreprocessedEntity = @Type(.Opaque);
60pub const struct_ZigClangRecordDecl = @Type(.Opaque);
61pub const struct_ZigClangRecordType = @Type(.Opaque);
62pub const struct_ZigClangReturnStmt = @Type(.Opaque);
63pub const struct_ZigClangSkipFunctionBodiesScope = @Type(.Opaque);
64pub const struct_ZigClangSourceManager = @Type(.Opaque);
65pub const struct_ZigClangSourceRange = @Type(.Opaque);
66pub const struct_ZigClangStmt = @Type(.Opaque);
67pub const struct_ZigClangStringLiteral = @Type(.Opaque);
68pub const struct_ZigClangStringRef = @Type(.Opaque);
69pub const struct_ZigClangSwitchStmt = @Type(.Opaque);
70pub const struct_ZigClangTagDecl = @Type(.Opaque);
71pub const struct_ZigClangType = @Type(.Opaque);
72pub const struct_ZigClangTypedefNameDecl = @Type(.Opaque);
73pub const struct_ZigClangTypedefType = @Type(.Opaque);
74pub const struct_ZigClangUnaryExprOrTypeTraitExpr = @Type(.Opaque);
75pub const struct_ZigClangUnaryOperator = @Type(.Opaque);
76pub const struct_ZigClangValueDecl = @Type(.Opaque);
77pub const struct_ZigClangVarDecl = @Type(.Opaque);
78pub const struct_ZigClangWhileStmt = @Type(.Opaque);
79pub const struct_ZigClangFunctionType = @Type(.Opaque);
80pub const struct_ZigClangPredefinedExpr = @Type(.Opaque);
81pub const struct_ZigClangInitListExpr = @Type(.Opaque);
82pub const ZigClangPreprocessingRecord = @Type(.Opaque);
83pub const ZigClangFloatingLiteral = @Type(.Opaque);
84pub const ZigClangConstantExpr = @Type(.Opaque);
85pub const ZigClangCharacterLiteral = @Type(.Opaque);
86pub const ZigClangStmtExpr = @Type(.Opaque);
8787
8888pub const ZigClangBO = extern enum {
8989 PtrMemD,
src-self-hosted/translate_c.zig+2-1
......@@ -4025,7 +4025,8 @@ fn transCreateNodeFloat(c: *Context, int: var) !*ast.Node {
40254025}
40264026
40274027fn transCreateNodeOpaqueType(c: *Context) !*ast.Node {
4028 const call_node = try transCreateNodeBuiltinFnCall(c, "@OpaqueType");
4028 const call_node = try transCreateNodeBuiltinFnCall(c, "@Type");
4029 try call_node.params.push(try transCreateNodeEnumLiteral(c, "Opaque"));
40294030 call_node.rparen_token = try appendToken(c, .RParen, ")");
40304031 return &call_node.base;
40314032}
test/compile_errors.zig+9-9
......@@ -1992,7 +1992,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
19921992 });
19931993
19941994 cases.add("directly embedding opaque type in struct and union",
1995 \\const O = @OpaqueType();
1995 \\const O = @Type(.Opaque);
19961996 \\const Foo = struct {
19971997 \\ o: O,
19981998 \\};
......@@ -2007,7 +2007,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
20072007 \\ var bar: Bar = undefined;
20082008 \\}
20092009 \\export fn c() void {
2010 \\ var baz: *@OpaqueType() = undefined;
2010 \\ var baz: *@Type(.Opaque) = undefined;
20112011 \\ const qux = .{baz.*};
20122012 \\}
20132013 , &[_][]const u8{
......@@ -2971,7 +2971,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
29712971 });
29722972
29732973 cases.add("unknown length pointer to opaque",
2974 \\export const T = [*]@OpaqueType();
2974 \\export const T = [*]@Type(.Opaque);
29752975 , &[_][]const u8{
29762976 "tmp.zig:1:21: error: unknown-length pointer to opaque",
29772977 });
......@@ -6127,8 +6127,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
61276127 "tmp.zig:2:31: error: index 2 outside array of size 2",
61286128 });
61296129
6130 cases.add("wrong pointer coerced to pointer to @OpaqueType()",
6131 \\const Derp = @OpaqueType();
6130 cases.add("wrong pointer coerced to pointer to @Type(.Opaque)",
6131 \\const Derp = @Type(.Opaque);
61326132 \\extern fn bar(d: *Derp) void;
61336133 \\export fn foo() void {
61346134 \\ var x = @as(u8, 1);
......@@ -6166,7 +6166,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
61666166 \\export fn entry9() void {
61676167 \\ var z: noreturn = return;
61686168 \\}
6169 \\const Opaque = @OpaqueType();
6169 \\const Opaque = @Type(.Opaque);
61706170 \\const Foo = struct {
61716171 \\ fn bar(self: *const Foo) void {}
61726172 \\};
......@@ -6320,7 +6320,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
63206320 });
63216321
63226322 cases.add("field access of opaque type",
6323 \\const MyType = @OpaqueType();
6323 \\const MyType = @Type(.Opaque);
63246324 \\
63256325 \\export fn entry() bool {
63266326 \\ var x: i32 = 1;
......@@ -6936,7 +6936,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
69366936 });
69376937
69386938 cases.add("function returning opaque type",
6939 \\const FooType = @OpaqueType();
6939 \\const FooType = @Type(.Opaque);
69406940 \\export fn bar() !FooType {
69416941 \\ return error.InvalidValue;
69426942 \\}
......@@ -6954,7 +6954,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
69546954 });
69556955
69566956 cases.add("generic function returning opaque type",
6957 \\const FooType = @OpaqueType();
6957 \\const FooType = @Type(.Opaque);
69586958 \\fn generic(comptime T: type) !T {
69596959 \\ return undefined;
69606960 \\}
test/gen_h.zig+1-1
......@@ -74,7 +74,7 @@ pub fn addCases(cases: *tests.GenHContext) void {
7474 });
7575
7676 cases.add("declare opaque type",
77 \\const Foo = @OpaqueType();
77 \\const Foo = @Type(.Opaque);
7878 \\
7979 \\export fn entry(foo: ?*Foo) void { }
8080 , &[_][]const u8{
test/stage1/behavior/misc.zig+3-3
......@@ -444,9 +444,9 @@ export fn writeToVRam() void {
444444 vram[0] = 'X';
445445}
446446
447const OpaqueA = @OpaqueType();
448const OpaqueB = @OpaqueType();
449test "@OpaqueType" {
447const OpaqueA = @Type(.Opaque);
448const OpaqueB = @Type(.Opaque);
449test "opaque types" {
450450 expect(*OpaqueA != *OpaqueB);
451451 expect(mem.eql(u8, @typeName(OpaqueA), "OpaqueA"));
452452 expect(mem.eql(u8, @typeName(OpaqueB), "OpaqueB"));
test/translate_c.zig+7-7
......@@ -36,9 +36,9 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
3636 \\struct foo { int x; int y[]; };
3737 \\struct bar { int x; int y[0]; };
3838 , &[_][]const u8{
39 \\pub const struct_foo = @OpaqueType();
39 \\pub const struct_foo = @Type(.Opaque);
4040 ,
41 \\pub const struct_bar = @OpaqueType();
41 \\pub const struct_bar = @Type(.Opaque);
4242 });
4343
4444 cases.add("nested loops without blocks",
......@@ -106,7 +106,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
106106 \\pub const struct_arcan_shmif_page = //
107107 ,
108108 \\warning: unsupported type: 'Atomic'
109 \\ @OpaqueType(); //
109 \\ @Type(.Opaque); //
110110 ,
111111 \\ warning: struct demoted to opaque type - unable to translate type of field abufused
112112 , // TODO should be `addr: *struct_arcan_shmif_page`
......@@ -285,8 +285,8 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
285285 \\ struct opaque_2 *cast = (struct opaque_2 *)opaque;
286286 \\}
287287 , &[_][]const u8{
288 \\pub const struct_opaque = @OpaqueType();
289 \\pub const struct_opaque_2 = @OpaqueType();
288 \\pub const struct_opaque = @Type(.Opaque);
289 \\pub const struct_opaque_2 = @Type(.Opaque);
290290 \\pub export fn function(arg_opaque_1: ?*struct_opaque) void {
291291 \\ var opaque_1 = arg_opaque_1;
292292 \\ var cast: ?*struct_opaque_2 = @ptrCast(?*struct_opaque_2, opaque_1);
......@@ -524,7 +524,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
524524 \\ struct Foo *foo;
525525 \\};
526526 , &[_][]const u8{
527 \\pub const struct_Foo = @OpaqueType();
527 \\pub const struct_Foo = @Type(.Opaque);
528528 ,
529529 \\pub const struct_Bar = extern struct {
530530 \\ foo: ?*struct_Foo,
......@@ -601,7 +601,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
601601 \\struct Foo;
602602 \\struct Foo *some_func(struct Foo *foo, int x);
603603 , &[_][]const u8{
604 \\pub const struct_Foo = @OpaqueType();
604 \\pub const struct_Foo = @Type(.Opaque);
605605 ,
606606 \\pub extern fn some_func(foo: ?*struct_Foo, x: c_int) ?*struct_Foo;
607607 ,