berkus
/
kdl-rs
mirror of https://github.com/kdl-org/kdl-rs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(identifier): much larger character set for identifiers (not just alphanumeric), to match spec more closely (#7)

This commit is contained in:
hclarke 2020-12-29 21:05:36 -04:00 committed by Kat Marchán
parent b8c8b52748
commit 95a1ee3e57
No known key found for this signature in database
GPG Key ID: AEB529C08A3C7E9E
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/parser.rs
View File

@ -2,7 +2,7 @@ use std::{collections::HashMap, iter::from_fn};
use nom::branch::alt; use nom::branch::alt;
use nom::bytes::complete::{tag, take_until, take_while_m_n}; use nom::bytes::complete::{tag, take_until, take_while_m_n};
use nom::character::complete::{alpha1, alphanumeric1, anychar, char, none_of, one_of}; use nom::character::complete::{anychar, char, none_of, one_of};
use nom::combinator::{ use nom::combinator::{
all_consuming, eof, iterator, map, map_opt, map_res, not, opt, recognize, value, all_consuming, eof, iterator, map, map_opt, map_res, not, opt, recognize, value,
}; };
@ -112,17 +112,26 @@ pub(crate) fn node(input: &str) -> IResult<&str, Option<KdlNode>, KdlParseError<
} }
} }
/// `identifier_char := unicode - linespace - [\{}<>;[]=,]`
fn identifier_char(input: &str) -> IResult<&str, &str, KdlParseError<&str>> {
not(linespace)(input)?;
recognize(none_of(r#"\{}<>;[]=,""#))(input)
}
/// `identifier_start := identifier_char - digit`
fn identifier_start(input: &str) -> IResult<&str, &str, KdlParseError<&str>> {
not(one_of("0123456789"))(input)?;
identifier_char(input)
}
/// `bare_identifier := [a-zA-Z_] [a-zA-Z0-9!$%&'*+\-./:<>?@\^_|~]*` /// `bare_identifier := [a-zA-Z_] [a-zA-Z0-9!$%&'*+\-./:<>?@\^_|~]*`
pub(crate) fn bare_identifier(input: &str) -> IResult<&str, &str, KdlParseError<&str>> { pub(crate) fn bare_identifier(input: &str) -> IResult<&str, &str, KdlParseError<&str>> {
recognize(pair( recognize(pair(identifier_start, many0(identifier_char)))(input)
alt((alpha1, tag("_"))),
many0(alt((alphanumeric1, recognize(one_of("~!@$%^&*-_+./:<>?"))))),
))(input)
} }
/// `identifier := bare_identifier | string` /// `identifier := bare_identifier | string`
fn identifier(input: &str) -> IResult<&str, String, KdlParseError<&str>> { fn identifier(input: &str) -> IResult<&str, String, KdlParseError<&str>> {
alt((map(bare_identifier, String::from), string))(input) alt((string, (map(bare_identifier, String::from))))(input)
} }
/// `node-props-and-args := ('/-' ws*)? (prop | value)` /// `node-props-and-args := ('/-' ws*)? (prop | value)`