Commit 3482915

committed

Fixed elvis expr parsing

1 parent 260a6e9 commit 3482915Copy full SHA for 3482915

File tree

-4

lines changed

src
- main/java/fr/adrienbrault/idea/symfony2plugin/expressionLanguage
  - ExpressionLanguage.bnf
- test/java/fr/adrienbrault/idea/symfony2plugin/tests/expressionLanguage/testData
  - ElvisExpr.txt

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ expr ::= ternary_group`
`84`	`84`	`private sign_group ::= unary_plus_expr \| unary_min_expr`
`85`	`85`	`private mul_group ::= mul_expr \| div_expr \| mod_expr`
`86`	`86`	`private add_group ::= plus_expr \| minus_expr`
`87`		`-private ternary_group ::= ternary_expr \| elvis_expr`
	`87`	`+private ternary_group ::= elvis_expr \| ternary_expr`
`88`	`88`
`89`	`89`	`private rel_group ::= identical_expr`
`90`	`90`	`\| eq_expr`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`Expression Language File`
`2`		`- ExpressionLanguageTernaryExprImpl(TERNARY_EXPR)`
	`2`	`+ ExpressionLanguageElvisExprImpl(ELVIS_EXPR)`
`3`	`3`	`ExpressionLanguageRefExprImpl(REF_EXPR)`
`4`	`4`	`ExpressionLanguageIdentifierImpl(IDENTIFIER)`
`5`	`5`	`PsiElement( ExpressionLanguageType.id)('a')`
`6`	`6`	`PsiWhiteSpace(' ')`
`7`	`7`	`PsiElement( ExpressionLanguageType.syntax)('?')`
`8`		`- PsiErrorElement:<expr> expected, got ':'`
`9`		`- <empty list>`
`10`	`8`	`PsiElement( ExpressionLanguageType.syntax)(':')`
`11`	`9`	`PsiWhiteSpace(' ')`
`12`	`10`	`ExpressionLanguageRefExprImpl(REF_EXPR)`

Comments

(0)