Skip to content

Commit

Permalink
Update to nom 1.0
Browse files Browse the repository at this point in the history 
changes:

* ErrorCode => ErrorKind
* eof is now part of nom
* alt! will now return on Incomplete
  • Loading branch information
@Geal
Geal committed Oct 27, 2015
1 parent 7cf9932 commit 32a5eca
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ repository = "https://github.com/filipegoncalves/rust-config"
readme = "README.md"

[dependencies]
nom = "~0.3.0"
nom = "~1.0.0"
64 changes: 28 additions & 36 deletions src/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ use std::iter;

use types::{SettingsList, Setting, Value, ScalarValue, ArrayValue, ListValue, Config};

use nom::{alpha, alphanumeric, digit, multispace, not_line_ending};
use nom::IResult;
use nom::Err::Code;
use nom::{alpha, alphanumeric, digit, multispace, not_line_ending, eof};
use nom::IResult::*;

pub type ParseError = u32;
Expand Down Expand Up @@ -561,14 +559,14 @@ named!(blanks,
// NOTE: In some cases, this parser is combined with others that use `not_line_ending`
// However, `not_line_ending` won't match `\u{2028}` or `\u{2029}`
named!(eol,
alt!(tag!("\r\n") | tag!("\n") | tag!("\u{2028}") | tag!("\u{2029}")));
alt!(tag!("\n") | tag!("\r\n") | tag!("\u{2028}") | tag!("\u{2029}")));

// Auxiliary parser to ignore one-line comments
named!(comment_one_line,
chain!(
alt!(tag!("//") | tag!("#")) ~
not_line_ending? ~
alt!(eol | eof),
alt!(eof | eol),
|| { &b""[..] }));

// Auxiliary parser to ignore block comments
Expand All @@ -578,15 +576,6 @@ named!(comment_block,
take_until_and_consume!(&b"*/"[..]),
|| { &b""[..] }));

// This parser is successful only if the input is over
fn eof(input:&[u8]) -> IResult<&[u8], &[u8]> {
if input.len() == 0 {
Done(input, input)
} else {
Error(Code(0))
}
}

// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// ~~~ End of parsers section ~~~
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -742,8 +731,8 @@ mod test {
use super::{value, array, group, list};
use super::conf;

use nom::ErrorCode;
use nom::Err::{Code, Position};
use nom::ErrorKind;
use nom::Err::Position;
use nom::IResult::*;

use types::{Setting, SettingsList, Value, ScalarValue, Config};
Expand Down Expand Up @@ -788,14 +777,14 @@ mod test {
fn setting_name_bad_num_prefix() {
let a_setting = &b"12_xxx"[..];
let res = setting_name(a_setting);
assert_eq!(res, Error(Position(ErrorCode::Alpha as u32, b"12_xxx")));
assert_eq!(res, Error(Position(ErrorKind::Alpha, &b"12_xxx"[..])));
}

#[test]
fn setting_name_bad_symbol_prefix() {
let a_setting = &b"__not_allowed"[..];
let res = setting_name(a_setting);
assert_eq!(res, Error(Position(ErrorCode::Alpha as u32, b"__not_allowed")));
assert_eq!(res, Error(Position(ErrorKind::Alpha, &b"__not_allowed"[..])));
}

#[test]
Expand Down Expand Up @@ -935,14 +924,14 @@ mod test {
fn bad_escape_sequence1() {
let bad_escaped_seq = &b"\\q"[..];
let res = escaped_seq(bad_escaped_seq);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"\\q")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"\\q"[..])));
}

#[test]
fn bad_escape_sequence2() {
let bad_escape_seq = &b"aaa"[..];
let res = escaped_seq(bad_escape_seq);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"aaa")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"aaa"[..])));
}

#[test]
Expand Down Expand Up @@ -1055,7 +1044,7 @@ mod test {
fn end_of_line1() {
let input = &b"a test\n"[..];
let res = eol(input);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"a test\n")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"a test\n"[..])));
}

#[test]
Expand Down Expand Up @@ -1083,7 +1072,7 @@ mod test {
fn one_line_comment_bad() {
let input = &b"not a comment // see?"[..];
let res = comment_one_line(input);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"not a comment // see?")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"not a comment // see?"[..])));
}

