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

display bloc

Browse source
This commit is contained in:
WanderingPenwing 2024-12-13 18:26:58 +01:00
parent 1969e1bd8c
commit fb79b520d4
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/pendragon/debug.rs
View file

@ -119,10 +119,10 @@ impl fmt::Display for ErreurPendragon {
impl fmt::Display for Commande { impl fmt::Display for Commande {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//' fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//'
match self { match self {
Self::Definis(nom, type_element) => write!(f, "Definis {} comme {}.", nom, type_element.nom()), Self::Definis(nom, type_element) => write!(f, "{}:{}", nom, type_element.nom()),
Self::Demande(nom) => write!(f, "Demande {}.", nom), Self::Demande(nom) => write!(f, "{}?", nom),
Self::Modifie(nom, expression) => write!(f, "Modifie {} avec {:?}.", nom, expression), Self::Modifie(nom, expression) => write!(f, "{}={:?}", nom, expression),
Self::Affiche(expression) => write!(f, "Affiche {:?}.", expression), Self::Affiche(expression) => write!(f, "#{:?}", expression),
} }
} }
} }
@ -190,9 +190,14 @@ impl fmt::Display for Operateur {
impl fmt::Display for Programme { impl fmt::Display for Programme {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//' fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//'
let mut texte: String = format!("variables : {:?}", self.variables); let mut texte: String = format!("variables : {:?}\n", self.variables);
for (index, phrase) in self.contenu.iter().enumerate() { let mut nombre_retour: usize = 0;
texte += &format!("\n#{:2}-{}", index+1, phrase); for phrase in &self.contenu {
if texte.len()/30 > nombre_retour {
texte += "\n";
nombre_retour = texte.len()/30;
}
texte += &format!("{}, ", phrase);
} }
write!(f, "{}", texte) write!(f, "{}", texte)
} }
@ -202,7 +207,22 @@ impl fmt::Display for Phrase {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//' fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//'
match self { match self {
Self::Commande(commande) => write!(f, "{}", commande), Self::Commande(commande) => write!(f, "{}", commande),
Self::Bloc(_bloc) => write!(f, "bloc inconnu"), Self::Bloc(bloc) => write!(f, "{}", bloc),
} }
} }
} }
impl fmt::Display for Bloc {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {//'
let mut texte: String = format!("\n[{:?}] : [", self.condition);
let mut nombre_retour: usize = 0;
for phrase in &self.contenu {
if texte.len()/30 > nombre_retour {
texte += "\n";
nombre_retour = texte.len()/30;
}
texte += &format!("{}, ", phrase);
}
write!(f, "{}]", texte)
}
}

4
src/pendragon/structure.rs
View file

@ -69,8 +69,8 @@ impl Programme {
} }
pub struct Bloc { pub struct Bloc {
condition: Vec<Element>, pub condition: Vec<Element>,
contenu: Vec<Phrase>, pub contenu: Vec<Phrase>,
} }
impl Bloc { impl Bloc {