Outline for swizzling support
Some checks failed
/ build (push) Failing after 1m41s

This commit is contained in:
xqtc 2024-07-12 00:13:32 +02:00
parent 3ee31b795c
commit 4243a5d482
2 changed files with 40 additions and 1 deletions

View file

@ -34,18 +34,23 @@ impl crate::Lexer {
pub fn consume_number(&mut self) -> crate::Token { pub fn consume_number(&mut self) -> crate::Token {
let mut number = String::new(); let mut number = String::new();
let mut is_float = false; let mut is_float = false;
let mut is_swizzle = false;
while let Some(c) = self.current_char { while let Some(c) = self.current_char {
if c.is_digit(10) { if c.is_digit(10) {
number.push(c); number.push(c);
self.advance(); self.advance();
} else if c == '.' { } else if c == '.' && self.peek().map_or(false, |c| c.is_digit(10))
|| self.peek() == Some('f')
{
if number.is_empty() { if number.is_empty() {
number.push('0'); number.push('0');
} }
number.push(c); number.push(c);
is_float = true; is_float = true;
self.advance(); self.advance();
} else if c.is_alphabetic() {
is_swizzle = true;
} else { } else {
break; break;
} }

View file

@ -83,6 +83,20 @@ impl Lexer {
} }
/// Parses the source given the [`Lexer`] upon initialization and returns a vector of [`Token`]. /// Parses the source given the [`Lexer`] upon initialization and returns a vector of [`Token`].
/// # Example:
/// ```
/// use glsl_lexer::*;
/// let source = r#"
/// #version 440
/// uniform float time;
/// void main() {
/// gl_FragColor = vec4(1.0, 0.5, 0.2, 1.0);
/// }
/// "#;
/// let mut lexer = glsl_lexer::Lexer::new(&source);
/// let tokens = lexer.get_tokens();
/// dbg!("{}", tokens);
/// ```
pub fn get_tokens(&mut self) -> Vec<Token> { pub fn get_tokens(&mut self) -> Vec<Token> {
let mut tokens = Vec::new(); let mut tokens = Vec::new();
while let Some(c) = self.current_char { while let Some(c) = self.current_char {
@ -101,9 +115,11 @@ impl Lexer {
'+' | '-' | '*' | '/' | '%' | '&' | '|' | '^' | '!' | '=' | '<' | '>' | '?' => { '+' | '-' | '*' | '/' | '%' | '&' | '|' | '^' | '!' | '=' | '<' | '>' | '?' => {
tokens.push(self.consume_operator()); tokens.push(self.consume_operator());
} }
'{' | '}' | '(' | ')' | '#' | ',' | ';' => { '{' | '}' | '(' | ')' | '#' | ',' | ';' => {
tokens.push(self.consume_symbol()); tokens.push(self.consume_symbol());
} }
'.' => { '.' => {
tokens.push(self.consume_number()); tokens.push(self.consume_number());
} }
@ -225,6 +241,24 @@ mod tests {
assert_eq!(tokens, vec![Token::FloatLiteral(0.4504), Token::EOF]); assert_eq!(tokens, vec![Token::FloatLiteral(0.4504), Token::EOF]);
} }
#[test]
fn test_swizzling() {
init();
let source_code = "abcd.xyz";
let mut lexer = Lexer::new(source_code);
let tokens = lexer.get_tokens();
info!("[Swizzling] Tokens: {:#?}", tokens);
assert_eq!(
tokens,
vec![
Token::Identifier("abcd".to_string()),
Token::Symbol('.'),
Token::Identifier("xyz".to_string()),
Token::EOF
]
);
}
#[test] #[test]
fn test_operator() { fn test_operator() {
init(); init();