Handle and parse interpolated strings

Closes #25

2 files changed, 10 insertions, 8 deletions

diff --git a/dhall/tests/macros.rs b/dhall/tests/macros.rs
index 1d90e87..4109f84 100644
--- a/dhall/tests/macros.rs
+++ b/dhall/tests/macros.rs
@@ -1,5 +1,7 @@
+use pretty_assertions::assert_eq as assert_eq_pretty;
+
 #[macro_export]
-macro_rules! assert_eq_ {
+macro_rules! assert_eq_display {
     ($left:expr, $right:expr) => {{
         match (&$left, &$right) {
             (left_val, right_val) => {
@@ -104,7 +106,7 @@ pub fn run_test(base_path: &str, feature: Feature, expected: ExpectedResult) {
             let expected = dhall::binary::decode(&data).unwrap();
             let expected = dhall::imports::panic_imports(&expected);
 
-            assert_eq!(expr, expected);
+            assert_eq_pretty!(expr, expected);
         }
         (Feature::Parser, ExpectedResult::Failure) => {
             let file_path = base_path.to_owned() + ".dhall";
@@ -120,7 +122,7 @@ pub fn run_test(base_path: &str, feature: Feature, expected: ExpectedResult) {
             let expr = read_dhall_file(&expr_file_path).unwrap();
             let expected = read_dhall_file(&expected_file_path).unwrap();
 
-            assert_eq_!(
+            assert_eq_display!(
                 normalize::<_, X, _>(&expr),
                 normalize::<_, X, _>(&expected)
             );
diff --git a/dhall/tests/tests.rs b/dhall/tests/tests.rs
index 51df149..24e8aa4 100644
--- a/dhall/tests/tests.rs
+++ b/dhall/tests/tests.rs
@@ -179,15 +179,15 @@ make_spec_test!(parser, spec_parser_success_builtins, "parser/success/builtins")
 make_spec_test!(parser, spec_parser_success_doubleQuotedString, "parser/success/doubleQuotedString");
 // make_spec_test!(parser, spec_parser_success_environmentVariables, "parser/success/environmentVariables");
 // make_spec_test!(parser, spec_parser_success_escapedDoubleQuotedString, "parser/success/escapedDoubleQuotedString");
-// make_spec_test!(parser, spec_parser_success_escapedSingleQuotedString, "parser/success/escapedSingleQuotedString");
+make_spec_test!(parser, spec_parser_success_escapedSingleQuotedString, "parser/success/escapedSingleQuotedString");
 make_spec_test!(parser, spec_parser_success_fields, "parser/success/fields");
 make_spec_test!(parser, spec_parser_success_forall, "parser/success/forall");
 make_spec_test!(parser, spec_parser_success_functionType, "parser/success/functionType");
 make_spec_test!(parser, spec_parser_success_identifier, "parser/success/identifier");
 make_spec_test!(parser, spec_parser_success_ifThenElse, "parser/success/ifThenElse");
 // make_spec_test!(parser, spec_parser_success_importAlt, "parser/success/importAlt");
-// make_spec_test!(parser, spec_parser_success_interpolatedDoubleQuotedString, "parser/success/interpolatedDoubleQuotedString");
-// make_spec_test!(parser, spec_parser_success_interpolatedSingleQuotedString, "parser/success/interpolatedSingleQuotedString");
+make_spec_test!(parser, spec_parser_success_interpolatedDoubleQuotedString, "parser/success/interpolatedDoubleQuotedString");
+make_spec_test!(parser, spec_parser_success_interpolatedSingleQuotedString, "parser/success/interpolatedSingleQuotedString");
 make_spec_test!(parser, spec_parser_success_label, "parser/success/label");
 make_spec_test!(parser, spec_parser_success_lambda, "parser/success/lambda");
 // make_spec_test!(parser, spec_parser_success_largeExpression, "parser/success/largeExpression");
@@ -206,9 +206,9 @@ make_spec_test!(parser, spec_parser_success_operators, "parser/success/operators
 // make_spec_test!(parser, spec_parser_success_quotedPaths, "parser/success/quotedPaths");
 make_spec_test!(parser, spec_parser_success_record, "parser/success/record");
 make_spec_test!(parser, spec_parser_success_reservedPrefix, "parser/success/reservedPrefix");
-// make_spec_test!(parser, spec_parser_success_singleQuotedString, "parser/success/singleQuotedString");
+make_spec_test!(parser, spec_parser_success_singleQuotedString, "parser/success/singleQuotedString");
 make_spec_test!(parser, spec_parser_success_sort, "parser/success/sort");
-// make_spec_test!(parser, spec_parser_success_template, "parser/success/template");
+make_spec_test!(parser, spec_parser_success_template, "parser/success/template");
 make_spec_test!(parser, spec_parser_success_unicodeComment, "parser/success/unicodeComment");
 make_spec_test!(parser, spec_parser_success_unicodeDoubleQuotedString, "parser/success/unicodeDoubleQuotedString");
 // make_spec_test!(parser, spec_parser_success_unicodePaths, "parser/success/unicodePaths");