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

Fix cond_predicate in cond_predicate

Browse Source
This commit is contained in:
dalance 2019-10-10 17:39:44 +09:00
parent 7b9c4278eb
commit d9b6f921c2
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## [Unreleased](https://github.com/dalance/sv-parser/compare/v0.1.4...Unreleased) - ReleaseDate
* [Fixed] cond_predicate in cond_predicate
* [Fixed] fixed_number priority in delay_value
* [Fixed] cast/const_cast priority
* [Added] unwrap_node macro

25
sv-parser-parser/src/expressions/expressions.rs
View File

@ -37,7 +37,7 @@ pub(crate) fn inc_or_dec_expression_suffix(s: Span) -> IResult<Span, IncOrDecExp
#[tracable_parser]
#[packrat_parser]
pub(crate) fn conditional_expression(s: Span) -> IResult<Span, ConditionalExpression> {
let (s, a) = cond_predicate(s)?;
let (s, a) = cond_predicate_ternary(s)?;
let (s, b) = symbol("?")(s)?;
let (s, c) = many0(attribute_instance)(s)?;
let (s, d) = expression(s)?;
@ -51,6 +51,29 @@ pub(crate) fn conditional_expression(s: Span) -> IResult<Span, ConditionalExpres
))
}
#[recursive_parser]
#[tracable_parser]
#[packrat_parser]
pub(crate) fn cond_predicate_ternary(s: Span) -> IResult<Span, CondPredicate> {
let (s, a) = list(symbol("&&&"), expression_or_cond_pattern_ternary)(s)?;
Ok((s, CondPredicate { nodes: (a,) }))
}
#[tracable_parser]
#[packrat_parser]
pub(crate) fn expression_or_cond_pattern_ternary(
s: Span,
) -> IResult<Span, ExpressionOrCondPattern> {
alt((
map(cond_pattern, |x| {
ExpressionOrCondPattern::CondPattern(Box::new(x))
}),
map(expression, |x| {
ExpressionOrCondPattern::Expression(Box::new(x))
}),
))(s)
}
#[tracable_parser]
#[packrat_parser]
pub(crate) fn constant_expression(s: Span) -> IResult<Span, ConstantExpression> {