newtype in types, more generator config, parsing -> parser

1 files changed, 64 insertions, 6 deletions

diff --git a/src/types.rs b/src/types.rs
index 82f9c65..f378f8b 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,22 +1,80 @@
 use serde_derive::{Serialize, Deserialize};
+use thiserror::Error;
 
 use std::collections::BTreeMap;
+use std::str::FromStr;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Poseidoc {
     pub config: toml::Value,
     pub entities: BTreeMap<String, Entity>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Entity {
     pub name: String,
     //location: SourceLocation
-    pub language: String,
-    pub kind: String,
+    pub language: Language,
+    pub kind: EntityKind,
     pub brief_description: String,
     pub documentation: String,
-    pub children: BTreeMap<String, BTreeMap<String, Entity>>,
+    pub children: BTreeMap<ChildrenKind, BTreeMap<EntityId, Entity>>,
 }
 
-// TODO: use newtype for language, entity kind, entity ID
+// TODO: use newtype for entity kind, entity ID
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(try_from = "&str", into = "&'static str")]
+pub enum Language {
+    Clang,
+}
+
+impl std::fmt::Display for Language {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", <&'static str>::from(*self))
+    }
+}
+
+impl FromStr for Language {
+    type Err = LanguageParseError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "clang" => Ok(Language::Clang),
+            _ => Err(LanguageParseError(())),
+        }
+    }
+}
+
+impl std::convert::TryFrom<&str> for Language {
+    type Error = LanguageParseError;
+    fn try_from(s: &str) -> Result<Language, Self::Error> {
+        Language::from_str(s)
+    }
+}
+
+impl From<Language> for &'static str {
+    fn from(lang: Language) -> &'static str {
+        match lang {
+            Language::Clang => "clang",
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Error)]
+#[error("invalid language")]
+pub struct LanguageParseError(());
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct EntityKind(pub String);
+
+// Plural version of EntityKind
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct ChildrenKind(pub String);
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct EntityId(pub String);