From c91ff1c2180ade307181fa61fff9756a862d5009 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Thu, 21 Sep 2017 17:39:13 -0500
Subject: [PATCH] Update nom to version 3.2+ and add nom_locate as a
 dependency.

---
 Cargo.toml   |  3 ++-
 src/parse.rs | 19 ++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7474783..c010153 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,8 @@ keywords    = ["compiler", "config"]
 license     = "Apache-2.0"
 
 [dependencies]
-nom         = "^2.2"
+nom         = "^3.2"
+nom_locate  = "^0.1.1"
 quick-error = "^1.2.0"
 clap        = "~2.26.0"
 
diff --git a/src/parse.rs b/src/parse.rs
index 30e9698..bb2f6c8 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -499,7 +499,7 @@ mod test {
 
     use super::{Statement, Expression, Value, MacroDef, SelectDef, CallDef};
     use super::{number, symbol, parse, field_value, tuple, grouped_expression};
-    use super::{arglist, copy_expression, macro_expression, select_expression};
+    use super::{copy_expression, macro_expression, select_expression};
     use super::{format_expression, call_expression, expression};
     use super::{expression_statement, let_statement, import_statement, statement};
     use ast::*;
@@ -774,7 +774,7 @@ mod test {
         assert!(call_expression(&b"foo"[..]).is_incomplete() );
         assert!(call_expression(&b"foo ("[..]).is_incomplete() );
         assert!(call_expression(&b"foo (1"[..]).is_incomplete() );
-        assert!(call_expression(&b"foo (1,"[..]).is_err() );
+        assert!(call_expression(&b"foo (1,"[..]).is_incomplete() );
         assert!(call_expression(&b"foo (1,2"[..]).is_incomplete() );
 
         assert_eq!(call_expression(&b"foo (1, \"foo\")"[..]),
@@ -853,17 +853,6 @@ mod test {
     );
     }
 
-    #[test]
-    fn test_arglist_parse() {
-        assert!(arglist(&b"arg"[..]).is_done());
-        assert!(arglist(&b"arg1, arg2"[..]).is_done());
-        assert_eq!(arglist(&b"arg1, arg2"[..]), IResult::Done(&b""[..],
-                                                  vec![
-                                                      Value::Symbol(make_value_node("arg1".to_string())),
-                                                      Value::Symbol(make_value_node("arg2".to_string()))
-                                                  ]));
-    }
-
     #[test]
     fn test_copy_parse() {
         assert!(copy_expression(&b"{}"[..]).is_err() );
@@ -926,8 +915,8 @@ mod test {
         assert!(tuple(&b"{ foo"[..]).is_incomplete() );
         assert!(tuple(&b"{ foo ="[..]).is_incomplete() );
         assert!(tuple(&b"{ foo = 1"[..]).is_incomplete() );
-        assert!(tuple(&b"{ foo = 1,"[..]).is_err() );
-        assert!(tuple(&b"{ foo = 1, bar ="[..]).is_err() );
+        assert!(tuple(&b"{ foo = 1,"[..]).is_incomplete() );
+        assert!(tuple(&b"{ foo = 1, bar ="[..]).is_incomplete() );
 
         assert_eq!(tuple(&b"{ }"[..]),
             IResult::Done(&b""[..],