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

Unify peek_n with peek and renamescan_peek_n to peek_token

Browse Source
This commit is contained in:
gingerBill
2020-12-07 12:13:41 +00:00
parent b9aa94ee0d
commit 7b55068b04
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/text/scanner/scanner.odin
+10 -16
View File
@@ -150,32 +150,26 @@ next :: proc(s: ^Scanner) -> rune {
return ch; return ch;
} }
peek :: proc(s: ^Scanner) -> rune { peek :: proc(s: ^Scanner, n := 0) -> (ch: rune) {
if s.ch == -2 { if s.ch == -2 {
s.ch = advance(s); s.ch = advance(s);
if s.ch == '\ufeff' { // Ignore BOM if s.ch == '\ufeff' { // Ignore BOM
s.ch = advance(s); s.ch = advance(s);
} }
} }
return s.ch; ch = s.ch;
} if n > 0 {
prev_s := s^;
peek_n :: proc(s: ^Scanner, n: int) -> rune { for in 0..<n {
assert(n >= 0); next(s);
if n == 0 { }
return peek(s); ch = s.ch;
s^ = prev_s;
} }
prev_s := s^;
for in 0..<n {
next(s);
}
ch := peek(s);
s^ = prev_s;
return ch; return ch;
} }
scan_peek_n :: proc(s: ^Scanner, n: int) -> (tok: rune) { peek_token :: proc(s: ^Scanner, n := 0) -> (tok: rune) {
assert(n >= 0); assert(n >= 0);
prev_s := s^; prev_s := s^;
for in 0..<n { for in 0..<n {