From 56edb3a50fb4168ed76a3795f0ed774a754b6c32 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 10 Apr 2019 20:02:56 +0200
Subject: Split traits module into submodules

---
 dhall/src/traits/deserialize.rs | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 dhall/src/traits/deserialize.rs

(limited to 'dhall/src/traits/deserialize.rs')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
new file mode 100644
index 0000000..8d1f565
--- /dev/null
+++ b/dhall/src/traits/deserialize.rs
@@ -0,0 +1,43 @@
+use crate::error::*;
+use crate::expr::*;
+
+pub trait Deserialize<'a>: Sized {
+    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self>;
+}
+
+impl<'a> Deserialize<'a> for Parsed {
+    /// Simply parses the provided string. Ignores the
+    /// provided type.
+    fn from_str(s: &'a str, _ty: Option<&Type>) -> Result<Self> {
+        Ok(Parsed::parse_str(s).map_err(|_| ())?)
+    }
+}
+
+impl<'a> Deserialize<'a> for Resolved {
+    /// Parses and resolves the provided string. Ignores the
+    /// provided type.
+    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+        Ok(Parsed::from_str(s, ty)?.resolve().map_err(|_| ())?)
+    }
+}
+
+impl<'a> Deserialize<'a> for Typed {
+    /// Parses, resolves and typechecks the provided string.
+    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+        // TODO: compare with provided type
+        Ok(Resolved::from_str(s, ty)?.typecheck().map_err(|_| ())?)
+    }
+}
+
+impl<'a> Deserialize<'a> for Normalized {
+    /// Parses, resolves, typechecks and normalizes the provided string.
+    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+        Ok(Typed::from_str(s, ty)?.normalize())
+    }
+}
+
+impl<'a> Deserialize<'a> for Type {
+    fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
+        Ok(Normalized::from_str(s, ty)?.into_type())
+    }
+}
-- 
cgit v1.2.3


From c7184b841279a55bdfb39bde429896d221aa666c Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 10 Apr 2019 21:46:25 +0200
Subject: Cleanup error handling

Closes #41
---
 dhall/src/traits/deserialize.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dhall/src/traits/deserialize.rs')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
index 8d1f565..ad4cde6 100644
--- a/dhall/src/traits/deserialize.rs
+++ b/dhall/src/traits/deserialize.rs
@@ -9,7 +9,7 @@ impl<'a> Deserialize<'a> for Parsed {
     /// Simply parses the provided string. Ignores the
     /// provided type.
     fn from_str(s: &'a str, _ty: Option<&Type>) -> Result<Self> {
-        Ok(Parsed::parse_str(s).map_err(|_| ())?)
+        Ok(Parsed::parse_str(s)?)
     }
 }
 
@@ -17,7 +17,7 @@ impl<'a> Deserialize<'a> for Resolved {
     /// Parses and resolves the provided string. Ignores the
     /// provided type.
     fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
-        Ok(Parsed::from_str(s, ty)?.resolve().map_err(|_| ())?)
+        Ok(Parsed::from_str(s, ty)?.resolve()?)
     }
 }
 
@@ -25,7 +25,7 @@ impl<'a> Deserialize<'a> for Typed {
     /// Parses, resolves and typechecks the provided string.
     fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
         // TODO: compare with provided type
-        Ok(Resolved::from_str(s, ty)?.typecheck().map_err(|_| ())?)
+        Ok(Resolved::from_str(s, ty)?.typecheck()?)
     }
 }
 
-- 
cgit v1.2.3


From 7740ec004c6d7e073358bf2be00b6c0006e4dd06 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 10 Apr 2019 22:32:07 +0200
Subject: Allow providing type for typechecking in API

---
 dhall/src/traits/deserialize.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'dhall/src/traits/deserialize.rs')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
index ad4cde6..5271a65 100644
--- a/dhall/src/traits/deserialize.rs
+++ b/dhall/src/traits/deserialize.rs
@@ -24,8 +24,11 @@ impl<'a> Deserialize<'a> for Resolved {
 impl<'a> Deserialize<'a> for Typed {
     /// Parses, resolves and typechecks the provided string.
     fn from_str(s: &'a str, ty: Option<&Type>) -> Result<Self> {
-        // TODO: compare with provided type
-        Ok(Resolved::from_str(s, ty)?.typecheck()?)
+        let resolved = Resolved::from_str(s, ty)?;
+        match ty {
+            None => Ok(resolved.typecheck()?),
+            Some(t) => Ok(resolved.typecheck_with(t)?),
+        }
     }
 }
 
-- 
cgit v1.2.3


From 82d62c4d7d423817a4fd9d6294d27d18d60bcd22 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 11 Apr 2019 13:11:52 +0200
Subject: Add basic deserialization support

Closes #13
---
 dhall/src/traits/deserialize.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/src/traits/deserialize.rs')

diff --git a/dhall/src/traits/deserialize.rs b/dhall/src/traits/deserialize.rs
index 5271a65..1fbdfe1 100644
--- a/dhall/src/traits/deserialize.rs
+++ b/dhall/src/traits/deserialize.rs
@@ -8,7 +8,7 @@ pub trait Deserialize<'a>: Sized {
 impl<'a> Deserialize<'a> for Parsed {
     /// Simply parses the provided string. Ignores the
     /// provided type.
-    fn from_str(s: &'a str, _ty: Option<&Type>) -> Result<Self> {
+    fn from_str(s: &'a str, _: Option<&Type>) -> Result<Self> {
         Ok(Parsed::parse_str(s)?)
     }
 }
-- 
cgit v1.2.3