From 423fdeebe9247b16744fae4b50df415bbd08be04 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Mon, 6 May 2019 22:09:55 +0200
Subject: Reorganize dhall into a phase structure

---
 dhall/src/phase/resolve.rs | 139 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 dhall/src/phase/resolve.rs

(limited to 'dhall/src/phase/resolve.rs')

diff --git a/dhall/src/phase/resolve.rs b/dhall/src/phase/resolve.rs
new file mode 100644
index 0000000..afb49cb
--- /dev/null
+++ b/dhall/src/phase/resolve.rs
@@ -0,0 +1,139 @@
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+
+use dhall_syntax::Import;
+
+use crate::error::Error;
+use crate::phase::{Normalized, Parsed, Resolved};
+
+#[derive(Debug)]
+pub enum ImportError {
+    Recursive(Import, Box<Error>),
+    UnexpectedImport(Import),
+    ImportCycle(ImportStack, Import),
+}
+
+/// A root from which to resolve relative imports.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ImportRoot {
+    LocalDir(PathBuf),
+}
+
+type ImportCache = HashMap<Import, Normalized>;
+
+type ImportStack = Vec<Import>;
+
+fn resolve_import(
+    import: &Import,
+    root: &ImportRoot,
+    import_cache: &mut ImportCache,
+    import_stack: &ImportStack,
+) -> Result<Normalized, ImportError> {
+    use self::ImportRoot::*;
+    use dhall_syntax::FilePrefix::*;
+    use dhall_syntax::ImportLocation::*;
+    let cwd = match root {
+        LocalDir(cwd) => cwd,
+    };
+    match &import.location_hashed.location {
+        Local(prefix, path) => {
+            let path = match prefix {
+                // TODO: fail gracefully
+                Parent => cwd.parent().unwrap().join(path),
+                Here => cwd.join(path),
+                _ => unimplemented!("{:?}", import),
+            };
+            Ok(load_import(&path, import_cache, import_stack).map_err(|e| {
+                ImportError::Recursive(import.clone(), Box::new(e))
+            })?)
+        }
+        _ => unimplemented!("{:?}", import),
+    }
+}
+
+fn load_import(
+    f: &Path,
+    import_cache: &mut ImportCache,
+    import_stack: &ImportStack,
+) -> Result<Normalized, Error> {
+    Ok(
+        do_resolve_expr(Parsed::parse_file(f)?, import_cache, import_stack)?
+            .typecheck()?
+            .normalize(),
+    )
+}
+
+fn do_resolve_expr(
+    Parsed(expr, root): Parsed,
+    import_cache: &mut ImportCache,
+    import_stack: &ImportStack,
+) -> Result<Resolved, ImportError> {
+    let resolve = |import: &Import| -> Result<Normalized, ImportError> {
+        if import_stack.contains(import) {
+            return Err(ImportError::ImportCycle(
+                import_stack.clone(),
+                import.clone(),
+            ));
+        }
+        match import_cache.get(import) {
+            Some(expr) => Ok(expr.clone()),
+            None => {
+                // Copy the import stack and push the current import
+                let mut import_stack = import_stack.clone();
+                import_stack.push(import.clone());
+
+                // Resolve the import recursively
+                let expr =
+                    resolve_import(import, &root, import_cache, &import_stack)?;
+
+                // Add the import to the cache
+                import_cache.insert(import.clone(), expr.clone());
+                Ok(expr)
+            }
+        }
+    };
+    let expr = expr.traverse_embed(resolve)?;
+    Ok(Resolved(expr))
+}
+
+pub(crate) fn resolve(e: Parsed) -> Result<Resolved, ImportError> {
+    do_resolve_expr(e, &mut HashMap::new(), &Vec::new())
+}
+
+pub(crate) fn skip_resolve_expr(
+    Parsed(expr, _root): Parsed,
+) -> Result<Resolved, ImportError> {
+    let resolve = |import: &Import| -> Result<Normalized, ImportError> {
+        Err(ImportError::UnexpectedImport(import.clone()))
+    };
+    let expr = expr.traverse_embed(resolve)?;
+    Ok(Resolved(expr))
+}
+
+#[cfg(test)]
+mod spec_tests {
+    #![rustfmt::skip]
+
+    macro_rules! import_success {
+        ($name:ident, $path:expr) => {
+            make_spec_test!(Import, Success, $name, $path);
+        };
+    }
+
+    // macro_rules! import_failure {
+    //     ($name:ident, $path:expr) => {
+    //         make_spec_test!(Import, Failure, $name, $path);
+    //     };
+    // }
+
+    // import_success!(success_alternativeEnvNatural, "alternativeEnvNatural");
+    // import_success!(success_alternativeEnvSimple, "alternativeEnvSimple");
+    // import_success!(success_alternativeNatural, "alternativeNatural");
+    // import_success!(success_asText, "asText");
+    import_success!(success_fieldOrder, "fieldOrder");
+    // import_failure!(failure_alternativeEnv, "alternativeEnv");
+    // import_failure!(failure_alternativeEnvMissing, "alternativeEnvMissing");
+    // import_failure!(failure_cycle, "cycle");
+    // import_failure!(failure_missing, "missing");
+    // import_failure!(failure_referentiallyInsane, "referentiallyInsane");
+}
-- 
cgit v1.2.3


From 60129b7d1c0ea8bdf2ec666fa51957e97465e88f Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Mon, 6 May 2019 23:17:26 +0200
Subject: Consolidate errors in the error module

---
 dhall/src/phase/resolve.rs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'dhall/src/phase/resolve.rs')

diff --git a/dhall/src/phase/resolve.rs b/dhall/src/phase/resolve.rs
index afb49cb..5ab03ac 100644
--- a/dhall/src/phase/resolve.rs
+++ b/dhall/src/phase/resolve.rs
@@ -3,16 +3,9 @@ use std::path::{Path, PathBuf};
 
 use dhall_syntax::Import;
 
-use crate::error::Error;
+use crate::error::{Error, ImportError};
 use crate::phase::{Normalized, Parsed, Resolved};
 
-#[derive(Debug)]
-pub enum ImportError {
-    Recursive(Import, Box<Error>),
-    UnexpectedImport(Import),
-    ImportCycle(ImportStack, Import),
-}
-
 /// A root from which to resolve relative imports.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ImportRoot {
@@ -21,7 +14,7 @@ pub enum ImportRoot {
 
 type ImportCache = HashMap<Import, Normalized>;
 
-type ImportStack = Vec<Import>;
+pub(crate) type ImportStack = Vec<Import>;
 
 fn resolve_import(
     import: &Import,
-- 
cgit v1.2.3