zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update nom to version 3.2+ and add nom_locate as a dependency.

Browse Source
This commit is contained in:
Jeremy Wall 2017-09-21 17:39:13 -05:00
parent 14bbd19f16
commit c91ff1c218
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -9,7 +9,8 @@ keywords = ["compiler", "config"]
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
nom = "^2.2" nom = "^3.2"
nom_locate = "^0.1.1"
quick-error = "^1.2.0" quick-error = "^1.2.0"
clap = "~2.26.0" clap = "~2.26.0"

19
src/parse.rs
View File

@ -499,7 +499,7 @@ mod test {
use super::{Statement, Expression, Value, MacroDef, SelectDef, CallDef}; use super::{Statement, Expression, Value, MacroDef, SelectDef, CallDef};
use super::{number, symbol, parse, field_value, tuple, grouped_expression}; 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::{format_expression, call_expression, expression};
use super::{expression_statement, let_statement, import_statement, statement}; use super::{expression_statement, let_statement, import_statement, statement};
use ast::*; 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 ("[..]).is_incomplete() ); assert!(call_expression(&b"foo ("[..]).is_incomplete() );
assert!(call_expression(&b"foo (1"[..]).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!(call_expression(&b"foo (1,2"[..]).is_incomplete() );
assert_eq!(call_expression(&b"foo (1, \"foo\")"[..]), 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] #[test]
fn test_copy_parse() { fn test_copy_parse() {
assert!(copy_expression(&b"{}"[..]).is_err() ); 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 ="[..]).is_incomplete() ); assert!(tuple(&b"{ foo ="[..]).is_incomplete() );
assert!(tuple(&b"{ foo = 1"[..]).is_incomplete() ); assert!(tuple(&b"{ foo = 1"[..]).is_incomplete() );
assert!(tuple(&b"{ foo = 1,"[..]).is_err() ); assert!(tuple(&b"{ foo = 1,"[..]).is_incomplete() );
assert!(tuple(&b"{ foo = 1, bar ="[..]).is_err() ); assert!(tuple(&b"{ foo = 1, bar ="[..]).is_incomplete() );
assert_eq!(tuple(&b"{ }"[..]), assert_eq!(tuple(&b"{ }"[..]),
IResult::Done(&b""[..], IResult::Done(&b""[..],