From e3813e7d4e3450704c1213fd6cdff7c801ccbc34 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 6 Mar 2019 23:48:32 +0100
Subject: Finally get rid of old parser

---
 Cargo.lock                     | 564 -----------------------------------------
 dhall/src/main.rs              |  30 +--
 dhall/tests/macros.rs          |   9 +-
 dhall_core/Cargo.toml          |   7 -
 dhall_core/build.rs            |   6 -
 dhall_core/src/grammar.lalrpop | 164 ------------
 dhall_core/src/grammar_util.rs |   5 +-
 dhall_core/src/lexer.rs        | 394 ----------------------------
 dhall_core/src/lib.rs          |   3 -
 dhall_core/src/parser.rs       |  53 ++--
 dhall_generator/src/lib.rs     |   2 +-
 11 files changed, 27 insertions(+), 1210 deletions(-)
 delete mode 100644 dhall_core/build.rs
 delete mode 100644 dhall_core/src/grammar.lalrpop
 delete mode 100644 dhall_core/src/lexer.rs

diff --git a/Cargo.lock b/Cargo.lock
index cd0a0e0..6e56310 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15,60 +15,11 @@ dependencies = [
  "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "arrayref"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "ascii-canvas"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bit-set"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "block-buffer"
 version = "0.3.3"
@@ -78,58 +29,16 @@ dependencies = [
  "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-padding 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "byte-tools"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bytecount"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "byteorder"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "dhall"
 version = "0.1.0"
@@ -146,12 +55,8 @@ dependencies = [
 name = "dhall_core"
 version = "0.1.0"
 dependencies = [
- "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "dhall_parser 0.1.0",
  "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "pest 2.1.0 (git+https://github.com/pest-parser/pest)",
  "term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -175,11 +80,6 @@ dependencies = [
  "pest_derive 2.1.0",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "digest"
 version = "0.7.6"
@@ -188,54 +88,16 @@ dependencies = [
  "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "digest"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "docopt"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "either"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "ena"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "fixedbitset"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "generic-array"
 version = "0.9.0"
@@ -244,14 +106,6 @@ dependencies = [
  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "itertools"
 version = "0.8.0"
@@ -269,84 +123,21 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "lalrpop"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "docopt 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "lalrpop-util"
 version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "lazy_static"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "maplit"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "memchr"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "memchr"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "nom"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "nom"
 version = "4.2.1"
@@ -356,16 +147,6 @@ dependencies = [
  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "opaque-debug"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "ordermap"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "pest"
 version = "2.1.0"
@@ -409,37 +190,6 @@ dependencies = [
  "sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "petgraph"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "pretty"
 version = "0.5.2"
@@ -464,158 +214,6 @@ dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde_derive"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.7.0"
@@ -627,58 +225,6 @@ dependencies = [
  "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "string_cache"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "string_cache_shared"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "strsim"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "syn"
 version = "0.15.27"
@@ -706,24 +252,6 @@ dependencies = [
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "termion"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "typed-arena"
 version = "1.4.1"
@@ -739,21 +267,11 @@ name = "ucd-trie"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "ucd-util"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "version_check"
 version = "0.1.5"
@@ -764,121 +282,39 @@ name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "winapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [metadata]
 "checksum abnf 0.1.1 (git+https://github.com/Nadrieril/abnf)" = "<none>"
-"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
 "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-"checksum ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b385d69402821a1c254533a011a312531cbcc0e3e24f19bbb4747a5a2daf37e2"
-"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
-"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
-"checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a"
-"checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
-"checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d"
-"checksum block-padding 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d75255892aeb580d3c566f213a2b6fdc1c66667839f45719ee1d30ebf2aea591"
 "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
-"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c"
-"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
-"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
 "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
-"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
-"checksum docopt 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db2906c2579b5b7207fc1e328796a9a8835dc44e22dbe8e460b1d636f9a7b225"
 "checksum either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c67353c641dc847124ea1902d69bd753dee9bb3beff9aa3662ecf86c971d1fac"
-"checksum ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f56c93cc076508c549d9bb747f79aa9b4eb098be7b8cad8830c3137ef52d1e00"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
 "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
 "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2e80bee40b22bca46665b4ef1f3cd88ed0fb043c971407eac17a0712c02572"
 "checksum lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)" = "33b27d8490dbe1f9704b0088d61e8d46edc10d5673a8829836c6ded26a9912c7"
-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
-"checksum libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)" = "413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e"
-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
-"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
 "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
-"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30"
-"checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b"
 "checksum nom 4.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4836e9d6036552017e107edc598c97b2dee245161ff1b1ad4af215004774b354"
-"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
-"checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
 "checksum pest 2.1.0 (git+https://github.com/pest-parser/pest)" = "<none>"
-"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
-"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 "checksum pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3"
 "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
 "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
-"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d"
-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53ee8cfdddb2e0291adfb9f13d31d3bbe0a03c9a402c01b1e24188d86c35b24f"
-"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
-"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
-"checksum serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6eabf4b5914e88e24eea240bb7c9f9a2cbc1bbbe8d961d381975ec3c6b806c"
 "checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
-"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
-"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
-"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
-"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
 "checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "dcaa948f0e3e38470cd8dc8dcfe561a75c9e43f28075bb183845be2b9b3c08cf"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum typed-arena 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6c06a92aef38bb4dc5b0df00d68496fc31307c5344c867bb61678c6e1671ec5"
 "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
 "checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77"
-"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/dhall/src/main.rs b/dhall/src/main.rs
index 43d03ce..493f9be 100644
--- a/dhall/src/main.rs
+++ b/dhall/src/main.rs
@@ -57,36 +57,10 @@ fn print_error(message: &str, source: &str, start: usize, end: usize) {
 fn main() {
     let mut buffer = String::new();
     io::stdin().read_to_string(&mut buffer).unwrap();
-    let expr = match parser::parse_expr_lalrpop(&buffer) {
+    let expr = match parser::parse_expr(&buffer) {
         Ok(e) => e,
-        Err(lalrpop_util::ParseError::User {
-            error: lexer::LexicalError::Error(pos, e),
-        }) => {
-            print_error(
-                &format!("Unexpected token {:?}", e),
-                &buffer,
-                pos,
-                pos,
-            );
-            return;
-        }
-        Err(lalrpop_util::ParseError::UnrecognizedToken {
-            token: Some((start, t, end)),
-            expected: e,
-        }) => {
-            print_error(
-                &format!("Unrecognized token {:?}", t),
-                &buffer,
-                start,
-                end,
-            );
-            if !e.is_empty() {
-                println!("Expected {:?}", e);
-            }
-            return;
-        }
         Err(e) => {
-            print_error(&format!("Parser error {:?}", e), &buffer, 0, 0);
+            print_error(&format!("Parse error {}", e), &buffer, 0, 0);
             return;
         }
     };
diff --git a/dhall/tests/macros.rs b/dhall/tests/macros.rs
index 777a2f6..28be70b 100644
--- a/dhall/tests/macros.rs
+++ b/dhall/tests/macros.rs
@@ -18,14 +18,9 @@ macro_rules! include_test_strs_ab {
 #[macro_export]
 macro_rules! parse_str {
     ($str:expr) => {{
-        let pest_expr = parser::parse_expr_pest(&$str)
+        let pest_expr = parser::parse_expr(&$str)
             .map_err(|e| println!("{}", e))
             .unwrap();
-        // // Check with old parser
-        // match parser::parse_expr_lalrpop(&$str) {
-        //     Ok(larlpop_expr) => assert_eq!(pest_expr, larlpop_expr),
-        //     Err(_) => {},
-        // };
         // panic!("{:?}", pest_expr);
         pest_expr
     }};
@@ -78,7 +73,7 @@ macro_rules! run_spec_test {
     };
     (parser_failure, $path:expr) => {
         let expr_str = include_test_str!($path);
-        parser::parse_expr_pest(&expr_str).unwrap_err();
+        parser::parse_expr(&expr_str).unwrap_err();
     };
 }
 
diff --git a/dhall_core/Cargo.toml b/dhall_core/Cargo.toml
index dcd5c1f..4010f4a 100644
--- a/dhall_core/Cargo.toml
+++ b/dhall_core/Cargo.toml
@@ -3,19 +3,12 @@ name = "dhall_core"
 version = "0.1.0"
 authors = ["NanoTech <nanotech@nanotechcorp.net>", "Nadrieril <nadrieril@users.noreply.github.com>"]
 edition = "2018"
-build = "build.rs"
 
 [lib]
 doctest = false
 
-[build-dependencies]
-lalrpop = "0.16.3"
-
 [dependencies]
-bytecount = "0.5.1"
 itertools = "0.8.0"
-lalrpop-util = "0.16.3"
-nom = "3.0.0"
 term-painter = "0.2.3"
 pest = { git = "https://github.com/pest-parser/pest" }
 dhall_parser = { path = "../dhall_parser" }
diff --git a/dhall_core/build.rs b/dhall_core/build.rs
deleted file mode 100644
index 946841a..0000000
--- a/dhall_core/build.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use lalrpop;
-
-fn main() {
-    lalrpop::process_root().unwrap();
-    println!("cargo:rerun-if-changed=src/grammar.lalrpop");
-}
diff --git a/dhall_core/src/grammar.lalrpop b/dhall_core/src/grammar.lalrpop
deleted file mode 100644
index 1ffe2ff..0000000
--- a/dhall_core/src/grammar.lalrpop
+++ /dev/null
@@ -1,164 +0,0 @@
-use std::collections::BTreeMap;
-use std::iter;
-use std::iter::FromIterator;
-
-use crate::core;
-use crate::core::bx;
-use crate::core::Expr::*;
-use crate::core::Builtin;
-use crate::core::Builtin::*;
-use crate::core::BinOp::*;
-use crate::grammar_util::*;
-use crate::lexer::*;
-
-grammar<'input>;
-
-extern {
-    type Location = usize;
-    type Error = LexicalError;
-
-    enum Tok<'input> {
-        Pi => Tok::Pi,
-        Lambda => Tok::Lambda,
-        Combine => Tok::Combine,
-        "->" => Tok::Arrow,
-
-        Int => Tok::Integer(<isize>),
-        Nat => Tok::Natural(<usize>),
-        Text => Tok::Text(<String>),
-        Bool => Tok::Bool(<bool>),
-        Label => Tok::Identifier(<&'input str>),
-        Const => Tok::Const(<core::Const>),
-        Let => Tok::Keyword(Keyword::Let),
-        In => Tok::Keyword(Keyword::In),
-        If => Tok::Keyword(Keyword::If),
-        Then => Tok::Keyword(Keyword::Then),
-        Else => Tok::Keyword(Keyword::Else),
-        List => Tok::ListLike(ListLike::List),
-        Optional => Tok::ListLike(ListLike::Optional),
-        Builtin => Tok::Builtin(<Builtin>),
-
-        "{" => Tok::BraceL,
-        "}" => Tok::BraceR,
-        "[" => Tok::BracketL,
-        "]" => Tok::BracketR,
-        "(" => Tok::ParenL,
-        ")" => Tok::ParenR,
-        "&&" => Tok::BoolAnd,
-        "||" => Tok::BoolOr,
-        "==" => Tok::CompareEQ,
-        "!=" => Tok::CompareNE,
-        "++" => Tok::Append,
-        "*" => Tok::Times,
-        "+" => Tok::Plus,
-        "," => Tok::Comma,
-        "." => Tok::Dot,
-        ":" => Tok::Ascription,
-        "=" => Tok::Equals,
-    }
-}
-
-pub Expr: BoxExpr<'input> = { // exprA
-    ExprB,
-};
-
-ExprB: BoxExpr<'input> = {
-    Lambda "(" <Label> ":" <Expr> ")" "->" <ExprB> => bx(Lam(<>)),
-    Pi "(" <Label> ":" <Expr> ")" "->" <ExprB> => bx(Pi(<>)),
-    If <Expr> Then <ExprB> Else <ExprC> => bx(BoolIf(<>)),
-    <ExprC> "->" <ExprB> => bx(Pi("_", <>)),
-    Let <Label> <(":" <Expr>)?> "=" <Expr> In <ExprB> => bx(Let(<>)),
-    "[" <a:Elems> "]" ":" <b:ListLike> <c:ExprE> => bx(b(Some(c), a)),
-    <ExprC> ":" <Expr> => bx(Annot(<>)),
-    ExprC,
-};
-
-ListLike: ExprListFn<'input> = {
-    List => ListLit,
-    Optional => OptionalLit,
-};
-
-BoolOr: ExprOpFn<'input> = { "||" => (|x,y| BinOp(BoolOr, x, y)) };
-NaturalPlus: ExprOpFn<'input> = { "+" => (|x,y| BinOp(NaturalPlus, x, y)) };
-TextAppend: ExprOpFn<'input> = { "++" => (|x,y| BinOp(TextAppend, x, y)) };
-BoolAnd: ExprOpFn<'input> = { "&&" => (|x,y| BinOp(BoolAnd, x, y)) };
-CombineOp: ExprOpFn<'input> = { Combine => (|x,y| BinOp(Combine, x, y)) };
-NaturalTimes: ExprOpFn<'input> = { "*" => (|x,y| BinOp(NaturalTimes, x, y)) };
-BoolEQ: ExprOpFn<'input> = { "==" => (|x,y| BinOp(BoolEQ, x, y)) };
-BoolNE: ExprOpFn<'input> = { "!=" => (|x,y| BinOp(BoolNE, x, y)) };
-
-Tier<NextTier, Op>: BoxExpr<'input> = {
-    <a:NextTier> <f:Op> <b:Tier<NextTier, Op>> => bx(f(a, b)),
-    // <b:Tier<NextTier, Op>> <f:Op> <a:NextTier> => bx(f(a, b)),
-    NextTier,
-};
-
-ExprC = Tier<ExprC1, BoolOr>;
-ExprC1 = Tier<ExprC2, NaturalPlus>;
-ExprC2 = Tier<ExprC3, TextAppend>;
-ExprC3 = Tier<ExprC4, BoolAnd>;
-ExprC4 = Tier<ExprC5, CombineOp>;
-ExprC5 = Tier<ExprC6, NaturalTimes>;
-ExprC6 = Tier<ExprC7, BoolEQ>;
-ExprC7 = Tier<ExprD, BoolNE>;
-
-ExprD: BoxExpr<'input> = {
-    <v:(ExprE)+> => {
-        let mut it = v.into_iter();
-        let f = it.next().unwrap();
-        it.fold(f, |f, x| bx(App(f, x)))
-    }
-};
-
-ExprE: BoxExpr<'input> = {
-    <a:ExprF> <fields:("." <Label>)*> => {
-        fields.into_iter().fold(a, |x, f| bx(Field(x, f)))
-    },
-};
-
-ExprF: BoxExpr<'input> = {
-    Nat => bx(NaturalLit(<>)),
-    Int => bx(IntegerLit(<>)),
-    Text => bx(TextLit(<>)),
-    Label => bx(Var(core::V(<>, 0))), // FIXME support var@n syntax
-    Const => bx(Const(<>)),
-    List => bx(Builtin(List)),
-    Optional => bx(Builtin(Optional)),
-    Builtin => bx(Builtin(<>)),
-    Bool => bx(BoolLit(<>)),
-    Record,
-    RecordLit,
-    "(" <Expr> ")",
-};
-
-SepBy<S, T>: iter::Chain<::std::vec::IntoIter<T>, ::std::option::IntoIter<T>> = {
-    <v:(<T> S)*> <last:T?> => v.into_iter().chain(last.into_iter()),
-};
-
-SepBy1<S, T>: iter::Chain<::std::vec::IntoIter<T>, iter::Once<T>> = {
-    <v:(<T> S)*> <last:T> => v.into_iter().chain(iter::once(last)),
-};
-
-Elems: Vec<ParsedExpr<'input>> = {
-    <v:SepBy<",", Expr>> => {
-        v.into_iter()
-         .map(|b| *b)
-         .collect::<Vec<_>>()
-    }
-};
-
-RecordLit: BoxExpr<'input> = {
-    "{" "=" "}" => bx(RecordLit(BTreeMap::new())),
-    "{" <FieldValues> "}" => bx(RecordLit(BTreeMap::from_iter(<>))),
-};
-
-Record: BoxExpr<'input> = {
-    "{" <FieldTypes> "}" => bx(Record(BTreeMap::from_iter(<>))),
-};
-
-FieldValues = SepBy1<",", Field<"=">>;
-FieldTypes = SepBy<",", Field<":">>;
-
-Field<Sep>: (&'input str, ParsedExpr<'input>) = {
-    <a:Label> Sep <b:Expr> => (a, *b),
-};
diff --git a/dhall_core/src/grammar_util.rs b/dhall_core/src/grammar_util.rs
index 82528f4..73f935f 100644
--- a/dhall_core/src/grammar_util.rs
+++ b/dhall_core/src/grammar_util.rs
@@ -1,7 +1,4 @@
-use crate::core::{Expr, X, Import};
+use crate::core::{Expr, Import, X};
 
 pub type ParsedExpr<'i> = Expr<'i, X, Import>;
 pub type BoxExpr<'i> = Box<ParsedExpr<'i>>;
-pub type ExprOpFn<'i> = fn(BoxExpr<'i>, BoxExpr<'i>) -> ParsedExpr<'i>;
-pub type ExprListFn<'i> =
-    fn(Option<BoxExpr<'i>>, Vec<ParsedExpr<'i>>) -> ParsedExpr<'i>;
diff --git a/dhall_core/src/lexer.rs b/dhall_core/src/lexer.rs
deleted file mode 100644
index 5fc0f05..0000000
--- a/dhall_core/src/lexer.rs
+++ /dev/null
@@ -1,394 +0,0 @@
-use nom::*;
-
-use crate::core::Builtin;
-use crate::core::Builtin::*;
-use crate::core::Const;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Keyword {
-    Let,
-    In,
-    If,
-    Then,
-    Else,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ListLike {
-    List,
-    Optional,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Tok<'i> {
-    Identifier(&'i str),
-    Keyword(Keyword),
-    Builtin(Builtin),
-    ListLike(ListLike),
-    Const(Const),
-    Bool(bool),
-    Integer(isize),
-    Natural(usize),
-    Text(String),
-
-    // Symbols
-    BraceL,
-    BraceR,
-    BracketL,
-    BracketR,
-    ParenL,
-    ParenR,
-    Arrow,
-    Lambda,
-    Pi,
-    Combine,
-    BoolAnd,
-    BoolOr,
-    CompareEQ,
-    CompareNE,
-    Append,
-    Times,
-    Plus,
-    Comma,
-    Dot,
-    Ascription,
-    Equals,
-}
-
-#[derive(Debug)]
-pub enum LexicalError {
-    Error(usize, nom::simple_errors::Err<u32>),
-    Incomplete(nom::Needed),
-}
-
-pub type Spanned<Tok, Loc, Error> = Result<(Loc, Tok, Loc), Error>;
-
-#[allow(dead_code)]
-fn is_identifier_first_char(c: char) -> bool {
-    c.is_alphabetic() || c == '_'
-}
-
-fn is_identifier_rest_char(c: char) -> bool {
-    is_identifier_first_char(c) || c.is_digit(10) || c == '/'
-}
-
-macro_rules! digits {
-    ($i:expr, $t:tt, $radix:expr) => {{
-        let r: nom::IResult<&str, $t> = map_res!(
-            $i,
-            take_while1_s!(call!(|c: char| c.is_digit($radix))),
-            |s| $t::from_str_radix(s, $radix)
-        );
-        r
-    }};
-}
-
-named!(natural<&str, usize>, digits!(usize, 10));
-named!(integral<&str, isize>, digits!(isize, 10));
-named!(integer<&str, isize>, alt!(
-    preceded!(tag!("-"), map!(integral, |i: isize| -i)) |
-    preceded!(tag!("+"), integral)
-));
-named!(boolean<&str, bool>, alt!(
-    value!(true, tag!("True")) |
-    value!(false, tag!("False"))
-));
-
-named!(identifier<&str, &str>, recognize!(preceded!(
-    take_while1_s!(is_identifier_first_char),
-    take_while_s!(is_identifier_rest_char))
-));
-
-/// Parse an identifier, ensuring a whole identifier is parsed and not just a prefix.
-macro_rules! ident_tag {
-    ($i:expr, $tag:expr) => {
-        match identifier($i) {
-            nom::IResult::Done(i, s) => {
-                if s == $tag {
-                    nom::IResult::Done(i, s)
-                } else {
-                    nom::IResult::Error(error_position!(
-                        nom::ErrorKind::Tag,
-                        $i
-                    ))
-                }
-            }
-            r => r,
-        }
-    };
-}
-
-fn string_escape_single(c: char) -> Option<&'static str> {
-    match c {
-        'n' => Some("\n"),
-        'r' => Some("\r"),
-        't' => Some("\t"),
-        '"' => Some("\""),
-        '\'' => Some("'"),
-        '\\' => Some("\\"),
-        '0' => Some("\0"),
-        'a' => Some("\x07"),
-        'b' => Some("\x08"),
-        'f' => Some("\x0c"),
-        'v' => Some("\x0b"),
-        '&' => Some(""),
-        _ => None,
-    }
-}
-
-named!(string_escape_numeric<&str, char>, map_opt!(alt!(
-    preceded!(tag!("x"), digits!(u32, 16)) |
-    preceded!(tag!("o"), digits!(u32, 8)) |
-    digits!(u32, 10)
-), ::std::char::from_u32));
-
-fn string_lit_inner(input: &str) -> nom::IResult<&str, String> {
-    use nom::ErrorKind;
-    use nom::IResult::*; ;
-    let mut s = String::new();
-    let mut cs = input.char_indices().peekable();
-    while let Some((i, c)) = cs.next() {
-        match c {
-            '"' => return nom::IResult::Done(&input[i..], s),
-            '\\' => match cs.next() {
-                Some((_, s)) if s.is_whitespace() => {
-                    while cs.peek().map(|&(_, s)| s.is_whitespace())
-                        == Some(true)
-                    {
-                        let _ = cs.next();
-                    }
-                    if cs.next().map(|p| p.1) != Some('\\') {
-                        return Error(error_position!(
-                            ErrorKind::Custom(4 /* FIXME */),
-                            input
-                        ));
-                    }
-                }
-                Some((j, ec)) => {
-                    if let Some(esc) = string_escape_single(ec) {
-                        s.push_str(esc);
-                    // FIXME Named ASCII escapes and control character escapes
-                    } else {
-                        match string_escape_numeric(&input[j..]) {
-                            Done(rest, esc) => {
-                                let &(k, _) = cs.peek().unwrap();
-                                // digits are always single byte ASCII characters
-                                let consumed = input[k..].len() - rest.len();
-                                for _ in 0..consumed {
-                                    let _ = cs.next();
-                                }
-                                s.push(esc);
-                            }
-                            Incomplete(s) => return Incomplete(s),
-                            Error(e) => return Error(e),
-                        }
-                    }
-                }
-                _ => {
-                    return Error(error_position!(
-                        ErrorKind::Custom(5 /* FIXME */),
-                        input
-                    ));
-                }
-            },
-            _ => s.push(c),
-        }
-    }
-    Error(error_position!(ErrorKind::Custom(3 /* FIXME */), input))
-}
-
-named!(string_lit<&str, String>, delimited!(tag!("\""), string_lit_inner, tag!("\"")));
-
-named!(keyword<&str, Keyword>, alt!(
-    value!(Keyword::Let, ident_tag!("let")) |
-    value!(Keyword::In, ident_tag!("in")) |
-    value!(Keyword::If, ident_tag!("if")) |
-    value!(Keyword::Then, ident_tag!("then")) |
-    value!(Keyword::Else, ident_tag!("else"))
-));
-
-named!(type_const<&str, Const>, alt!(
-    value!(Const::Type, ident_tag!("Type")) |
-    value!(Const::Kind, ident_tag!("Kind"))
-));
-
-named!(list_like<&str, ListLike>, alt!(
-    value!(ListLike::List, ident_tag!("List")) |
-    value!(ListLike::Optional, ident_tag!("Optional"))
-));
-
-named!(builtin<&str, Builtin>, alt!(
-    value!(NaturalFold, ident_tag!("Natural/fold")) |
-    value!(NaturalBuild, ident_tag!("Natural/build")) |
-    value!(NaturalIsZero, ident_tag!("Natural/isZero")) |
-    value!(NaturalEven, ident_tag!("Natural/even")) |
-    value!(NaturalOdd, ident_tag!("Natural/odd")) |
-    value!(NaturalShow, ident_tag!("Natural/show")) |
-    value!(Natural, ident_tag!("Natural")) |
-    value!(Integer, ident_tag!("Integer")) |
-    value!(Double, ident_tag!("Double")) |
-    value!(Text, ident_tag!("Text")) |
-    value!(ListBuild, ident_tag!("List/build")) |
-    value!(ListFold, ident_tag!("List/fold")) |
-    value!(ListLength, ident_tag!("List/length")) |
-    value!(ListHead, ident_tag!("List/head")) |
-    value!(ListLast, ident_tag!("List/last")) |
-    value!(ListIndexed, ident_tag!("List/indexed")) |
-    value!(ListReverse, ident_tag!("List/reverse")) |
-    value!(OptionalFold, ident_tag!("Optional/fold")) |
-    value!(Bool, ident_tag!("Bool"))
-));
-
-named!(token<&str, Tok>, alt!(
-    value!(Tok::Pi, ident_tag!("forall")) |
-    value!(Tok::Pi, tag!("∀")) |
-    value!(Tok::Lambda, tag!("\\")) |
-    value!(Tok::Lambda, tag!("λ")) |
-    value!(Tok::Combine, tag!("/\\")) |
-    value!(Tok::Combine, tag!("∧")) |
-    value!(Tok::Arrow, tag!("->")) |
-    value!(Tok::Arrow, tag!("→")) |
-
-    map!(type_const, Tok::Const) |
-    map!(boolean, Tok::Bool) |
-    map!(keyword, Tok::Keyword) |
-    map!(builtin, Tok::Builtin) |
-    map!(list_like, Tok::ListLike) |
-    map!(natural, Tok::Natural) |
-    map!(integer, Tok::Integer) |
-    map!(identifier, Tok::Identifier) |
-    map!(string_lit, Tok::Text) |
-
-    value!(Tok::BraceL, tag!("{")) |
-    value!(Tok::BraceR, tag!("}")) |
-    value!(Tok::BracketL, tag!("[")) |
-    value!(Tok::BracketR, tag!("]")) |
-    value!(Tok::ParenL, tag!("(")) |
-    value!(Tok::ParenR, tag!(")")) |
-    value!(Tok::BoolAnd, tag!("&&")) |
-    value!(Tok::BoolOr, tag!("||")) |
-    value!(Tok::CompareEQ, tag!("==")) |
-    value!(Tok::CompareNE, tag!("!=")) |
-    value!(Tok::Append, tag!("++")) |
-    value!(Tok::Times, tag!("*")) |
-    value!(Tok::Plus, tag!("+")) |
-    value!(Tok::Comma, tag!(",")) |
-    value!(Tok::Dot, tag!(".")) |
-    value!(Tok::Ascription, tag!(":")) |
-    value!(Tok::Equals, tag!("="))
-));
-
-fn find_end(input: &str, ending: &str) -> Option<usize> {
-    input.find(ending).map(|i| i + ending.len())
-}
-
-pub struct Lexer<'input> {
-    input: &'input str,
-    offset: usize,
-}
-
-impl<'input> Lexer<'input> {
-    pub fn new(input: &'input str) -> Self {
-        Lexer {
-            input: input,
-            offset: 0,
-        }
-    }
-
-    fn current_input(&mut self) -> &'input str {
-        &self.input[self.offset..]
-    }
-
-    fn skip_whitespace(&mut self) -> bool {
-        let input = self.current_input();
-        let trimmed = input.trim_start();
-        let whitespace_len = input.len() - trimmed.len();
-        let skipped = whitespace_len > 0;
-        if skipped {
-            // println!("skipped {} whitespace bytes in {}..{}", whitespace_len, self.offset, self.offset + whitespace_len);
-            self.offset += whitespace_len;
-        }
-        skipped
-    }
-
-    fn skip_comments(&mut self) -> bool {
-        let input = self.current_input();
-        if !input.is_char_boundary(0) || !input.is_char_boundary(2) {
-            return false;
-        }
-        let skip = match &input[0..2] {
-            "{-" => find_end(input, "-}"),
-            "--" => find_end(input, "\n"), // Also skips past \r\n (CRLF)
-            _ => None,
-        }
-        .unwrap_or(0);
-        // println!("skipped {} bytes of comment", skip);
-        self.offset += skip;
-        skip != 0
-    }
-
-    fn skip_comments_and_whitespace(&mut self) {
-        while self.skip_whitespace() || self.skip_comments() {}
-    }
-}
-
-impl<'input> Iterator for Lexer<'input> {
-    type Item = Spanned<Tok<'input>, usize, LexicalError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        use nom::IResult::*;
-        self.skip_comments_and_whitespace();
-        let input = self.current_input();
-        if input.is_empty() {
-            return None;
-        }
-        match token(input) {
-            Done(rest, t) => {
-                let parsed_len = input.len() - rest.len();
-                //println!("parsed {} bytes => {:?}", parsed_len, t);
-                let start = self.offset;
-                self.offset += parsed_len;
-                Some(Ok((start, t, self.offset)))
-            }
-            Error(e) => {
-                let offset = self.offset;
-                self.offset = self.input.len();
-                Some(Err(LexicalError::Error(offset, e)))
-            }
-            Incomplete(needed) => Some(Err(LexicalError::Incomplete(needed))),
-        }
-    }
-}
-
-#[test]
-fn test_lex() {
-    use self::Tok::*;
-    let s = "λ(b : Bool) → b == False";
-    let expected = [
-        Lambda,
-        ParenL,
-        Identifier("b"),
-        Ascription,
-        Builtin(crate::core::Builtin::Bool),
-        ParenR,
-        Arrow,
-        Identifier("b"),
-        CompareEQ,
-        Bool(false),
-    ];
-    let lexer = Lexer::new(s);
-    let tokens = lexer.map(|r| r.unwrap().1).collect::<Vec<_>>();
-    assert_eq!(&tokens, &expected);
-
-    assert_eq!(string_lit(r#""a\&b""#).to_result(), Ok("ab".to_owned()));
-    assert_eq!(
-        string_lit(r#""a\     \b""#).to_result(),
-        Ok("ab".to_owned())
-    );
-    assert!(string_lit(r#""a\     b""#).is_err());
-    assert_eq!(string_lit(r#""a\nb""#).to_result(), Ok("a\nb".to_owned()));
-    assert_eq!(
-        string_lit(r#""\o141\x62\99""#).to_result(),
-        Ok("abc".to_owned())
-    );
-}
diff --git a/dhall_core/src/lib.rs b/dhall_core/src/lib.rs
index 76f436d..bd53603 100644
--- a/dhall_core/src/lib.rs
+++ b/dhall_core/src/lib.rs
@@ -3,9 +3,6 @@
 
 pub mod core;
 pub use crate::core::*;
-use lalrpop_util::lalrpop_mod;
-lalrpop_mod!(pub grammar);
 pub mod context;
 mod grammar_util;
-pub mod lexer;
 pub mod parser;
diff --git a/dhall_core/src/parser.rs b/dhall_core/src/parser.rs
index 09863a2..34327b1 100644
--- a/dhall_core/src/parser.rs
+++ b/dhall_core/src/parser.rs
@@ -1,24 +1,13 @@
-use std::collections::BTreeMap;
-// use itertools::*;
-use lalrpop_util;
 use pest::iterators::Pair;
 use pest::Parser;
+use std::collections::BTreeMap;
 use std::path::PathBuf;
 
 use dhall_parser::{DhallParser, Rule};
 
 use crate::core;
 use crate::core::*;
-use crate::grammar;
 use crate::grammar_util::{BoxExpr, ParsedExpr};
-use crate::lexer::{Lexer, LexicalError, Tok};
-
-pub fn parse_expr_lalrpop(
-    s: &str,
-) -> Result<BoxExpr, lalrpop_util::ParseError<usize, Tok, LexicalError>> {
-    grammar::ExprParser::new().parse(Lexer::new(s))
-    // Ok(bx(Expr::BoolLit(false)))
-}
 
 pub type ParseError = pest::error::Error<Rule>;
 
@@ -818,7 +807,7 @@ rule!(final_expression<BoxExpr<'a>>;
     children!(e: expression, _eoi: EOI) => e
 );
 
-pub fn parse_expr_pest(s: &str) -> ParseResult<BoxExpr> {
+pub fn parse_expr(s: &str) -> ParseResult<BoxExpr> {
     let pairs = DhallParser::parse(Rule::final_expression, s)?;
     // Match the only item in the pairs iterator
     match_iter!(@panic; pairs; (p) => expression(p))
@@ -832,12 +821,12 @@ fn test_parse() {
     // let expr = r#"{ x = "foo", y = 4 }.x"#;
     // let expr = r#"(1 + 2) * 3"#;
     let expr = r#"if True then 1 + 3 * 5 else 2"#;
-    println!("{:?}", parse_expr_lalrpop(expr));
+    println!("{:?}", parse_expr(expr));
     use std::thread;
     // I don't understand why it stack overflows even on tiny expressions...
     thread::Builder::new()
         .stack_size(3 * 1024 * 1024)
-        .spawn(move || match parse_expr_pest(expr) {
+        .spawn(move || match parse_expr(expr) {
             Err(e) => {
                 println!("{:?}", e);
                 println!("{}", e);
@@ -847,14 +836,14 @@ fn test_parse() {
         .unwrap()
         .join()
         .unwrap();
-    // assert_eq!(parse_expr_pest(expr).unwrap(), parse_expr_lalrpop(expr).unwrap());
+    // assert_eq!(parse_expr(expr).unwrap(), parse_expr(expr).unwrap());
     // assert!(false);
 
-    println!("test {:?}", parse_expr_lalrpop("3 + 5 * 10"));
-    assert!(parse_expr_lalrpop("22").is_ok());
-    assert!(parse_expr_lalrpop("(22)").is_ok());
+    println!("test {:?}", parse_expr("3 + 5 * 10"));
+    assert!(parse_expr("22").is_ok());
+    assert!(parse_expr("(22)").is_ok());
     assert_eq!(
-        parse_expr_lalrpop("3 + 5 * 10").ok(),
+        parse_expr("3 + 5 * 10").ok(),
         Some(Box::new(BinOp(
             NaturalPlus,
             Box::new(NaturalLit(3)),
@@ -867,7 +856,7 @@ fn test_parse() {
     );
     // The original parser is apparently right-associative
     assert_eq!(
-        parse_expr_lalrpop("2 * 3 * 4").ok(),
+        parse_expr("2 * 3 * 4").ok(),
         Some(Box::new(BinOp(
             NaturalTimes,
             Box::new(NaturalLit(2)),
@@ -878,15 +867,15 @@ fn test_parse() {
             ))
         )))
     );
-    assert!(parse_expr_lalrpop("((((22))))").is_ok());
-    assert!(parse_expr_lalrpop("((22)").is_err());
-    println!("{:?}", parse_expr_lalrpop("\\(b : Bool) -> b == False"));
-    assert!(parse_expr_lalrpop("\\(b : Bool) -> b == False").is_ok());
-    println!("{:?}", parse_expr_lalrpop("foo.bar"));
-    assert!(parse_expr_lalrpop("foo.bar").is_ok());
-    assert!(parse_expr_lalrpop("[] : List Bool").is_ok());
-
-    // println!("{:?}", parse_expr_lalrpop("< Left = True | Right : Natural >"));
-    // println!("{:?}", parse_expr_lalrpop(r#""bl${42}ah""#));
-    // assert!(parse_expr_lalrpop("< Left = True | Right : Natural >").is_ok());
+    assert!(parse_expr("((((22))))").is_ok());
+    assert!(parse_expr("((22)").is_err());
+    println!("{:?}", parse_expr("\\(b : Bool) -> b == False"));
+    assert!(parse_expr("\\(b : Bool) -> b == False").is_ok());
+    println!("{:?}", parse_expr("foo.bar"));
+    assert!(parse_expr("foo.bar").is_ok());
+    assert!(parse_expr("[] : List Bool").is_ok());
+
+    // println!("{:?}", parse_expr("< Left = True | Right : Natural >"));
+    // println!("{:?}", parse_expr(r#""bl${42}ah""#));
+    // assert!(parse_expr("< Left = True | Right : Natural >").is_ok());
 }
diff --git a/dhall_generator/src/lib.rs b/dhall_generator/src/lib.rs
index b26ea63..5cd93f3 100644
--- a/dhall_generator/src/lib.rs
+++ b/dhall_generator/src/lib.rs
@@ -8,7 +8,7 @@ use quote::quote;
 #[proc_macro]
 pub fn dhall(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let input_str = input.to_string();
-    let expr: Box<Expr<X, Import>> = parser::parse_expr_pest(&input_str).unwrap();
+    let expr: Box<Expr<X, Import>> = parser::parse_expr(&input_str).unwrap();
     let no_import = |_: &Import| -> X { panic!("Don't use import in dhall!()") };
     let expr = expr.map_embed(&no_import);
     let output = dhall_to_tokenstream(&expr, &Context::new());
-- 
cgit v1.2.3