attribute display trait

Author: UnsignedByte

crates/ast/src/parser.rs

@@ -10,6 +10,7 @@ use fil_utils::{
 use itertools::Itertools;
 use pest::pratt_parser::{Assoc, Op, PrattParser};
 use pest_consume::{match_nodes, Error, Parser};
+use std::fmt::Display;
 use std::fs;
 use std::hash::Hash;
 use std::path::Path;

crates/utils/src/attr/attributes.rs

@@ -1,14 +1,14 @@
 use super::{AttrCtx, AttrStore};
 use crate::GPosIdx;
-use std::{hash::Hash, str::FromStr};
+use std::{fmt::Display, hash::Hash};
 
 /// Stores the attributes of a component
 #[derive(Clone)]
 pub struct Attributes<Bool, Num, Float>
 where
-    Bool: FromStr + Hash + Eq + Copy,
-    Num: FromStr + Hash + Eq + Copy,
-    Float: FromStr + Hash + Eq + Copy,
+    Bool: Hash + Eq + Copy,
+    Num: Hash + Eq + Copy,
+    Float: Hash + Eq + Copy,
 {
     /// Numerical attributes
     num_attrs: AttrStore<Num, u64>,
@@ -20,9 +20,9 @@ where
 
 impl<Bool, Num, Float> AttrCtx<Num, u64> for Attributes<Bool, Num, Float>
 where
-    Bool: FromStr + Hash + Eq + Copy,
-    Num: FromStr + Hash + Eq + Copy,
-    Float: FromStr + Hash + Eq + Copy,
+    Bool: Hash + Eq + Copy,
+    Num: Hash + Eq + Copy,
+    Float: Hash + Eq + Copy,
 {
     fn get(&self, attr: Num) -> Option<&u64> {
         self.num_attrs.get(attr)
@@ -43,9 +43,9 @@ where
 
 impl<Bool, Num, Float> AttrCtx<Bool, bool> for Attributes<Bool, Num, Float>
 where
-    Bool: FromStr + Hash + Eq + Copy,
-    Num: FromStr + Hash + Eq + Copy,
-    Float: FromStr + Hash + Eq + Copy,
+    Bool: Hash + Eq + Copy,
+    Num: Hash + Eq + Copy,
+    Float: Hash + Eq + Copy,
 {
     fn get(&self, attr: Bool) -> Option<&bool> {
         self.bool_attrs.get(attr)
@@ -66,9 +66,9 @@ where
 
 impl<Bool, Num, Float> AttrCtx<Float, f64> for Attributes<Bool, Num, Float>
 where
-    Bool: FromStr + Hash + Eq + Copy,
-    Num: FromStr + Hash + Eq + Copy,
-    Float: FromStr + Hash + Eq + Copy,
+    Bool: Hash + Eq + Copy,
+    Num: Hash + Eq + Copy,
+    Float: Hash + Eq + Copy,
 {
     fn get(&self, attr: Float) -> Option<&f64> {
         self.float_attrs.get(attr)
@@ -89,9 +89,9 @@ where
 
 impl<Bool, Num, Float> Default for Attributes<Bool, Num, Float>
 where
-    Bool: FromStr + Hash + Eq + Copy,
-    Num: FromStr + Hash + Eq + Copy,
-    Float: FromStr + Hash + Eq + Copy,
+    Bool: Hash + Eq + Copy,
+    Num: Hash + Eq + Copy,
+    Float: Hash + Eq + Copy,
 {
     fn default() -> Self {
         Self {
@@ -101,3 +101,18 @@ where
         }
     }
 }
+
+impl<Bool, Num, Float> Display for Attributes<Bool, Num, Float>
+where
+    Bool: Display + Hash + Eq + Copy,
+    Num: Display + Hash + Eq + Copy,
+    Float: Display + Hash + Eq + Copy,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "#[")?;
+        write!(f, "{}", &self.num_attrs)?;
+        write!(f, "{}", &self.bool_attrs)?;
+        write!(f, "{}", &self.float_attrs)?;
+        write!(f, "]")
+    }
+}

crates/utils/src/attr/store.rs

@@ -1,18 +1,18 @@
 use crate::{attr::AttrCtx, GPosIdx};
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Display, hash::Hash};
 
 /// A store for attributes
 #[derive(Clone)]
 pub struct AttrStore<Attr, Value>
 where
-    Attr: Eq + std::hash::Hash + Copy,
+    Attr: Eq + Hash + Copy,
 {
     attrs: HashMap<Attr, (Value, GPosIdx)>,
 }
 
 impl<Attr, Value> AttrStore<Attr, Value>
 where
-    Attr: Eq + std::hash::Hash + Copy,
+    Attr: Eq + Hash + Copy,
 {
     /// iterates over the attributes
     pub fn iter(&self) -> impl Iterator<Item = (Attr, &Value)> {
@@ -22,7 +22,7 @@ where
 
 impl<Attr, Value> AttrCtx<Attr, Value> for AttrStore<Attr, Value>
 where
-    Attr: Eq + std::hash::Hash + Copy,
+    Attr: Eq + Hash + Copy,
 {
     fn get(&self, attr: Attr) -> Option<&Value> {
         self.attrs.get(&attr).map(|(value, _)| value)
@@ -43,11 +43,29 @@ where
 
 impl<Attr, Value> Default for AttrStore<Attr, Value>
 where
-    Attr: Eq + std::hash::Hash + Copy,
+    Attr: Eq + Hash + Copy,
 {
     fn default() -> Self {
         Self {
             attrs: HashMap::new(),
         }
     }
 }
+
+impl<Attr, Value> Display for AttrStore<Attr, Value>
+where
+    Attr: Eq + Hash + Copy + Display,
+    Value: Display,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            self.attrs
+                .iter()
+                .map(|(attr, (value, _))| format!("{}={}", attr, value))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
+    }
+}

crates/utils/src/macros.rs

@@ -35,7 +35,7 @@ macro_rules! attr_enum {
           )*
       };
   ) => {
-      #[derive(Clone, Copy, PartialEq, strum_macros::EnumString, Eq, Hash)]
+      #[derive(Clone, Copy, PartialEq, strum_macros::EnumString, strum_macros::Display, Eq, Hash)]
       pub enum $name {
           $(
               $(#[$pub_meta])*
@@ -44,7 +44,7 @@ macro_rules! attr_enum {
           )*
           $(
               $(#[$priv_meta])*
-              #[strum(disabled)]
+              #[strum(disabled,to_string = $priv_str)]
               $priv,
           )*
       }
@@ -79,7 +79,7 @@ macro_rules! attr_enum {
       priv {
           $(
               $(#[$priv_meta:meta])*
-              $priv:ident,
+              $priv:ident: $priv_str:literal,
           )*
       };
   ) => {
@@ -89,7 +89,7 @@ macro_rules! attr_enum {
           priv {
               $(
                   $(#[$priv_meta])*
-                  $priv,
+                  $priv: $priv_str,
               )*
           };
       }