summaryrefslogtreecommitdiff
path: root/dhall_syntax
diff options
context:
space:
mode:
authorFintan Halpenny2019-09-03 14:42:30 +0100
committerFintan Halpenny2019-09-03 14:42:30 +0100
commit4edaf0814868e604eed5cfd594ea3f448ca90678 (patch)
tree6dc5d888d1fd7030a5951846cd5ee1fff185ace6 /dhall_syntax
parenteae1eac7048cd87d2775cdc470a295b9d2ee7346 (diff)
Move Canonicalize into resolve.
Rename File to FilePath and have more consistent naming.
Diffstat (limited to 'dhall_syntax')
-rw-r--r--dhall_syntax/src/core/import.rs75
-rw-r--r--dhall_syntax/src/parser.rs6
2 files changed, 6 insertions, 75 deletions
diff --git a/dhall_syntax/src/core/import.rs b/dhall_syntax/src/core/import.rs
index 5e0ff6c..cc38bb0 100644
--- a/dhall_syntax/src/core/import.rs
+++ b/dhall_syntax/src/core/import.rs
@@ -12,14 +12,14 @@ pub enum FilePrefix {
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct File {
+pub struct FilePath {
pub file_path: Vec<String>,
}
/// The location of import (i.e. local vs. remote vs. environment)
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum ImportLocation<SubExpr> {
- Local(FilePrefix, File),
+ Local(FilePrefix, FilePath),
Remote(URL<SubExpr>),
Env(String),
Missing,
@@ -29,7 +29,7 @@ pub enum ImportLocation<SubExpr> {
pub struct URL<SubExpr> {
pub scheme: Scheme,
pub authority: String,
- pub path: File,
+ pub path: FilePath,
pub query: Option<String>,
pub headers: Option<SubExpr>,
}
@@ -104,72 +104,3 @@ impl<SE> Import<SE> {
})
}
}
-
-pub trait Canonicalize {
- fn canonicalize(&self) -> Self;
-}
-
-impl Canonicalize for File {
- fn canonicalize(&self) -> File {
- let mut file_path = Vec::new();
- let mut file_path_components = self.file_path.clone().into_iter();
-
- loop {
- let component = file_path_components.next();
- match component {
- // ───────────────────
- // canonicalize(ε) = ε
- None => break,
-
- // canonicalize(directory₀) = directory₁
- // ───────────────────────────────────────
- // canonicalize(directory₀/.) = directory₁
- Some(c) if c == "." => continue,
-
- Some(c) if c == ".." => match file_path_components.next() {
- // canonicalize(directory₀) = ε
- // ────────────────────────────
- // canonicalize(directory₀/..) = /..
- None => file_path.push("..".to_string()),
-
- // canonicalize(directory₀) = directory₁/..
- // ──────────────────────────────────────────────
- // canonicalize(directory₀/..) = directory₁/../..
- Some(ref c) if c == ".." => {
- file_path.push("..".to_string());
- file_path.push("..".to_string());
- },
-
- // canonicalize(directory₀) = directory₁/component
- // ─────────────────────────────────────────────── ; If "component" is not
- // canonicalize(directory₀/..) = directory₁ ; ".."
- Some(_) => continue,
- },
-
- // canonicalize(directory₀) = directory₁
- // ───────────────────────────────────────────────────────── ; If no other
- // canonicalize(directory₀/component) = directory₁/component ; rule matches
- Some(c) => file_path.push(c.clone()),
- }
- }
-
- File { file_path }
- }
-}
-
-impl<SubExpr: Copy> Canonicalize for ImportLocation<SubExpr> {
- fn canonicalize(&self) -> ImportLocation<SubExpr> {
- match self {
- ImportLocation::Local(prefix, file) => ImportLocation::Local(*prefix, file.canonicalize()),
- ImportLocation::Remote(url) => ImportLocation::Remote(URL {
- scheme: url.scheme,
- authority: url.authority.clone(),
- path: url.path.canonicalize(),
- query: url.query.clone(),
- headers: url.headers.clone(),
- }),
- ImportLocation::Env(name) => ImportLocation::Env(name.to_string()),
- ImportLocation::Missing => ImportLocation::Missing,
- }
- }
-}
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index b70a236..52b3760 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -729,7 +729,7 @@ make_parser! {
[scheme(sch), authority(auth), path(file_path)] => URL {
scheme: sch,
authority: auth,
- path: File { file_path },
+ path: FilePath { file_path },
query: None,
headers: None,
},
@@ -737,7 +737,7 @@ make_parser! {
URL {
scheme: sch,
authority: auth,
- path: File { file_path },
+ path: FilePath { file_path },
query: Some(q),
headers: None,
}
@@ -794,7 +794,7 @@ make_parser! {
ImportLocation::Remote(url)
},
[local((prefix, file_path))] => {
- ImportLocation::Local(prefix, File { file_path })
+ ImportLocation::Local(prefix, FilePath { file_path })
},
));