summaryrefslogtreecommitdiff
path: root/dhall/src
diff options
context:
space:
mode:
authorNadrieril2019-03-06 23:48:32 +0100
committerNadrieril2019-03-06 23:48:32 +0100
commite3813e7d4e3450704c1213fd6cdff7c801ccbc34 (patch)
tree86b248b5e1c8a0053a1a447b5ff4e38c267fcb3e /dhall/src
parent54382cd107d1befd6015f8232716158a20db44a4 (diff)
Finally get rid of old parser
Diffstat (limited to 'dhall/src')
-rw-r--r--dhall/src/main.rs30
1 files changed, 2 insertions, 28 deletions
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;
}
};