aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <gingerBill@users.noreply.github.com>2021-03-30 11:47:45 +0100
committerGitHub <noreply@github.com>2021-03-30 11:47:45 +0100
commitbc5e80d7d652bd6bd5148161ebbcb1e7e148f259 (patch)
treec8e634c579548626eb36ef779b55ecd8291f3d8b
parent2c14accfd0c1018a26bc4943f8bdee50859d0409 (diff)
parentc429c85aded26d7b9693fc391977b4e2627464df (diff)
Merge pull request #885 from DanielGavin/parser
Parser fixes
-rw-r--r--core/odin/parser/parser.odin4
-rw-r--r--core/odin/tokenizer/tokenizer.odin2
2 files changed, 1 insertions, 5 deletions
diff --git a/core/odin/parser/parser.odin b/core/odin/parser/parser.odin
index db5d7ade2..2b657f76f 100644
--- a/core/odin/parser/parser.odin
+++ b/core/odin/parser/parser.odin
@@ -1564,10 +1564,6 @@ check_field_flag_prefixes :: proc(p: ^Parser, name_count: int, allowed_flags, se
}
}
- if .Using in allowed_flags && .Using in flags {
- flags &~= {.Using};
- }
-
return flags;
}
diff --git a/core/odin/tokenizer/tokenizer.odin b/core/odin/tokenizer/tokenizer.odin
index 0e9360166..e00dccde9 100644
--- a/core/odin/tokenizer/tokenizer.odin
+++ b/core/odin/tokenizer/tokenizer.odin
@@ -235,7 +235,7 @@ scan_raw_string :: proc(t: ^Tokenizer) -> string {
for {
ch := t.ch;
- if ch == '\n' || ch < 0 {
+ if ch == utf8.RUNE_EOF {
error(t, offset, "raw string literal was not terminated");
break;
}