#[test]
Expand Down Expand Up @@ -1118,7 +1107,7 @@ mod test {
fn comment_blk_bad() {
let input = &b"not a comment /* see?"[..];
let res = comment_block(input);
assert_eq!(res, Error(Position(ErrorCode::Tag as u32, b"not a comment /* see?")));
assert_eq!(res, Error(Position(ErrorKind::Tag, &b"not a comment /* see?"[..])));
}

#[test]
Expand Down Expand Up @@ -1218,7 +1207,7 @@ mod test {
fn flt_base_w_digits_before_dot() {
let input = &b".4435"[..];
let res = flt_base_w_digits_bef_dot(input);
assert_eq!(res, Error(Position(ErrorCode::Digit as u32, b".4435")));
assert_eq!(res, Error(Position(ErrorKind::Digit, &b".4435"[..])));
}

#[test]
Expand Down Expand Up @@ -1260,7 +1249,7 @@ mod test {
fn flt_base_no_digits_before_dot() {
let input = &b"0.0"[..];
let res = flt_base_no_digits_bef_dot(input);
assert_eq!(res, Error(Position(ErrorCode::Tag as u32, b"0.0")));
assert_eq!(res, Error(Position(ErrorKind::Tag, &b"0.0"[..])));
}

#[test]
Expand All @@ -1274,7 +1263,7 @@ mod test {
fn flt_base_no_digits_before_dot3() {
let input = &b".\n"[..];
let res = flt_base_no_digits_bef_dot(input);
assert_eq!(res, Error(Position(ErrorCode::Digit as u32, b"\n" /* dot is consumed */)));
assert_eq!(res, Error(Position(ErrorKind::Digit, &b"\n"[..] /* dot is consumed */)));
}

#[test]
Expand Down Expand Up @@ -1337,7 +1326,7 @@ mod test {
fn flt_exponent_value() {
let input = &b"eee"[..];
let res = flt_exponent(input);
assert_eq!(res, Error(Position(ErrorCode::Digit as u32, b"ee" /* one e consumed */)));
assert_eq!(res, Error(Position(ErrorKind::Digit, &b"ee"[..] /* one e consumed */)));
}

#[test]
Expand Down Expand Up @@ -1638,7 +1627,7 @@ mod test {
fn integer_scalar_value() {
let input = &b"-------"[..];
let res = int_scalar_value(input);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"-------")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"-------"[..])));
}

#[test]
Expand Down Expand Up @@ -1935,14 +1924,14 @@ mod test {
fn bad_array() {
let input = &b"[true, \"a\", 14, 19, 5.0e1];\n"[..];
let res = array(input);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"[true, \"a\", 14, 19, 5.0e1];\n")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"[true, \"a\", 14, 19, 5.0e1];\n"[..])));
}

#[test]
fn bad_array2() {
let input = &b"[\"a bad array\", 12, 3.0e-1, true];\n"[..];
let res = array(input);
assert_eq!(res, Error(Position(ErrorCode::Alt as u32, b"[\"a bad array\", 12, 3.0e-1, true];\n")));
assert_eq!(res, Error(Position(ErrorKind::Alt, &b"[\"a bad array\", 12, 3.0e-1, true];\n"[..])));
}

#[test]
Expand Down Expand Up @@ -2563,20 +2552,23 @@ mod test {

#[test]
fn conf_simple_bad_array() {
let parsed = conf(&b"bad_array = [\"a bad array\", 12, 3.0e-1, true];\n"[..]);
assert_eq!(parsed, Error(Code(0)));
let input = b"bad_array = [\"a bad array\", 12, 3.0e-1, true];\n";
let parsed = conf(&input[..]);
assert_eq!(parsed, Error(Position(ErrorKind::Eof, &input[..])));
}

#[test]
fn conf_bad_array() {
let parsed = conf(&b"bad_array = [\"a bad array\", (\"array\", 5, 4, 2)];\n"[..]);
assert_eq!(parsed, Error(Code(0)));
let input = b"bad_array = [\"a bad array\", (\"array\", 5, 4, 2)];\n";
let parsed = conf(&input[..]);
assert_eq!(parsed, Error(Position(ErrorKind::Eof, &input[..])));
}

#[test]
fn conf_bad_array_not_scalar() {
let parsed = conf(&b"bad_array = [(1, 2, 3), (4, 5, 6)];\n"[..]);
assert_eq!(parsed, Error(Code(0)));
let input = b"bad_array = [(1, 2, 3), (4, 5, 6)];\n";
let parsed = conf(&input[..]);
assert_eq!(parsed, Error(Position(ErrorKind::Eof, &input[..])));
}

#[test]
Expand Down

0 comments on commit 32a5eca

Please sign in to comment.