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

Allow '-' and '_' in symbols.

Browse Source
This commit is contained in:
Jeremy Wall 2017-08-11 23:16:13 -05:00
parent 9df7d57f69
commit 9b367fa2d2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/parse.rs
View File

@ -154,9 +154,13 @@ named!(equal, tag!("="));
named!(semicolon, tag!(";")); named!(semicolon, tag!(";"));
named!(fatcomma, tag!("=>")); named!(fatcomma, tag!("=>"));
fn is_symbol_char(c: u8) -> bool {
is_alphanumeric(c) || c == '-' as u8 || c == '_' as u8
}
// a field is the building block of symbols and tuple field names. // a field is the building block of symbols and tuple field names.
named!(field<String>, named!(field<String>,
map_res!(preceded!(peek!(alpha), take_while!(is_alphanumeric)), map_res!(preceded!(peek!(alpha), take_while!(is_symbol_char)),
|s| from_utf8(s).map(|s| s.to_string()) |s| from_utf8(s).map(|s| s.to_string())
) )
); );
@ -1023,6 +1027,10 @@ mod test {
fn test_symbol_parsing() { fn test_symbol_parsing() {
assert_eq!(symbol(&b"foo"[..]), assert_eq!(symbol(&b"foo"[..]),
IResult::Done(&b""[..], Value::Symbol("foo".to_string())) ); IResult::Done(&b""[..], Value::Symbol("foo".to_string())) );
assert_eq!(symbol(&b"foo-bar"[..]),
IResult::Done(&b""[..], Value::Symbol("foo-bar".to_string())) );
assert_eq!(symbol(&b"foo_bar"[..]),
IResult::Done(&b""[..], Value::Symbol("foo_bar".to_string())) );
} }
#[test] #[test]