Comparison operators refactoring.
This commit is contained in:
parent
64ba909381
commit
7b89caa7e0
28 changed files with 694 additions and 384 deletions
|
|
@ -3,9 +3,6 @@ package sqlbuilder
|
|||
type integerExpression interface {
|
||||
numericExpression
|
||||
|
||||
//AddInt(value int) integerExpression
|
||||
//AddInt64(value int) integerExpression
|
||||
|
||||
BitAnd(expression integerExpression) integerExpression
|
||||
BitOr(expression integerExpression) integerExpression
|
||||
BitXor(expression integerExpression) integerExpression
|
||||
|
|
@ -16,14 +13,6 @@ type integerInterfaceImpl struct {
|
|||
parent integerExpression
|
||||
}
|
||||
|
||||
//func (i *integerInterfaceImpl) AddInt(expression integerExpression) integerExpression {
|
||||
// return NewBinaryIntegerExpression(i.parent, expression, " & ")
|
||||
//}
|
||||
//
|
||||
//func (i *integerInterfaceImpl) AddInt64(expression integerExpression) integerExpression {
|
||||
// return NewBinaryIntegerExpression(i.parent, expression, " & ")
|
||||
//}
|
||||
|
||||
func (i *integerInterfaceImpl) BitAnd(expression integerExpression) integerExpression {
|
||||
return NewBinaryIntegerExpression(i.parent, expression, " & ")
|
||||
}
|
||||
|
|
@ -46,7 +35,7 @@ type binaryIntegerExpression struct {
|
|||
numericInterfaceImpl
|
||||
integerInterfaceImpl
|
||||
|
||||
binaryExpression
|
||||
binaryOpExpression
|
||||
}
|
||||
|
||||
func NewBinaryIntegerExpression(lhs, rhs integerExpression, operator string) integerExpression {
|
||||
|
|
@ -56,7 +45,7 @@ func NewBinaryIntegerExpression(lhs, rhs integerExpression, operator string) int
|
|||
integerExpression.numericInterfaceImpl.parent = &integerExpression
|
||||
integerExpression.integerInterfaceImpl.parent = &integerExpression
|
||||
|
||||
integerExpression.binaryExpression = newBinaryExpression(lhs, rhs, operator)
|
||||
integerExpression.binaryOpExpression = newBinaryExpression(lhs, rhs, operator)
|
||||
|
||||
return &integerExpression
|
||||
}
|
||||
|
|
@ -67,12 +56,12 @@ type prefixIntegerExpression struct {
|
|||
numericInterfaceImpl
|
||||
integerInterfaceImpl
|
||||
|
||||
prefixExpression
|
||||
prefixOpExpression
|
||||
}
|
||||
|
||||
func NewPrefixIntegerExpression(expression integerExpression, operator string) integerExpression {
|
||||
integerExpression := prefixIntegerExpression{}
|
||||
integerExpression.prefixExpression = newPrefixExpression(expression, operator)
|
||||
integerExpression.prefixOpExpression = newPrefixExpression(expression, operator)
|
||||
|
||||
integerExpression.expressionInterfaceImpl.parent = &integerExpression
|
||||
integerExpression.numericInterfaceImpl.parent = &integerExpression
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue