浏览代码

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

Semi colons and EOF
Jeroen van Rijn 3 年之前
父节点
当前提交
b4ca99ead9
共有 5 个文件被更改,包括 6 次插入5 次删除
  1. 1 1
      core/compress/common.odin
  2. 1 1
      core/compress/zlib/zlib.odin
  3. 2 1
      src/parser.cpp
  4. 1 1
      vendor/sdl2/sdl_keycode.odin
  5. 1 1
      vendor/sdl2/sdl_scancode.odin

+ 1 - 1
core/compress/common.odin

@@ -479,4 +479,4 @@ discard_to_next_byte_lsb_from_stream :: proc(z: ^Context_Stream_Input) {
 	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}

+ 1 - 1
core/compress/zlib/zlib.odin

@@ -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)
 }
 
-inflate :: proc{inflate_from_context, inflate_from_byte_array};
+inflate :: proc{inflate_from_context, inflate_from_byte_array}

+ 2 - 1
src/parser.cpp

@@ -1538,7 +1538,7 @@ void fix_advance_to_next_stmt(AstFile *f) {
 Token expect_closing(AstFile *f, TokenKind kind, String context) {
 	if (f->curr_token.kind != kind &&
 	    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;
 		tok.pos.column += cast(i32)tok.string.len;
 		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) {
 			case Token_CloseBrace:
 			case Token_CloseParen:
+			case Token_EOF:
 				ok = true;
 				break;
 			}

+ 1 - 1
vendor/sdl2/sdl_keycode.odin

@@ -327,4 +327,4 @@ KMOD_RESERVED :: Keymod{.RESERVED}
 KMOD_CTRL     :: Keymod{.LCTRL, .RCTRL}
 KMOD_SHIFT    :: Keymod{.LSHIFT, .RSHIFT}
 KMOD_ALT      :: Keymod{.LALT, .RALT}
-KMOD_GUI      :: Keymod{.LGUI, .RGUI};
+KMOD_GUI      :: Keymod{.LGUI, .RGUI}

+ 1 - 1
vendor/sdl2/sdl_scancode.odin

@@ -539,4 +539,4 @@ SCANCODE_APP1 :: Scancode.APP1
 SCANCODE_APP2 :: Scancode.APP2
 
 SCANCODE_AUDIOREWIND      :: Scancode.AUDIOREWIND
-SCANCODE_AUDIOFASTFORWARD :: Scancode.AUDIOFASTFORWARD;
+SCANCODE_AUDIOFASTFORWARD :: Scancode.AUDIOFASTFORWARD