penwing/Pendragon
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

comp error

Browse source
This commit is contained in:
WanderingPenwing 2024-12-10 15:26:23 +01:00
parent 0bffeedd78
commit 989f1f17fd
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/pendragon/booleen.rs
View file

@ -5,9 +5,16 @@ impl Pendragon {
let texte = arguments
.replace("ouvre la parenthèse", "ouvre-la-parenthese")
.replace("ferme la parenthèse", "ferme-la-parenthese");
.replace("est égal à", "est-egal-a");
.replace("est différent de", "est-different-de");
.replace("est supérieur ou égal à", "est-superieur-ou-egal-a");
.replace("est inférieur ou égal à", "est-inferieur-ou-egal-a");
.replace("est supérieur à", "est-superieur-a");
.replace("est inférieur à", "est-inferieur-a");
let elements_texte: Vec<&str> = texte.split(" ").collect();
let mut expression: Vec<Element> = Vec::new();
let mut pile_operateurs: Vec<Operateur> = Vec::new();
let mut comparaison: Vec<Element> = Vec::new();
for element in elements_texte {
match element {

17
src/pendragon/structure.rs
View file

@ -152,6 +152,7 @@ pub enum Element {
Booleen(bool),
Variable(String, TypeElement),
Operateur(Operateur),
Comparaison(Comparaison),
}
impl Element {
@ -159,7 +160,7 @@ impl Element {
match self {
Self::Entier(_) => TypeElement::Entier,
Self::Texte(_) => TypeElement::Texte,
Self::Booleen(_) => TypeElement::Booleen,
Self::Booleen(_) || Self::Comparaison(_) => TypeElement::Booleen,
Self::Variable(_, type_element) => type_element.clone(),
Self::Operateur(operateur) => operateur.type_element(),
}
@ -189,3 +190,17 @@ impl Operateur {
}
}
}
pub enum Comparaison {
Egal(Element, Element),
Different(Element, Element),
Superieur(Element, Element),
Inferieur(Element, Element),
SuperieurEgal(Element, Element),
InferieurEgal(Element, Element)
}