summaryrefslogtreecommitdiff
path: root/dhall
diff options
context:
space:
mode:
authorNadrieril Feneanar2019-10-12 19:07:40 +0100
committerGitHub2019-10-12 19:07:40 +0100
commit88eadcfe795181a3fda138e92d7f787793248e5f (patch)
tree5613752829163cbdbcdb9ecec3b6889cfe827425 /dhall
parente5bba4a0d148c647ff9c1a372a6470b3b3bfdc6e (diff)
parentd022cd7e807104ffed60a76058c4ccd478ac187a (diff)
Merge branch 'master' into fintan/canonicalize
Diffstat (limited to '')
m---------dhall-lang0
-rw-r--r--dhall/build.rs60
-rw-r--r--dhall_syntax/Cargo.toml1
3 files changed, 21 insertions, 40 deletions
diff --git a/dhall-lang b/dhall-lang
-Subproject 7639b4ed2fd457bfa77daabfd329fea3b25581c
+Subproject 781961f4694667667f093d28e7b35569c67678c
diff --git a/dhall/build.rs b/dhall/build.rs
index 757eed8..b7ed6ca 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -259,10 +259,11 @@ fn main() -> std::io::Result<()> {
|| path == "unit/EmptyToMap"
|| path == "unit/ToMap"
|| path == "unit/ToMapWithType"
- // TODO: Normalize field selection further by inspecting the argument
+ // TODO: Further record simplifications
|| path == "simplifications/rightBiasedMergeWithinRecordProjectionWithinFieldSelection0"
|| path == "simplifications/rightBiasedMergeWithinRecordProjectionWithinFieldSelection1"
|| path == "simplifications/rightBiasedMergeWithinRecursiveRecordMergeWithinFieldselection"
+ || path == "simplifications/issue661"
|| path == "unit/RecordProjectionByTypeWithinFieldSelection"
|| path == "unit/RecordProjectionWithinFieldSelection"
|| path == "unit/RecursiveRecordMergeWithinFieldSelection0"
@@ -273,7 +274,10 @@ fn main() -> std::io::Result<()> {
|| path == "unit/RightBiasedMergeWithinFieldSelection1"
|| path == "unit/RightBiasedMergeWithinFieldSelection2"
|| path == "unit/RightBiasedMergeWithinFieldSelection3"
+ || path == "unit/RightBiasedRecordMergeWithinRecordProjection"
|| path == "unit/RightBiasedMergeEquivalentArguments"
+ || path == "unit/NestedRecordProjection"
+ || path == "unit/NestedRecordProjectionByType"
},
input_type: FileType::Text,
output_type: Some(FileType::Text),
@@ -298,13 +302,21 @@ fn main() -> std::io::Result<()> {
make_test_module(
&mut file,
TestFeature {
- module_name: "typecheck_success",
- directory: spec_tests_dir.join("typecheck/success/"),
- variant: "TypecheckSuccess",
+ module_name: "type_inference_success",
+ directory: spec_tests_dir.join("type-inference/success/"),
+ variant: "TypeInferenceSuccess",
path_filter: |path: &str| {
false
// Too slow
|| path == "prelude"
+ // TODO: projection by expression
+ || path == "unit/RecordProjectionByType"
+ || path == "unit/RecordProjectionByTypeEmpty"
+ || path == "unit/RecordProjectionByTypeJudgmentalEquality"
+ // TODO: toMap
+ || path == "unit/ToMap"
+ || path == "unit/ToMapAnnotated"
+ || path == "simple/toMapEmptyNormalizeAnnotation"
},
input_type: FileType::Text,
output_type: Some(FileType::Text),
@@ -314,9 +326,9 @@ fn main() -> std::io::Result<()> {
make_test_module(
&mut file,
TestFeature {
- module_name: "typecheck_failure",
- directory: spec_tests_dir.join("typecheck/failure/"),
- variant: "TypecheckFailure",
+ module_name: "type_inference_failure",
+ directory: spec_tests_dir.join("type-inference/failure/"),
+ variant: "TypeInferenceFailure",
path_filter: |path: &str| {
false
// TODO: Enable imports in typecheck tests
@@ -333,44 +345,12 @@ fn main() -> std::io::Result<()> {
|| path == "unit/MistypedToMap3"
|| path == "unit/MistypedToMap4"
|| path == "unit/NonRecordToMap"
+ || path == "unit/ToMapWrongKind"
},
input_type: FileType::Text,
output_type: None,
},
)?;
- make_test_module(
- &mut file,
- TestFeature {
- module_name: "type_inference_success",
- directory: spec_tests_dir.join("type-inference/success/"),
- variant: "TypeInferenceSuccess",
- path_filter: |path: &str| {
- false
- // TODO: projection by expression
- || path == "unit/RecordProjectionByType"
- || path == "unit/RecordProjectionByTypeEmpty"
- || path == "unit/RecordProjectionByTypeJudgmentalEquality"
- // TODO: toMap
- || path == "unit/ToMap"
- || path == "unit/ToMapAnnotated"
- },
- input_type: FileType::Text,
- output_type: Some(FileType::Text),
- },
- )?;
-
- make_test_module(
- &mut file,
- TestFeature {
- module_name: "type_inference_failure",
- directory: spec_tests_dir.join("type-inference/failure/"),
- variant: "TypeInferenceFailure",
- path_filter: |_path: &str| false,
- input_type: FileType::Text,
- output_type: None,
- },
- )?;
-
Ok(())
}
diff --git a/dhall_syntax/Cargo.toml b/dhall_syntax/Cargo.toml
index b98c4a4..82fa9c8 100644
--- a/dhall_syntax/Cargo.toml
+++ b/dhall_syntax/Cargo.toml
@@ -18,4 +18,5 @@ hex = "0.3.2"
lazy_static = "1.4.0"
dhall_generated_parser = { path = "../dhall_generated_parser" }
dhall_proc_macros = { path = "../dhall_proc_macros" }
+# pest_consume = { path = "../../pest_consume/pest_consume" }
pest_consume = "1.0"