fixed some clippy errors

This commit is contained in:
2025-06-19 15:44:42 +01:00
parent c1d72e8d4c
commit d5a690563b
9 changed files with 26 additions and 53 deletions
+3 -3
View File
@@ -1,11 +1,11 @@
use common::{
args, instructions,
args,
prelude::{ITypeArgs, Instruction, Interrupt, RTypeArgs, Register},
};
use crate::{
AssembleError, expect_token, expect_type,
model::{Node, Opcode, Token, TokenType},
AssembleError, Token, TokenType, expect_token,
model::{Node, Opcode},
};
pub fn codegen(nodes: Vec<Node>) -> Result<Vec<Instruction>, AssembleError> {
+4 -4
View File
@@ -1,7 +1,7 @@
use common::prelude::Register;
use crate::{
AssembleError, dsa, expect_token, expect_type,
AssembleError, expect_token, expect_type,
model::{Node, Opcode, Token, TokenType},
node,
};
@@ -13,7 +13,7 @@ pub fn expand_pseudo_ops(
let mut result = Vec::<Node>::with_capacity(nodes.len());
for node in nodes.iter_mut() {
if let Err(_) = try_expand(node.clone(), &mut result, module) {
if try_expand(node.clone(), &mut result, module).is_err() {
result.push(node.clone());
}
}
@@ -22,9 +22,9 @@ pub fn expand_pseudo_ops(
}
fn try_expand(
mut node: Node,
node: Node,
result: &mut Vec<Node>,
module: u64,
_module: u64,
) -> Result<(), AssembleError> {
match node.opcode() {
Opcode::Push => expand_push(node.clone(), result)?,
+3 -33
View File
@@ -1,9 +1,9 @@
use std::path::PathBuf;
use common::prelude::{Instruction, Register};
use common::prelude::Register;
use crate::model::{Module, Node, Opcode, Symbol, Token, TokenType};
use crate::{AssembleError, dsa, expect_token, expect_type, node, quick_hash};
use crate::model::{Node, Opcode, Token, TokenType};
use crate::{AssembleError, expect_token, expect_type, node};
pub struct Parser {
tokens: Vec<Token>,
@@ -302,34 +302,4 @@ impl Parser {
Ok(self.tokens.last().unwrap().clone())
}
}
fn expect(&mut self, type_: TokenType) -> Result<Token, AssembleError> {
let tok = self.next()?;
if TokenType::from_token(&tok) == type_ {
Ok(tok)
} else {
Err(AssembleError::UnexpectedToken(tok, type_))
}
}
fn expect_any(&mut self, types: &[TokenType]) -> Result<Token, AssembleError> {
let tok = self.next()?;
if types.contains(&TokenType::from_token(&tok)) {
Ok(tok)
} else {
Err(AssembleError::UnexpectedToken(tok, types[0]))
}
}
fn maybe_expect(&mut self, types: &[TokenType]) -> Option<Token> {
let tok = self.peek_next().ok()?;
if types.contains(&TokenType::from_token(&tok)) {
Some(tok.clone())
} else {
None
}
}
}
+1 -1
View File
@@ -9,7 +9,7 @@ use crate::{
};
pub fn resolve_symbols(nodes: &mut Vec<Node>) -> Result<(), AssembleError> {
let symbol_table = generate_symbol_table(&nodes)?;
let symbol_table = generate_symbol_table(nodes)?;
for node in nodes.iter_mut() {
match node.opcode() {