Skip to content

Commit

Permalink
#12 add unit tests for precedence func
Browse files Browse the repository at this point in the history
  • Loading branch information
thegodenage committed Mar 26, 2024
1 parent cf3a37a commit 508d77f
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 3 deletions.
6 changes: 3 additions & 3 deletions internal/rule/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func reversePolishNotationSort(tokens []Token) []Token {
if isOperator(token) {
if v, ok := operatorStack.Peek(); ok {
vt := v.(Token)
if isGreaterOperatorOnStack(token, vt) {
if isTokenWithGreaterPrecedenceFromThePrecedenceSlice(token, vt) {
for !operatorStack.Empty() {
v, ok := operatorStack.Pop()
if !ok {
Expand Down Expand Up @@ -131,7 +131,7 @@ func isOperator(tkn Token) bool {
return false
}

func isGreaterOperatorOnStack(tkn Token, lastTknFromStack Token) bool {
func isTokenWithGreaterPrecedenceFromThePrecedenceSlice(tkn Token, lastTknFromStack Token) bool {
var (
tknIdx int
lastTknFromStackIdx int
Expand All @@ -148,5 +148,5 @@ func isGreaterOperatorOnStack(tkn Token, lastTknFromStack Token) bool {
}
}

return lastTknFromStackIdx > tknIdx
return lastTknFromStackIdx < tknIdx
}
48 changes: 48 additions & 0 deletions internal/rule/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,51 @@ func Test_isOperator(t *testing.T) {
})
}
}

func Test_isTokenWithGreaterPrecedenceFromThePrecedenceSlices(t *testing.T) {
type args struct {
tkn Token
lastTknFromStack Token
}
tests := []struct {
name string
args args
want bool
}{
{
name: "token with greater precedence, true returned",
args: args{
tkn: Token{
Name: tokenOr,
Value: tokenOr,
},
lastTknFromStack: Token{
Name: tokenLParen,
Value: tokenLParen,
},
},
want: true,
},
{
name: "token with less precedence, false returned",
args: args{
tkn: Token{
Name: tokenLParen,
Value: tokenLParen,
},
lastTknFromStack: Token{
Name: tokenOr,
Value: tokenOr,
},
},
want: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := isTokenWithGreaterPrecedenceFromThePrecedenceSlice(tt.args.tkn, tt.args.lastTknFromStack); got != tt.want {
t.Errorf("isTokenWithGreaterPrecedenceFromThePrecedenceSlice() = %v, want %v", got, tt.want)
}
})
}
}

0 comments on commit 508d77f

Please sign in to comment.