bartek/smnp-kt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix operator precedence between relation operators and logic operators

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2020-03-07 19:39:18 +01:00
parent 97cb3d3017
commit c68d5efe62
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/io/smnp/dsl/ast/parser/SubexpressionParser.kt
View File

@@ -19,15 +19,15 @@ class SubexpressionParser : Parser() {
val expr2Parser = leftAssociativeOperator(
expr1Parser,
listOf(TokenType.RELATION, TokenType.OPEN_ANGLE, TokenType.CLOSE_ANGLE),
listOf(TokenType.AND),
expr1Parser
) { lhs, operator, rhs ->
RelationOperatorNode(lhs, operator, rhs)
LogicOperatorNode(lhs, operator, rhs)
}
val expr3Parser = leftAssociativeOperator(
expr2Parser,
listOf(TokenType.AND),
listOf(TokenType.OR),
expr2Parser
) { lhs, operator, rhs ->
LogicOperatorNode(lhs, operator, rhs)
@@ -35,10 +35,10 @@ class SubexpressionParser : Parser() {
val expr4Parser = leftAssociativeOperator(
expr3Parser,
listOf(TokenType.OR),
listOf(TokenType.RELATION, TokenType.OPEN_ANGLE, TokenType.CLOSE_ANGLE),
expr3Parser
) { lhs, operator, rhs ->
LogicOperatorNode(lhs, operator, rhs)
RelationOperatorNode(lhs, operator, rhs)
}
return expr4Parser.parse(input)