From d34136f70b0fe850ff24fcb562aa64a5a8f6249a Mon Sep 17 00:00:00 2001 From: ParkerTenBroeck <51721964+ParkerTenBroeck@users.noreply.github.com> Date: Sun, 21 Dec 2025 10:35:23 -0500 Subject: [PATCH] cleaned up warnings --- src/automata/dfa.rs | 20 +++++++++----------- src/automata/npda.rs | 1 + src/loader/ast.rs | 10 +++++----- src/loader/parser.rs | 29 ++++++++++++++--------------- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/automata/dfa.rs b/src/automata/dfa.rs index 95e41dc..651bc97 100644 --- a/src/automata/dfa.rs +++ b/src/automata/dfa.rs @@ -1,12 +1,10 @@ -use super::*; +// pub struct TransitionTable { +// initial: State, +// state_names: Vec, +// // transitions: Vec>, +// final_states: Vec, +// } -pub struct TransitionTable { - initial: State, - state_names: Vec, - // transitions: Vec>, - final_states: Vec, -} - -pub struct DFA { - state: State, -} +// pub struct DFA { +// state: State, +// } diff --git a/src/automata/npda.rs b/src/automata/npda.rs index 4d14906..baf0ff1 100644 --- a/src/automata/npda.rs +++ b/src/automata/npda.rs @@ -6,6 +6,7 @@ use super::*; struct To(State, Vec); #[derive(Clone, Debug)] +#[allow(unused)] pub struct TransitionTable { initial_state: State, initial_stack: Symbol, diff --git a/src/loader/ast.rs b/src/loader/ast.rs index d1c36d9..c230132 100644 --- a/src/loader/ast.rs +++ b/src/loader/ast.rs @@ -112,14 +112,14 @@ impl<'a> Spanned> { } impl<'a, 'b> Spanned<&'b Tuple<'a>> { - pub fn expect_dfa_transition(&self, logs: &mut Logs<'a>) -> ! { + pub fn expect_dfa_transition(&self, _: &mut Logs<'a>) -> ! { todo!() } - pub fn expect_nfa_transition(&self, logs: &mut Logs<'a>) -> ! { + pub fn expect_nfa_transition(&self, _: &mut Logs<'a>) -> ! { todo!() } - pub fn expect_dpda_transition(&self, logs: &mut Logs<'a>) -> ! { + pub fn expect_dpda_transition(&self, _: &mut Logs<'a>) -> ! { todo!() } @@ -162,10 +162,10 @@ impl<'a, 'b> Spanned<&'b Tuple<'a>> { None } - pub fn expect_tm_transition(&self, logs: &mut Logs<'a>) -> ! { + pub fn expect_tm_transition(&self, _: &mut Logs<'a>) -> ! { todo!() } - pub fn expect_ntm_transition(&self, logs: &mut Logs<'a>) -> ! { + pub fn expect_ntm_transition(&self, _: &mut Logs<'a>) -> ! { todo!() } } diff --git a/src/loader/parser.rs b/src/loader/parser.rs index c0dccd8..e5ef7be 100644 --- a/src/loader/parser.rs +++ b/src/loader/parser.rs @@ -3,27 +3,26 @@ use crate::loader::{Span, Spanned}; use super::ast::*; use super::lexer::{Lexer, Token}; -use std::iter::Peekable; pub struct Parser<'a> { lexer: Lexer<'a>, peek: Option>>, logs: Logs<'a>, - src: &'a str, - eof: Span, } impl<'a> Parser<'a> { pub fn new(lexer: Lexer<'a>) -> Self { Parser { - eof: lexer.eof_span(), - src: lexer.input(), logs: Logs::new(lexer.input()), peek: None, lexer, } } + pub fn eof(&self) -> Span{ + self.lexer.eof_span() + } + fn next_token(&mut self) -> Option>> { if self.peek.is_some(){ return self.peek.take() @@ -57,8 +56,8 @@ impl<'a> Parser<'a> { } } else { self.logs - .emit_error(format!("unexpected eof expected {:#}", expected), self.eof); - (false, self.eof) + .emit_error(format!("unexpected eof expected {:#}", expected), self.eof()); + (false, self.eof()) } } @@ -87,9 +86,9 @@ impl<'a> Parser<'a> { Token::Tilde, Token::Ident("") ), - self.eof, + self.eof(), ); - Spanned(Symbol::Ident(""), self.eof) + Spanned(Symbol::Ident(""), self.eof()) } } } @@ -109,7 +108,7 @@ impl<'a> Parser<'a> { if self.peek_token().is_none() { self.logs.emit_error( format!("unexpected eof expected {:}", Token::RPar), - self.eof, + self.eof(), ); break; } @@ -153,9 +152,9 @@ impl<'a> Parser<'a> { Token::LBrace, Token::LBracket, ), - self.eof, + self.eof(), ); - Spanned(Item::Symbol(Symbol::Ident("")), self.eof) + Spanned(Item::Symbol(Symbol::Ident("")), self.eof()) } } } @@ -185,9 +184,9 @@ impl<'a> Parser<'a> { Token::RBrace, Token::RBracket ), - self.eof, + self.eof(), ); - return Spanned(List(Vec::new()), self.eof); + return Spanned(List(Vec::new()), self.eof()); } }; @@ -198,7 +197,7 @@ impl<'a> Parser<'a> { } if self.peek_token().is_none() { self.logs - .emit_error(format!("unexpected eof expected {:}", match_end), self.eof); + .emit_error(format!("unexpected eof expected {:}", match_end), self.eof()); break; } }