kirigaya/sv-parser
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix macro argument text

Browse Source
This commit is contained in:
dalance 2019-09-18 17:30:19 +09:00
parent 354dd95b2a
commit a6789b9752
1 changed files with 92 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
sv-parser-parser/src/general/compiler_directives.rs
View File

@ -204,7 +204,49 @@ pub(crate) fn macro_text(s: Span) -> IResult<Span, MacroText> {
#[tracable_parser] #[tracable_parser]
#[packrat_parser] #[packrat_parser]
pub(crate) fn default_text(s: Span) -> IResult<Span, DefaultText> { pub(crate) fn default_text(s: Span) -> IResult<Span, DefaultText> {
let (s, a) = is_not(",)")(s)?; let (s, a) = many1(alt((
is_not(",)([{\""),
map(triple(tag("("), opt(is_not(")")), tag(")")), |(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
}),
map(triple(tag("["), opt(is_not("]")), tag("]")), |(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
}),
map(triple(tag("{"), opt(is_not("}")), tag("}")), |(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
}),
map(
triple(tag("\""), opt(is_not("\"")), tag("\"")),
|(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
},
),
)))(s)?;
let mut ret = None;
for x in a {
ret = if let Some(ret) = ret {
Some(concat(ret, x).unwrap())
} else {
Some(x)
}
}
let a = ret.unwrap();
Ok(( Ok((
s, s,
DefaultText { DefaultText {
@ -232,8 +274,55 @@ pub(crate) fn list_of_actual_arguments(s: Span) -> IResult<Span, ListOfActualArg
#[tracable_parser] #[tracable_parser]
#[packrat_parser] #[packrat_parser]
pub(crate) fn actual_argument(s: Span) -> IResult<Span, ActualArgument> { pub(crate) fn actual_argument(s: Span) -> IResult<Span, ActualArgument> {
let (s, a) = expression(s)?; let (s, a) = many1(alt((
Ok((s, ActualArgument { nodes: (a,) })) is_not(",)([{\""),
map(triple(tag("("), opt(is_not(")")), tag(")")), |(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
}),
map(triple(tag("["), opt(is_not("]")), tag("]")), |(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
}),
map(triple(tag("{"), opt(is_not("}")), tag("}")), |(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
}),
map(
triple(tag("\""), opt(is_not("\"")), tag("\"")),
|(x, y, z)| {
if let Some(y) = y {
concat(concat(x, y).unwrap(), z).unwrap()
} else {
concat(x, z).unwrap()
}
},
),
)))(s)?;
let mut ret = None;
for x in a {
ret = if let Some(ret) = ret {
Some(concat(ret, x).unwrap())
} else {
Some(x)
}
}
let a = ret.unwrap();
Ok((
s,
ActualArgument {
nodes: (into_locate(a),),
},
))
} }
#[tracable_parser] #[tracable_parser]