ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1583 from semarie/semi-colons-eof

Browse Source 
Semi colons and EOF
This commit is contained in:
Jeroen van Rijn
2022-03-03 17:06:13 +01:00
committed by GitHub
parent 09f5713cf8 dfe2c0a600
commit b4ca99ead9
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compress/common.odin
+1 -1
View File
@@ -479,4 +479,4 @@ discard_to_next_byte_lsb_from_stream :: proc(z: ^Context_Stream_Input) {
consume_bits_lsb(z, discard) consume_bits_lsb(z, discard)
} }
discard_to_next_byte_lsb :: proc{discard_to_next_byte_lsb_from_memory, discard_to_next_byte_lsb_from_stream}; discard_to_next_byte_lsb :: proc{discard_to_next_byte_lsb_from_memory, discard_to_next_byte_lsb_from_stream}
core/compress/zlib/zlib.odin
+1 -1
View File
@@ -677,4 +677,4 @@ inflate_from_byte_array_raw :: proc(input: []u8, buf: ^bytes.Buffer, raw := fals
return inflate_raw(z=&ctx, expected_output_size=expected_output_size) return inflate_raw(z=&ctx, expected_output_size=expected_output_size)
} }
inflate :: proc{inflate_from_context, inflate_from_byte_array}; inflate :: proc{inflate_from_context, inflate_from_byte_array}
src/parser.cpp
+2 -1
View File
@@ -1538,7 +1538,7 @@ void fix_advance_to_next_stmt(AstFile *f) {
Token expect_closing(AstFile *f, TokenKind kind, String context) { Token expect_closing(AstFile *f, TokenKind kind, String context) {
if (f->curr_token.kind != kind && if (f->curr_token.kind != kind &&
f->curr_token.kind == Token_Semicolon && f->curr_token.kind == Token_Semicolon &&
f->curr_token.string == "\n") { (f->curr_token.string == "\n" || f->curr_token.kind == Token_EOF)) {
Token tok = f->prev_token; Token tok = f->prev_token;
tok.pos.column += cast(i32)tok.string.len; tok.pos.column += cast(i32)tok.string.len;
syntax_error(tok, "Missing ',' before newline in %.*s", LIT(context)); syntax_error(tok, "Missing ',' before newline in %.*s", LIT(context));
@@ -1560,6 +1560,7 @@ void assign_removal_flag_to_semicolon(AstFile *f) {
switch (curr_token->kind) { switch (curr_token->kind) {
case Token_CloseBrace: case Token_CloseBrace:
case Token_CloseParen: case Token_CloseParen:
case Token_EOF:
ok = true; ok = true;
break; break;
} }
vendor/sdl2/sdl_keycode.odin
Vendored
+1 -1
View File
@@ -327,4 +327,4 @@ KMOD_RESERVED :: Keymod{.RESERVED}
KMOD_CTRL :: Keymod{.LCTRL, .RCTRL} KMOD_CTRL :: Keymod{.LCTRL, .RCTRL}
KMOD_SHIFT :: Keymod{.LSHIFT, .RSHIFT} KMOD_SHIFT :: Keymod{.LSHIFT, .RSHIFT}
KMOD_ALT :: Keymod{.LALT, .RALT} KMOD_ALT :: Keymod{.LALT, .RALT}
KMOD_GUI :: Keymod{.LGUI, .RGUI}; KMOD_GUI :: Keymod{.LGUI, .RGUI}
vendor/sdl2/sdl_scancode.odin
Vendored
+1 -1
View File
@@ -539,4 +539,4 @@ SCANCODE_APP1 :: Scancode.APP1
SCANCODE_APP2 :: Scancode.APP2 SCANCODE_APP2 :: Scancode.APP2
SCANCODE_AUDIOREWIND :: Scancode.AUDIOREWIND SCANCODE_AUDIOREWIND :: Scancode.AUDIOREWIND
SCANCODE_AUDIOFASTFORWARD :: Scancode.AUDIOFASTFORWARD; SCANCODE_AUDIOFASTFORWARD :: Scancode.AUDIOFASTFORWARD