Skip to content
Snippets Groups Projects
Commit 0f8f1650 authored by MarvelousAnything's avatar MarvelousAnything
Browse files

Fixed some clippy issues.

parent d31d3265
Branches
No related tags found
No related merge requests found
......@@ -344,7 +344,7 @@ impl Lexer {
"Collected integer: {} at {}:{}[{}] to {}:{}[{}]",
integer, start.1, start.2, start.0, self.line_no, self.col_no, self.index
);
TokenType::Literal(LiteralToken::IntegerLiteral(integer))
TokenType::Literal(LiteralToken::Integer(integer))
}
'"' => {
self.advance()?;
......@@ -353,7 +353,7 @@ impl Lexer {
"Collected string: \"{}\" at {}:{}[{}] to {}:{}[{}]",
string, start.1, start.2, start.0, self.line_no, self.col_no, self.index
);
TokenType::Literal(LiteralToken::StringLiteral(string))
TokenType::Literal(LiteralToken::String(string))
}
'\'' => {
self.advance()?;
......@@ -366,7 +366,7 @@ impl Lexer {
"Collected character literal: {:?} at {}:{}[{}] to {}:{}[{}]",
character, start.1, start.2, start.0, self.line_no, self.col_no, self.index
);
TokenType::Literal(LiteralToken::CharacterLiteral(character))
TokenType::Literal(LiteralToken::Character(character))
}
'#' => {
debug!(
......@@ -382,3 +382,9 @@ impl Lexer {
Ok(token)
}
}
impl Default for Lexer {
fn default() -> Self {
Self::new()
}
}
......@@ -52,21 +52,18 @@ impl Token {
pub fn is_integer_literal(&self) -> bool {
matches!(
self.token_type,
TokenType::Literal(LiteralToken::IntegerLiteral(_))
TokenType::Literal(LiteralToken::Integer(_))
)
}
pub fn is_string_literal(&self) -> bool {
matches!(
self.token_type,
TokenType::Literal(LiteralToken::StringLiteral(_))
)
matches!(self.token_type, TokenType::Literal(LiteralToken::String(_)))
}
pub fn is_character_literal(&self) -> bool {
matches!(
self.token_type,
TokenType::Literal(LiteralToken::CharacterLiteral(_))
TokenType::Literal(LiteralToken::Character(_))
)
}
......
......@@ -81,7 +81,7 @@ impl SyntaxToken {
#[derive(Debug, Eq, PartialEq, Clone)]
pub enum LiteralToken {
CharacterLiteral(char),
IntegerLiteral(i64),
StringLiteral(String),
Character(char),
Integer(i64),
String(String),
}
......@@ -6,7 +6,7 @@ pub struct Parser {
impl Parser {
// This should parse a token stream into an AST.
pub fn parse(tokens: TokenStream) {
pub fn parse(_tokens: TokenStream) {
todo!("Implement parser");
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment