cleaned up warnings

This commit is contained in:
ParkerTenBroeck 2025-12-21 10:35:23 -05:00
parent 0e285ec100
commit d34136f70b
4 changed files with 29 additions and 31 deletions

View file

@ -1,12 +1,10 @@
use super::*; // pub struct TransitionTable {
// initial: State,
// state_names: Vec<String>,
// // transitions: Vec<SymbolMap<State>>,
// final_states: Vec<bool>,
// }
pub struct TransitionTable { // pub struct DFA {
initial: State, // state: State,
state_names: Vec<String>, // }
// transitions: Vec<SymbolMap<State>>,
final_states: Vec<bool>,
}
pub struct DFA {
state: State,
}

View file

@ -6,6 +6,7 @@ use super::*;
struct To(State, Vec<Symbol>); struct To(State, Vec<Symbol>);
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[allow(unused)]
pub struct TransitionTable { pub struct TransitionTable {
initial_state: State, initial_state: State,
initial_stack: Symbol, initial_stack: Symbol,

View file

@ -112,14 +112,14 @@ impl<'a> Spanned<Item<'a>> {
} }
impl<'a, 'b> Spanned<&'b Tuple<'a>> { 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!() todo!()
} }
pub fn expect_nfa_transition(&self, logs: &mut Logs<'a>) -> ! { pub fn expect_nfa_transition(&self, _: &mut Logs<'a>) -> ! {
todo!() todo!()
} }
pub fn expect_dpda_transition(&self, logs: &mut Logs<'a>) -> ! { pub fn expect_dpda_transition(&self, _: &mut Logs<'a>) -> ! {
todo!() todo!()
} }
@ -162,10 +162,10 @@ impl<'a, 'b> Spanned<&'b Tuple<'a>> {
None None
} }
pub fn expect_tm_transition(&self, logs: &mut Logs<'a>) -> ! { pub fn expect_tm_transition(&self, _: &mut Logs<'a>) -> ! {
todo!() todo!()
} }
pub fn expect_ntm_transition(&self, logs: &mut Logs<'a>) -> ! { pub fn expect_ntm_transition(&self, _: &mut Logs<'a>) -> ! {
todo!() todo!()
} }
} }

View file

@ -3,27 +3,26 @@ use crate::loader::{Span, Spanned};
use super::ast::*; use super::ast::*;
use super::lexer::{Lexer, Token}; use super::lexer::{Lexer, Token};
use std::iter::Peekable;
pub struct Parser<'a> { pub struct Parser<'a> {
lexer: Lexer<'a>, lexer: Lexer<'a>,
peek: Option<Spanned<Token<'a>>>, peek: Option<Spanned<Token<'a>>>,
logs: Logs<'a>, logs: Logs<'a>,
src: &'a str,
eof: Span,
} }
impl<'a> Parser<'a> { impl<'a> Parser<'a> {
pub fn new(lexer: Lexer<'a>) -> Self { pub fn new(lexer: Lexer<'a>) -> Self {
Parser { Parser {
eof: lexer.eof_span(),
src: lexer.input(),
logs: Logs::new(lexer.input()), logs: Logs::new(lexer.input()),
peek: None, peek: None,
lexer, lexer,
} }
} }
pub fn eof(&self) -> Span{
self.lexer.eof_span()
}
fn next_token(&mut self) -> Option<Spanned<Token<'a>>> { fn next_token(&mut self) -> Option<Spanned<Token<'a>>> {
if self.peek.is_some(){ if self.peek.is_some(){
return self.peek.take() return self.peek.take()
@ -57,8 +56,8 @@ impl<'a> Parser<'a> {
} }
} else { } else {
self.logs self.logs
.emit_error(format!("unexpected eof expected {:#}", expected), self.eof); .emit_error(format!("unexpected eof expected {:#}", expected), self.eof());
(false, self.eof) (false, self.eof())
} }
} }
@ -87,9 +86,9 @@ impl<'a> Parser<'a> {
Token::Tilde, Token::Tilde,
Token::Ident("") Token::Ident("")
), ),
self.eof, self.eof(),
); );
Spanned(Symbol::Ident("<INVALID>"), self.eof) Spanned(Symbol::Ident("<INVALID>"), self.eof())
} }
} }
} }
@ -109,7 +108,7 @@ impl<'a> Parser<'a> {
if self.peek_token().is_none() { if self.peek_token().is_none() {
self.logs.emit_error( self.logs.emit_error(
format!("unexpected eof expected {:}", Token::RPar), format!("unexpected eof expected {:}", Token::RPar),
self.eof, self.eof(),
); );
break; break;
} }
@ -153,9 +152,9 @@ impl<'a> Parser<'a> {
Token::LBrace, Token::LBrace,
Token::LBracket, Token::LBracket,
), ),
self.eof, self.eof(),
); );
Spanned(Item::Symbol(Symbol::Ident("<INVALID>")), self.eof) Spanned(Item::Symbol(Symbol::Ident("<INVALID>")), self.eof())
} }
} }
} }
@ -185,9 +184,9 @@ impl<'a> Parser<'a> {
Token::RBrace, Token::RBrace,
Token::RBracket 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() { if self.peek_token().is_none() {
self.logs self.logs
.emit_error(format!("unexpected eof expected {:}", match_end), self.eof); .emit_error(format!("unexpected eof expected {:}", match_end), self.eof());
break; break;
} }
} }