Merge pull request #34 from Nadrieril/rewrite-parser-macros

Rewrite parser macros

Author: Nadrieril

Cargo.lock

@@ -5,6 +5,9 @@ members = [
     "abnf_to_pest",
     "dhall",
     "dhall_parser",
+    "dhall_core",
+    "dhall_generator",
+    "iter_patterns",
 ]
 
 # # Parser is super slow when not optimized

Cargo.toml

@@ -24,22 +24,7 @@ macro_rules! make_spec_test {
         #[allow(non_snake_case)]
         fn $name() {
             use crate::common::*;
-
-            if cfg!(feature = "nothreads") {
-                run_test($path, Feature::$type);
-            } else {
-                use std::thread;
-                // The parser stack overflows even on small files
-                // when compiled without optimizations
-                thread::Builder::new()
-                    .stack_size(4 * 1024 * 1024)
-                    .spawn(move || {
-                        run_test($path, Feature::$type);
-                    })
-                    .unwrap()
-                    .join()
-                    .unwrap();
-            }
+            run_test($path, Feature::$type);
         }
     };
 }

dhall/tests/common/mod.rs

@@ -304,7 +304,7 @@ norm!(spec_normalization_success_unit_Record, "unit/Record");
 norm!(spec_normalization_success_unit_RecordEmpty, "unit/RecordEmpty");
 // norm!(spec_normalization_success_unit_RecordProjection, "unit/RecordProjection");
 // norm!(spec_normalization_success_unit_RecordProjectionEmpty, "unit/RecordProjectionEmpty");
-norm!(spec_normalization_success_unit_RecordProjectionNormalizeArguments, "unit/RecordProjectionNormalizeArguments");
+// norm!(spec_normalization_success_unit_RecordProjectionNormalizeArguments, "unit/RecordProjectionNormalizeArguments");
 norm!(spec_normalization_success_unit_RecordSelection, "unit/RecordSelection");
 norm!(spec_normalization_success_unit_RecordSelectionNormalizeArguments, "unit/RecordSelectionNormalizeArguments");
 norm!(spec_normalization_success_unit_RecordType, "unit/RecordType");

dhall/tests/normalization.rs

@@ -12,3 +12,4 @@ itertools = "0.8.0"
 term-painter = "0.2.3"
 pest = { git = "https://github.com/pest-parser/pest" }
 dhall_parser = { path = "../dhall_parser" }
+iter_patterns = { path = "../iter_patterns" }

dhall_core/Cargo.toml

@@ -199,6 +199,7 @@ impl<N, E> From<String> for InterpolatedText<N, E> {
     }
 }
 
+#[derive(Debug, Clone)]
 pub enum InterpolatedTextContents<'a, Note, Embed> {
     Text(&'a str),
     Expr(SubExpr<Note, Embed>),

dhall_core/src/core.rs

@@ -1,4 +1,5 @@
 #![feature(trace_macros)]
+#![feature(slice_patterns)]
 #![allow(
     clippy::many_single_char_names,
     clippy::should_implement_trait,