From a2a7647c9085270694c254b6ae43053c7a239029 Mon Sep 17 00:00:00 2001 From: Daniel Gavin Date: Mon, 20 Sep 2021 20:12:13 +0200 Subject: [PATCH] Fix '>>' operand being tokenized correctly and switch statement with bare semicolon. --- core/odin/parser/parser.odin | 2 +- core/odin/tokenizer/tokenizer.odin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/odin/parser/parser.odin b/core/odin/parser/parser.odin index 8aa49f847..503836ec9 100644 --- a/core/odin/parser/parser.odin +++ b/core/odin/parser/parser.odin @@ -786,7 +786,7 @@ parse_control_statement_semicolon_separator :: proc(p: ^Parser) -> bool { if tok.kind != .Open_Brace { return allow_token(p, .Semicolon) } - if tok.text == ";" { + if p.curr_tok.text == ";" { return allow_token(p, .Semicolon) } return false diff --git a/core/odin/tokenizer/tokenizer.odin b/core/odin/tokenizer/tokenizer.odin index dde59ff30..c06d05e1d 100644 --- a/core/odin/tokenizer/tokenizer.odin +++ b/core/odin/tokenizer/tokenizer.odin @@ -666,7 +666,7 @@ scan :: proc(t: ^Tokenizer) -> Token { case '=': advance_rune(t) kind = .Gt_Eq - case '<': + case '>': advance_rune(t) kind = .Shr if t.ch == '=' {