Fixed ternary expressions again

kizeevov · Mar 22, 2024 · 59daf69 · 59daf69
1 parent bf10e62
commit 59daf69
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed ternary expressions again
+
 ## [1.0.1] - 2024-03-20
 
 ### Attention

diff --git a/src/main/grammars/SlintParser.bnf b/src/main/grammars/SlintParser.bnf
@@ -378,9 +378,9 @@ private ArrayAnonymousStruct ::= '[' AnonymousStructDeclaration? (',' (Anonymous
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 Expression ::=
     AssignmentExpression
-    | TernaryExpression
     | BinaryExpression
     | UnaryExpression
+    | TernaryExpression
     | CallBuiltinExpression
     | CallExpression
     | PropertyExpression
@@ -431,15 +431,20 @@ UnaryOperators ::=
 AssignmentExpression ::= PropertyExpression EQ Expression { pin=3 }
 BinaryExpression ::= Expression Operators Expression { pin=3 }
 UnaryExpression ::= UnaryOperators Expression { pin=1 }
-TernaryExpression ::= Expression '?' Expression ':' Expression { pin=4 }
 CallExpression ::= PropertyExpression CallArgumentList { pin=1 }
 CallBuiltinExpression ::= BuiltinFunctions
-ParenthesizedExpression ::= '(' Expression ')' { pin=3 }
 ArrayExpression ::= PropertyExpression '[' Expression ']'
 ArrayAnonymousStructExpression ::= ArrayAnonymousStruct
 AnonymousStructExpression ::= AnonymousStructDeclaration
 ArrayValExpression ::= '[' Expression? (',' (Expression | &']'))* ']'
 
+ParenthesizedExpression ::= '(' ParenthesizedExpressionEnd { pin=1 }
+private ParenthesizedExpressionEnd ::= Expression ')'
+
+TernaryExpression ::= Expression '?' TernaryExpressionThen { pin=2 }
+private TernaryExpressionThen ::= Expression ':' TernaryExpressionElse
+private TernaryExpressionElse ::= Expression
+
 PropertyExpression ::= IDENTIFIER | PROPERTY_IDENTIFIER
 LiteralExpression ::=
     LengthLiteral