Skip to content

lexer: fix lexing 123$abc & string continuation validation #1214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Jun 27, 2026
Merged

lexer: fix lexing 123$abc & string continuation validation #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion crates/squawk_lexer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ impl Cursor<'_> {

fn finish_base_prefixed_int(&mut self, base: Base, has_digits: bool) -> LiteralKind {
let trailing_junk_start = self.pos_within_token();
self.eat_while(is_ident_cont);
self.eat_identifier();
let has_trailing_junk = self.pos_within_token() > trailing_junk_start;
LiteralKind::Int {
base,
Expand Down Expand Up @@ -733,6 +733,34 @@ $foo$hello$world$bar$
"#))
}

#[test]
fn numeric_base_prefix_does_not_swallow_dollar_tokens() {
assert_debug_snapshot!(lex("123$abc 0b101$2 0o12$abc 0x12$abc 0xFF$1 0x1$$foo$$ 123$$foo$$"), @r#"
[
"123" @ Literal { kind: Int { base: Decimal, empty_int: false, trailing_junk_start: 3 } },
"$abc" @ PositionalParam { trailing_junk_start: 1 },
" " @ Whitespace,
"0b101" @ Literal { kind: Int { base: Binary, empty_int: false, trailing_junk_start: 5 } },
"$2" @ PositionalParam { trailing_junk_start: 2 },
" " @ Whitespace,
"0o12" @ Literal { kind: Int { base: Octal, empty_int: false, trailing_junk_start: 4 } },
"$abc" @ PositionalParam { trailing_junk_start: 1 },
" " @ Whitespace,
"0x12" @ Literal { kind: Int { base: Hexadecimal, empty_int: false, trailing_junk_start: 4 } },
"$abc" @ PositionalParam { trailing_junk_start: 1 },
" " @ Whitespace,
"0xFF" @ Literal { kind: Int { base: Hexadecimal, empty_int: false, trailing_junk_start: 4 } },
"$1" @ PositionalParam { trailing_junk_start: 2 },
" " @ Whitespace,
"0x1" @ Literal { kind: Int { base: Hexadecimal, empty_int: false, trailing_junk_start: 3 } },
"$$foo$$" @ Literal { kind: DollarQuotedString { terminated: true } },
" " @ Whitespace,
"123" @ Literal { kind: Int { base: Decimal, empty_int: false, trailing_junk_start: 3 } },
"$$foo$$" @ Literal { kind: DollarQuotedString { terminated: true } },
]
"#);
}

#[test]
fn numeric_with_seperators() {
assert_debug_snapshot!(lex(r#"
Expand Down
Loading
Loading