goren/skylang
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improved lexer :p

Browse source
This commit is contained in:
Goren Barak 2023-11-24 13:23:19 -05:00
parent 18063364c3
commit cfdb31ed7a
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lex/tok.rs
View file

@ -5,7 +5,7 @@ use core::iter::Peekable;
pub use TokenType::*; pub use TokenType::*;
#[derive(Debug, Logos)] #[derive(Debug, Logos, PartialEq, Eq)]
#[logos(skip r"[ \t\n\f]+")] #[logos(skip r"[ \t\n\f]+")]
pub enum TokenType { pub enum TokenType {
// SINGLE CHARACTER TOKENS // SINGLE CHARACTER TOKENS
@ -81,11 +81,11 @@ pub enum TokenType {
GreaterEqual, // >= GreaterEqual, // >=
// LITERALS // LITERALS
#[regex("(\"[^\".+]\")|('[^'.+]')")] #[regex(r#"("[^"]*")|('[^']*')"#)]
String, // A string literal. String, // A string literal.
#[regex("[0-9]+")] #[regex("[0-9]+")]
Number, // An integer. Number, // An integer.
#[regex(r#"[^[0-9]^"^-^[ \t\n\f]^\.^=^(^)^{^}.]+[^"^-^=^\..^[ \t\n\f]^(^)^{^}]*"#)] #[regex(r#"[^[0-9]^"^-^[ \t\n\f]^\.^=^(^)^{^}.^,^;]+[^"^-^=^\..^[ \t\n\f]^(^)^{^}^,^;]*"#)]
Identifier, // An identifier. Identifier, // An identifier.
#[token("true")] #[token("true")]
True, // true True, // true
@ -95,11 +95,12 @@ pub enum TokenType {
Null, // none Null, // none
} }
pub fn lex_str(this: &str) -> Vec<TokenType> { pub fn lex_str(this: &str) -> Vec<(TokenType, &str)> {
println!("\"{}\"", this);
let mut buf = Vec::new(); let mut buf = Vec::new();
let mut lexer = TokenType::lexer(this); let mut lexer = TokenType::lexer(this);
while let Some(Ok(token)) = lexer.next() { while let Some(Ok(token)) = lexer.next() {
buf.push(token); buf.push((token, lexer.slice()));
} }
buf buf

2
src/main.rs
View file

@ -42,5 +42,5 @@ fn main() {
// println!("{}", fc); // println!("{}", fc);
println!("{:?}", lex_str("fnaf main() {}")); println!("{:#?}", lex_str("macro_rules! println { () => {} }"))
} }