From 0f8f16509800159fe823ae1cb5d0b5af4a9e033e Mon Sep 17 00:00:00 2001
From: MarvelousAnything <marvelousanything@gmail.com>
Date: Sat, 12 Nov 2022 23:31:45 -0500
Subject: [PATCH] Fixed some clippy issues.
---
src/lex/lexer.rs | 12 +++++++++---
src/lex/token.rs | 9 +++------
src/lex/types.rs | 6 +++---
src/parser/mod.rs | 2 +-
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/lex/lexer.rs b/src/lex/lexer.rs
index 9f1c01e..cc2c9b9 100644
--- a/src/lex/lexer.rs
+++ b/src/lex/lexer.rs
@@ -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()
+ }
+}
diff --git a/src/lex/token.rs b/src/lex/token.rs
index f85b886..a02a208 100644
--- a/src/lex/token.rs
+++ b/src/lex/token.rs
@@ -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(_))
)
}
diff --git a/src/lex/types.rs b/src/lex/types.rs
index 3b8f536..cd79305 100644
--- a/src/lex/types.rs
+++ b/src/lex/types.rs
@@ -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),
}
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index ae08832..2f4ef42 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -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");
}
}
--
GitLab