Skip to content

correct parsing of complex expressions #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Miha-ha wants to merge 2 commits into
base: master
Choose a base branch
from
Open

correct parsing of complex expressions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70730ef
the correct parsing of complex expressions
Miha-ha Apr 29, 2018
262b481
remove comment
Miha-ha May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions parse/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,19 @@ loop:
break loop
}
case T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_NOT, T_IS_EQUAL, T_IS_NOT_EQUAL, T_IS_GREATER, T_IS_GREATER_OR_EQUAL, T_IS_SMALLER, T_IS_SMALLER_OR_EQUAL:
node.value = token
node.right = newTree()
stack.push(node)
node = node.right
if node.value.Type != T_ERR {
tree = newTree()
tree.left = node
tree.right = newTree()
tree.value = token
stack.push(tree)
node = tree.right
} else {
Comment thread
Miha-ha marked this conversation as resolved.
node.value = token
node.right = newTree()
stack.push(node)
node = node.right
}
case T_IDENTIFIER, T_NUMBER, T_STRING, T_BOOLEAN:
node.value = token
node, err = stack.pop()
Expand Down
84 changes: 84 additions & 0 deletions parse/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,90 @@ func TestParser(t *testing.T) {
exp string
ast *tree
}{
{
"foo > bar",
&tree{
value: token{Type: T_IS_GREATER, Value: ">"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "foo"},
},
right: &tree{
value: token{Type: T_IDENTIFIER, Value: "bar"},
},
},
},
{
"((f > 1) && (f < 3)) && ((b > 1) && (b < 3))",
&tree{
value: token{Type: T_LOGICAL_AND, Value: "&&"},
left: &tree{
value: token{Type: T_LOGICAL_AND, Value: "&&"},
left: &tree{
value: token{Type: T_IS_GREATER, Value: ">"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "f"},
},
right: &tree{
value: token{Type: T_NUMBER, Value: "1"},
},
},
right: &tree{
value: token{Type: T_IS_SMALLER, Value: "<"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "f"},
},
right: &tree{
value: token{Type: T_NUMBER, Value: "3"},
},
},
},
right: &tree{
value: token{Type: T_LOGICAL_AND, Value: "&&"},
left: &tree{
value: token{Type: T_IS_GREATER, Value: ">"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "b"},
},
right: &tree{
value: token{Type: T_NUMBER, Value: "1"},
},
},
right: &tree{
value: token{Type: T_IS_SMALLER, Value: "<"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "b"},
},
right: &tree{
value: token{Type: T_NUMBER, Value: "3"},
},
},
},
},
},
{
"((f > 1) && (f < 3))",
&tree{
value: token{Type: T_LOGICAL_AND, Value: "&&"},
left: &tree{
value: token{Type: T_IS_GREATER, Value: ">"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "f"},
},
right: &tree{
value: token{Type: T_NUMBER, Value: "1"},
},
},
right: &tree{
value: token{Type: T_IS_SMALLER, Value: "<"},
left: &tree{
value: token{Type: T_IDENTIFIER, Value: "f"},
},
right: &tree{
value: token{Type: T_NUMBER, Value: "3"},
},
},
},
},
{
"(foo > bar)",
&tree{
Expand Down