From 405bc3d80c0e169ea74dd12422b9504b7383dab3 Mon Sep 17 00:00:00 2001
From: FintanH
Date: Mon, 12 Aug 2019 22:22:24 +0100
Subject: Refactor of File to be the combination of Directory and the file
 name, where Directory is the Vector of component paths.

The refactor meant changing some sections of the code where we were
parsing and manipulating Files/Directories.

This also includes a new trait Canonicalization which is needed for
import logic.
---
 dhall/src/phase/binary.rs  | 29 ++++++++++++++++++++---------
 dhall/src/phase/resolve.rs | 11 ++++++-----
 2 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'dhall/src/phase')

diff --git a/dhall/src/phase/binary.rs b/dhall/src/phase/binary.rs
index 1812131..3acd2d4 100644
--- a/dhall/src/phase/binary.rs
+++ b/dhall/src/phase/binary.rs
@@ -1,12 +1,13 @@
 use itertools::Itertools;
 use serde_cbor::value::value as cbor;
 use std::iter::FromIterator;
+use std::vec;
 
 use dhall_syntax::map::DupTreeMap;
 use dhall_syntax::{
     rc, ExprF, FilePrefix, Hash, Import, ImportHashed, ImportLocation,
     ImportMode, Integer, InterpolatedText, Label, Natural, Scheme, SubExpr,
-    URL, V,
+    URL, V, Directory, File,
 };
 
 use crate::error::{DecodeError, EncodeError};
@@ -243,7 +244,7 @@ fn cbor_value_to_dhall(
                                 "import/remote/query".to_owned(),
                             ))?,
                         };
-                        let path = rest
+                        let mut components: Vec<_> = rest
                             .map(|s| match s.as_string() {
                                 Some(s) => Ok(s.clone()),
                                 None => Err(DecodeError::WrongFormatError(
@@ -251,6 +252,11 @@ fn cbor_value_to_dhall(
                                 )),
                             })
                             .collect::<Result<_, _>>()?;
+                        let file = components.pop().ok_or(
+                                DecodeError::WrongFormatError(
+                                    "import/remote/path".to_owned(),
+                                ))?;
+                        let path = File { directory: Directory { components: components }, file: file };
                         ImportLocation::Remote(URL {
                             scheme,
                             authority,
@@ -269,7 +275,7 @@ fn cbor_value_to_dhall(
                                 "import/local/prefix".to_owned(),
                             ))?,
                         };
-                        let path = rest
+                        let mut components: Vec<_> = rest
                             .map(|s| match s.as_string() {
                                 Some(s) => Ok(s.clone()),
                                 None => Err(DecodeError::WrongFormatError(
@@ -277,6 +283,11 @@ fn cbor_value_to_dhall(
                                 )),
                             })
                             .collect::<Result<_, _>>()?;
+                        let file = components.pop().ok_or(
+                                DecodeError::WrongFormatError(
+                                    "import/remote/path".to_owned(),
+                                ))?;
+                        let path = File { directory: Directory { components: components }, file: file };
                         ImportLocation::Local(prefix, path)
                     }
                     6 => {
@@ -520,8 +531,8 @@ where
     use serde::ser::SerializeSeq;
 
     let count = 4 + match &import.location_hashed.location {
-        ImportLocation::Remote(url) => 3 + url.path.len(),
-        ImportLocation::Local(_, path) => path.len(),
+        ImportLocation::Remote(url) => 3 + url.path.clone().into_iter().len(),
+        ImportLocation::Local(_, path) => path.clone().into_iter().len(),
         ImportLocation::Env(_) => 1,
         ImportLocation::Missing => 0,
     };
@@ -573,8 +584,8 @@ where
                 )?,
             };
             ser_seq.serialize_element(&url.authority)?;
-            for p in &url.path {
-                ser_seq.serialize_element(p)?;
+            for p in url.path.clone().into_iter() {
+                ser_seq.serialize_element(&p)?;
             }
             match &url.query {
                 None => ser_seq.serialize_element(&Null)?,
@@ -582,8 +593,8 @@ where
             };
         }
         ImportLocation::Local(_, path) => {
-            for p in path {
-                ser_seq.serialize_element(p)?;
+            for p in path.clone().into_iter() {
+                ser_seq.serialize_element(&p)?;
             }
         }
         ImportLocation::Env(env) => {
diff --git a/dhall/src/phase/resolve.rs b/dhall/src/phase/resolve.rs
index c4d7e5f..ba75be4 100644
--- a/dhall/src/phase/resolve.rs
+++ b/dhall/src/phase/resolve.rs
@@ -16,6 +16,7 @@ type ImportCache = HashMap<Import, Normalized>;
 
 pub type ImportStack = Vec<Import>;
 
+
 fn resolve_import(
     import: &Import,
     root: &ImportRoot,
@@ -30,14 +31,14 @@ fn resolve_import(
     };
     match &import.location_hashed.location {
         Local(prefix, path) => {
-            let path: PathBuf = path.iter().cloned().collect();
-            let path = match prefix {
+            let path_buf: PathBuf = path.clone().into_iter().collect();
+            let path_buf = match prefix {
                 // TODO: fail gracefully
-                Parent => cwd.parent().unwrap().join(path),
-                Here => cwd.join(path),
+                Parent => cwd.parent().unwrap().join(path_buf),
+                Here => cwd.join(path_buf),
                 _ => unimplemented!("{:?}", import),
             };
-            Ok(load_import(&path, import_cache, import_stack).map_err(|e| {
+            Ok(load_import(&path_buf, import_cache, import_stack).map_err(|e| {
                 ImportError::Recursive(import.clone(), Box::new(e))
             })?)
         }
-- 
cgit v1.2.3