mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-15 15:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2022-05-21 13:02:03 +01:00
parent e48f41165c b84561f2b8
commit e43eccbb91
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/parser.cpp
View File

@@ -4043,7 +4043,7 @@ Ast *parse_if_stmt(AstFile *f) {
if (build_context.disallow_do) {
syntax_error(body, "'do' has been disallowed");
} else if (!ast_on_same_line(cond, body)) {
syntax_error(body, "The body of a 'do' be on the same line as if condition");
syntax_error(body, "The body of a 'do' must be on the same line as if condition");
}
} else {
body = parse_block_stmt(f, false);
@@ -4065,7 +4065,7 @@ Ast *parse_if_stmt(AstFile *f) {
if (build_context.disallow_do) {
syntax_error(else_stmt, "'do' has been disallowed");
} else if (!ast_on_same_line(else_token, else_stmt)) {
syntax_error(else_stmt, "The body of a 'do' be on the same line as 'else'");
syntax_error(else_stmt, "The body of a 'do' must be on the same line as 'else'");
}
} break;
default:
@@ -4100,7 +4100,7 @@ Ast *parse_when_stmt(AstFile *f) {
if (build_context.disallow_do) {
syntax_error(body, "'do' has been disallowed");
} else if (!ast_on_same_line(cond, body)) {
syntax_error(body, "The body of a 'do' be on the same line as when statement");
syntax_error(body, "The body of a 'do' must be on the same line as when statement");
}
} else {
body = parse_block_stmt(f, true);
@@ -4122,7 +4122,7 @@ Ast *parse_when_stmt(AstFile *f) {
if (build_context.disallow_do) {
syntax_error(else_stmt, "'do' has been disallowed");
} else if (!ast_on_same_line(else_token, else_stmt)) {
syntax_error(else_stmt, "The body of a 'do' be on the same line as 'else'");
syntax_error(else_stmt, "The body of a 'do' must be on the same line as 'else'");
}
} break;
default:
@@ -4197,7 +4197,7 @@ Ast *parse_for_stmt(AstFile *f) {
if (build_context.disallow_do) {
syntax_error(body, "'do' has been disallowed");
} else if (!ast_on_same_line(token, body)) {
syntax_error(body, "The body of a 'do' be on the same line as the 'for' token");
syntax_error(body, "The body of a 'do' must be on the same line as the 'for' token");
}
} else {
body = parse_block_stmt(f, false);
@@ -4243,7 +4243,7 @@ Ast *parse_for_stmt(AstFile *f) {
if (build_context.disallow_do) {
syntax_error(body, "'do' has been disallowed");
} else if (!ast_on_same_line(token, body)) {
syntax_error(body, "The body of a 'do' be on the same line as the 'for' token");
syntax_error(body, "The body of a 'do' must be on the same line as the 'for' token");
}
} else {
body = parse_block_stmt(f, false);
@@ -4569,7 +4569,7 @@ Ast *parse_unrolled_for_loop(AstFile *f, Token unroll_token) {
if (build_context.disallow_do) {
syntax_error(body, "'do' has been disallowed");
} else if (!ast_on_same_line(for_token, body)) {
syntax_error(body, "The body of a 'do' be on the same line as the 'for' token");
syntax_error(body, "The body of a 'do' must be on the same line as the 'for' token");
}
} else {
body = parse_block_stmt(f, false);

31
vendor/directx/dxgi/dxgi.odin vendored
View File

@@ -1138,4 +1138,33 @@ IAdapter3_VTable :: struct {
SetVideoMemoryReservation: proc "stdcall" (this: ^IAdapter3, NodeIndex: u32, MemorySegmentGroup: MEMORY_SEGMENT_GROUP, Reservation: u64) -> HRESULT,
RegisterVideoMemoryBudgetChangeNotificationEvent: proc "stdcall" (this: ^IAdapter3, hEvent: HANDLE, pdwCookie: ^u32) -> HRESULT,
UnregisterVideoMemoryBudgetChangeNotification: proc "stdcall" (this: ^IAdapter3, dwCookie: u32),
}
}
ERROR_ACCESS_DENIED :: HRESULT(-2005270485) //0x887A002B
ERROR_ACCESS_LOST :: HRESULT(-2005270490) //0x887A0026
ERROR_ALREADY_EXISTS :: HRESULT(-2005270474) //0x887A0036
ERROR_CANNOT_PROTECT_CONTENT :: HRESULT(-2005270486) //0x887A002A
ERROR_DEVICE_HUNG :: HRESULT(-2005270522) //0x887A0006
ERROR_DEVICE_REMOVED :: HRESULT(-2005270523) //0x887A0005
ERROR_DEVICE_RESET :: HRESULT(-2005270521) //0x887A0007
ERROR_DRIVER_INTERNAL_ERROR :: HRESULT(-2005270496) //0x887A0020
ERROR_FRAME_STATISTICS_DISJOINT :: HRESULT(-2005270517) //0x887A000B
ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE :: HRESULT(-2005270516) //0x887A000C
ERROR_INVALID_CALL :: HRESULT(-2005270527) //0x887A0001
ERROR_MORE_DATA :: HRESULT(-2005270525) //0x887A0003
ERROR_NAME_ALREADY_EXISTS :: HRESULT(-2005270484) //0x887A002C
ERROR_NONEXCLUSIVE :: HRESULT(-2005270495) //0x887A0021
ERROR_NOT_CURRENTLY_AVAILABLE :: HRESULT(-2005270494) //0x887A0022
ERROR_NOT_FOUND :: HRESULT(-2005270526) //0x887A0002
ERROR_REMOTE_CLIENT_DISCONNECTED :: HRESULT(-2005270493) //0x887A0023
ERROR_REMOTE_OUTOFMEMORY :: HRESULT(-2005270492) //0x887A0024
ERROR_RESTRICT_TO_OUTPUT_STALE :: HRESULT(-2005270487) //0x887A0029
ERROR_SDK_COMPONENT_MISSING :: HRESULT(-2005270483) //0x887A002D
ERROR_SESSION_DISCONNECTED :: HRESULT(-2005270488) //0x887A0028
ERROR_UNSUPPORTED :: HRESULT(-2005270524) //0x887A0004
ERROR_WAIT_TIMEOUT :: HRESULT(-2005270489) //0x887A0027
ERROR_WAS_STILL_DRAWING :: HRESULT(-2005270518) //0x887A000A
STATUS_OCCLUDED :: HRESULT( 142213121) //0x087A0001
STATUS_MODE_CHANGED :: HRESULT( 142213127) //0x087A0007
STATUS_MODE_CHANGE_IN_PROGRESS :: HRESULT( 142213128) //0x087A0008