From 358c5da05bb45f931c33682fc437b12ebe1fa5ed Mon Sep 17 00:00:00 2001 From: MartinFillon Date: Mon, 4 Nov 2024 11:47:04 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Ajout=20de=20nouveaux=20identifiers=20tr?= =?UTF-8?q?=C3=A8s=20utiles=20pour=20faire=20un=20programme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rouille_proc_macro/src/lib.rs | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/rouille_proc_macro/src/lib.rs b/rouille_proc_macro/src/lib.rs index 491c123..1f45660 100644 --- a/rouille_proc_macro/src/lib.rs +++ b/rouille_proc_macro/src/lib.rs @@ -83,6 +83,58 @@ rouille_compilogenese::rouille! { "Ponctuation" => "Punct", "Litéral" => "Literal", "macro_procédurale" => "proc_macro", + "LectureBufferisée" => "BufRead", + "Lecture" => "Read", + "Écriture" => "Write", + "entrée_sortie" => "io", + "entrée" => "stdin", + "sortie" => "stdout", + "lire_ligne" => "read_line", + "écrire_ligne" => "write_line", + "écrire" => "write", + "est_vide" => "is_empty", + "est" => "is", + "verrouiller" => "lock", + "octets" => "bytes", + "chaîne" => "str", + "lire_exactement" => "read_exact", + "lire_jusqu'à" => "read_until", + "sépare" => "split", + "en_tant_que" => "as", + "Entier" => "Integer", + "ensuite" => "then", + "ensuite_valeur" => "then_some", + "déballer_ou" => "unwrap_or", + "déballer_ou_avec" => "unwrap_or_else", + "en" => "into", + "depuis_chaîne" => "from_str", + "Depuis" => "From", + "bien" => "ok", + "bien_ou" => "ok_or", + "bien_ou_avec" => "ok_or_else", + "en_tant_que_déréférencé" => "as_deref", + "en_tant_que_déréférencé_mutable" => "as_mut_deref", + "itérable" => "iter", + "itérable_mut" => "iter_mut", + "énumérer" => "enumerate", + "filtre" => "filter", + "filtre_applique" => "filter_map", + "applique" => "map", + "applique_ou" => "map_or", + "applique_ou_avec" => "map_or_else", + "pour_chaque" => "for_each", + "essayer_pour_chaque" => "try_for_each", + "applatir" => "flatten", + "compter" => "count", + "trouve" => "find", + "trouve_en_appliquant" => "find_map", + "tous" => "all", + "certains" => "any", + "récuperer" => "collect", + "copié" => "copied", + "cloné" => "cloned", + "Copiable" => "Copy", + "Clonable" => "Clone", _ => &identifiant_chaîne, }; From 9b0f9bbb86187b6851e6699fa9ec7bebe07166ce Mon Sep 17 00:00:00 2001 From: MartinFillon <114775771+MartinFillon@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:21:09 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Changement=20de=20valeur=20en=20quelque=20p?= =?UTF-8?q?our=20garder=20la=20coh=C3=A9rence?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Benjamin Bouvier --- rouille_proc_macro/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rouille_proc_macro/src/lib.rs b/rouille_proc_macro/src/lib.rs index 1f45660..e10f517 100644 --- a/rouille_proc_macro/src/lib.rs +++ b/rouille_proc_macro/src/lib.rs @@ -103,7 +103,7 @@ rouille_compilogenese::rouille! { "en_tant_que" => "as", "Entier" => "Integer", "ensuite" => "then", - "ensuite_valeur" => "then_some", + "ensuite_quelque" => "then_some", "déballer_ou" => "unwrap_or", "déballer_ou_avec" => "unwrap_or_else", "en" => "into", From 37696f8e55c421a139028d508db644a876ccbdde Mon Sep 17 00:00:00 2001 From: MartinFillon Date: Mon, 4 Nov 2024 22:27:13 +0100 Subject: [PATCH 3/5] mise en applique des suggestions faites sur ma fusio-demande --- rouille_proc_macro/src/lib.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/rouille_proc_macro/src/lib.rs b/rouille_proc_macro/src/lib.rs index e10f517..bfdac6f 100644 --- a/rouille_proc_macro/src/lib.rs +++ b/rouille_proc_macro/src/lib.rs @@ -98,15 +98,12 @@ rouille_compilogenese::rouille! { "octets" => "bytes", "chaîne" => "str", "lire_exactement" => "read_exact", - "lire_jusqu'à" => "read_until", "sépare" => "split", "en_tant_que" => "as", - "Entier" => "Integer", "ensuite" => "then", "ensuite_quelque" => "then_some", "déballer_ou" => "unwrap_or", "déballer_ou_avec" => "unwrap_or_else", - "en" => "into", "depuis_chaîne" => "from_str", "Depuis" => "From", "bien" => "ok", @@ -128,13 +125,27 @@ rouille_compilogenese::rouille! { "compter" => "count", "trouve" => "find", "trouve_en_appliquant" => "find_map", - "tous" => "all", - "certains" => "any", - "récuperer" => "collect", + "tous" | "toutes" => "all", + "certains" | "certaines" => "any", + "récupérer" => "collect", "copié" => "copied", "cloné" => "cloned", "Copiable" => "Copy", "Clonable" => "Clone", + "processus" => "process", + "interpète" => "parse", + "taille_non_sigée" => "usize", + "taille_sigée" => "isize", + "entier_non_sigé_8" => "u8", + "entier_non_sigé_32" => "u32", + "entier_non_sigé_64" => "u64", + "entier_sigé_8" => "i8", + "entier_sigé_32" => "i32", + "entier_sigé_64" => "i64", + "flottant_32" => "f32", + "flottant_64" => "f64", + "caractère" => "char", + "bibliothèque_standard" => "std", _ => &identifiant_chaîne, }; From 90e40775df6b3bc67262973fae3d8991ca667cca Mon Sep 17 00:00:00 2001 From: MartinFillon Date: Tue, 5 Nov 2024 10:02:22 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Une=20erreur=20d'orthographe=20inadmissible?= =?UTF-8?q?=20s'est=20gliss=C3=A9e=20l=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rouille_proc_macro/src/lib.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rouille_proc_macro/src/lib.rs b/rouille_proc_macro/src/lib.rs index bfdac6f..8f38a9e 100644 --- a/rouille_proc_macro/src/lib.rs +++ b/rouille_proc_macro/src/lib.rs @@ -134,14 +134,14 @@ rouille_compilogenese::rouille! { "Clonable" => "Clone", "processus" => "process", "interpète" => "parse", - "taille_non_sigée" => "usize", - "taille_sigée" => "isize", - "entier_non_sigé_8" => "u8", - "entier_non_sigé_32" => "u32", - "entier_non_sigé_64" => "u64", - "entier_sigé_8" => "i8", - "entier_sigé_32" => "i32", - "entier_sigé_64" => "i64", + "taille_non_signée" => "usize", + "taille_signée" => "isize", + "entier_non_signé_8" => "u8", + "entier_non_signé_32" => "u32", + "entier_non_signé_64" => "u64", + "entier_signé_8" => "i8", + "entier_signé_32" => "i32", + "entier_signé_64" => "i64", "flottant_32" => "f32", "flottant_64" => "f64", "caractère" => "char", From bda7cd0759c2286284fa6fae13b5176a998bc35e Mon Sep 17 00:00:00 2001 From: MartinFillon Date: Tue, 12 Nov 2024 15:01:41 +0100 Subject: [PATCH 5/5] Ajout de plus de traductions qui peut etre utiles au quotidien --- rouille_proc_macro/src/lib.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rouille_proc_macro/src/lib.rs b/rouille_proc_macro/src/lib.rs index 8f38a9e..82dd8c5 100644 --- a/rouille_proc_macro/src/lib.rs +++ b/rouille_proc_macro/src/lib.rs @@ -76,6 +76,7 @@ rouille_compilogenese::rouille! { "en_tant_que_chaîne" => "as_str", "portée" => "span", "Tableau" => "Vec", + "tab" => "vec", "flux" => "stream", "pousser" => "push", "étendre" => "extend", @@ -99,6 +100,7 @@ rouille_compilogenese::rouille! { "chaîne" => "str", "lire_exactement" => "read_exact", "sépare" => "split", + "sépare_avec_les_espaces" => "split_whitespace", "en_tant_que" => "as", "ensuite" => "then", "ensuite_quelque" => "then_some", @@ -119,9 +121,11 @@ rouille_compilogenese::rouille! { "applique" => "map", "applique_ou" => "map_or", "applique_ou_avec" => "map_or_else", + "applique_arf" => "map_err", "pour_chaque" => "for_each", "essayer_pour_chaque" => "try_for_each", "applatir" => "flatten", + "applatir_en_appliquant" => "flat_map", "compter" => "count", "trouve" => "find", "trouve_en_appliquant" => "find_map", @@ -146,6 +150,11 @@ rouille_compilogenese::rouille! { "flottant_64" => "f64", "caractère" => "char", "bibliothèque_standard" => "std", + "arf_affiche" => "eprintln", + "dégage" => "exit", + "Eg" => "Eq", + "EgPartiel" => "PartialEq", + "longueur" => "len", _ => &identifiant_chaîne, };