hal8174/simple-sat-solver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace owned strings with references in expressions

Browse source
This commit is contained in:
hal8174 2024-10-11 23:33:04 +02:00
parent bab9cd1e1a
commit c23697d386
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/expr.rs
View file

@ -3,11 +3,11 @@ use miette::{miette, Context, Result};
use std::collections::HashMap; use std::collections::HashMap;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum Expr { pub enum Expr<'s> {
Literal(String), Literal(&'s str),
Not(Box<Expr>), Not(Box<Expr<'s>>),
And(Vec<Expr>), And(Vec<Expr<'s>>),
Or(Vec<Expr>), Or(Vec<Expr<'s>>),
} }
#[derive(Debug)] #[derive(Debug)]
@ -88,11 +88,11 @@ impl<'s> Iterator for Tokanizer<'s> {
} }
} }
impl Expr { impl<'s> Expr<'s> {
fn parse_expr(tokanizer: &mut Tokanizer) -> Result<Expr> { fn parse_expr(tokanizer: &mut Tokanizer<'s>) -> Result<Expr<'s>> {
if let Some(token) = tokanizer.next().transpose()? { if let Some(token) = tokanizer.next().transpose()? {
match token { match token {
Token::Literal(l) => Ok(Expr::Literal(l.to_string())), Token::Literal(l) => Ok(Expr::Literal(l)),
Token::Not => Ok(Expr::Not(Box::new(Self::parse_expr(tokanizer)?))), Token::Not => Ok(Expr::Not(Box::new(Self::parse_expr(tokanizer)?))),
Token::ParenOpen => { Token::ParenOpen => {
let first_expr = Self::parse_expr(tokanizer)?; let first_expr = Self::parse_expr(tokanizer)?;
@ -157,7 +157,7 @@ impl Expr {
} }
} }
pub fn parse(input: &str) -> Result<Self> { pub fn parse(input: &'s str) -> Result<Self> {
let mut v = Vec::new(); let mut v = Vec::new();
for (i, line) in input.lines().enumerate() { for (i, line) in input.lines().enumerate() {
let mut tokanizer = Tokanizer::new(line); let mut tokanizer = Tokanizer::new(line);
@ -275,7 +275,7 @@ impl Expr {
} }
} }
pub fn to_dpll_cnf(self) -> (Vec<Vec<Index>>, HashMap<String, Index>) { pub fn to_dpll_cnf(self) -> (Vec<Vec<Index>>, HashMap<&'s str, Index>) {
let mut map = HashMap::new(); let mut map = HashMap::new();
let mut cnf = Vec::new(); let mut cnf = Vec::new();