Skip to content

Commit

Permalink
internal: improve TokenSet implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
davidsemakula committed Apr 15, 2024
1 parent 5dbe3fe commit 89779ca
Showing 1 changed file with 22 additions and 8 deletions.
30 changes: 22 additions & 8 deletions crates/parser/src/token_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,46 @@ use crate::SyntaxKind;

/// A bit-set of `SyntaxKind`s
#[derive(Clone, Copy)]
pub(crate) struct TokenSet(u128);
pub(crate) struct TokenSet([u64; 3]);

const LAST_TOKEN_KIND_DISCRIMINANT: usize = SyntaxKind::SHEBANG as usize;

impl TokenSet {
pub(crate) const EMPTY: TokenSet = TokenSet(0);
pub(crate) const EMPTY: TokenSet = TokenSet([0; 3]);

pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet {
let mut res = 0u128;
let mut res = [0; 3];
let mut i = 0;
while i < kinds.len() {
res |= mask(kinds[i]);
let kind = kinds[i];
debug_assert!(
kind as usize <= LAST_TOKEN_KIND_DISCRIMINANT,
"Expected a token `SyntaxKind`"
);
let idx = kind as usize / 64;
res[idx] |= mask(kind);
i += 1;
}
TokenSet(res)
}

pub(crate) const fn union(self, other: TokenSet) -> TokenSet {
TokenSet(self.0 | other.0)
TokenSet([self.0[0] | other.0[0], self.0[1] | other.0[1], self.0[2] | other.0[2]])
}

pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool {
self.0 & mask(kind) != 0
debug_assert!(
kind as usize <= LAST_TOKEN_KIND_DISCRIMINANT,
"Expected a token `SyntaxKind`"
);
let idx = kind as usize / 64;
self.0[idx] & mask(kind) != 0
}
}

const fn mask(kind: SyntaxKind) -> u128 {
1u128 << (kind as usize)
const fn mask(kind: SyntaxKind) -> u64 {
debug_assert!(kind as usize <= LAST_TOKEN_KIND_DISCRIMINANT, "Expected a token `SyntaxKind`");
1 << (kind as usize % 64)
}

#[test]
Expand Down

0 comments on commit 89779ca

Please sign in to comment.