Merge pull request #2 from nikunjy/operation_panic_remove

Removing panics from operations
nikunjy · May 3, 2019 · 6355e64 · 6355e64
2 parents b238563 + a92cf80
commit 6355e64
Show file tree

Hide file tree

Showing 8 changed files with 164 additions and 154 deletions.
diff --git a/parser/bool_operation.go b/parser/bool_operation.go
@@ -13,46 +13,46 @@ func (o *BoolOperation) get(left Operand, right Operand) (bool, bool, bool) {
 	return leftVal, rightVal, (ok && ok1)
 }
 
-func (o *BoolOperation) EQ(left Operand, right Operand) bool {
+func (o *BoolOperation) EQ(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l == r
+	return l == r, nil
 }
 
-func (o *BoolOperation) NE(left Operand, right Operand) bool {
+func (o *BoolOperation) NE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l != r
+	return l != r, nil
 }
 
-func (o *BoolOperation) GT(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) GT(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *BoolOperation) LT(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) LT(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *BoolOperation) GE(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) GE(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *BoolOperation) LE(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) LE(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *BoolOperation) CO(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) CO(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *BoolOperation) SW(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) SW(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *BoolOperation) EW(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *BoolOperation) EW(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
diff --git a/parser/float_operation.go b/parser/float_operation.go
@@ -26,67 +26,67 @@ func (o *FloatOperation) get(left Operand, right Operand) (float64, float64, boo
 
 }
 
-func (o *FloatOperation) EQ(left Operand, right Operand) bool {
+func (o *FloatOperation) EQ(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l == r
+	return l == r, nil
 }
 
-func (o *FloatOperation) NE(left Operand, right Operand) bool {
+func (o *FloatOperation) NE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l != r
+	return l != r, nil
 }
 
-func (o *FloatOperation) GT(left Operand, right Operand) bool {
+func (o *FloatOperation) GT(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l > r
+	return l > r, nil
 }
 
-func (o *FloatOperation) LT(left Operand, right Operand) bool {
+func (o *FloatOperation) LT(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l < r
+	return l < r, nil
 }
 
-func (o *FloatOperation) GE(left Operand, right Operand) bool {
+func (o *FloatOperation) GE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l >= r
+	return l >= r, nil
 }
 
-func (o *FloatOperation) LE(left Operand, right Operand) bool {
+func (o *FloatOperation) LE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l <= r
+	return l <= r, nil
 }
 
-func (o *FloatOperation) IN(left Operand, right Operand) bool {
+func (o *FloatOperation) IN(left Operand, right Operand) (bool, error) {
 	leftVal, ok := toNum(left)
 	if !ok {
-		return ok
+		return ok, nil
 	}
 	rightVal, ok := right.([]float64)
 	if !ok {
-		return ok
+		return ok, nil
 	}
 	for _, num := range rightVal {
 		if num == leftVal {
-			return true
+			return true, nil
 		}
 	}
-	return false
+	return false, nil
 }
diff --git a/parser/int_operation.go b/parser/int_operation.go
@@ -13,79 +13,79 @@ func (o *IntOperation) get(left Operand, right Operand) (int, int, bool) {
 
 }
 
-func (o *IntOperation) EQ(left Operand, right Operand) bool {
+func (o *IntOperation) EQ(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l == r
+	return l == r, nil
 }
 
-func (o *IntOperation) NE(left Operand, right Operand) bool {
+func (o *IntOperation) NE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l != r
+	return l != r, nil
 }
 
-func (o *IntOperation) GT(left Operand, right Operand) bool {
+func (o *IntOperation) GT(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l > r
+	return l > r, nil
 }
 
-func (o *IntOperation) LT(left Operand, right Operand) bool {
+func (o *IntOperation) LT(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l < r
+	return l < r, nil
 }
 
-func (o *IntOperation) GE(left Operand, right Operand) bool {
+func (o *IntOperation) GE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l >= r
+	return l >= r, nil
 }
 
-func (o *IntOperation) LE(left Operand, right Operand) bool {
+func (o *IntOperation) LE(left Operand, right Operand) (bool, error) {
 	l, r, ok := o.get(left, right)
 	if !ok {
-		return ok
+		return ok, nil
 	}
-	return l <= r
+	return l <= r, nil
 }
 
-func (o *IntOperation) CO(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *IntOperation) CO(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *IntOperation) SW(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *IntOperation) SW(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *IntOperation) EW(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *IntOperation) EW(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *IntOperation) IN(left Operand, right Operand) bool {
+func (o *IntOperation) IN(left Operand, right Operand) (bool, error) {
 	leftVal, ok := left.(int)
 	if !ok {
-		return ok
+		return ok, nil
 	}
 	rightVal, ok := right.([]int)
 	if !ok {
-		return ok
+		return ok, nil
 	}
 	for _, num := range rightVal {
 		if num == leftVal {
-			return true
+			return true, nil
 		}
 	}
-	return false
+	return false, nil
 }
diff --git a/parser/jsonquery_visitor_impl.go b/parser/jsonquery_visitor_impl.go
@@ -101,7 +101,7 @@ func (j *JsonQueryVisitorImpl) VisitPresentExp(ctx *PresentExpContext) interface
 func (j *JsonQueryVisitorImpl) VisitCompareExp(ctx *CompareExpContext) interface{} {
 	ctx.AttrPath().Accept(j)
 	ctx.Value().Accept(j)
-	var apply func(Operand, Operand) bool
+	var apply func(Operand, Operand) (bool, error)
 	currentOp := j.currentOperation
 	switch ctx.op.GetTokenType() {
 	case JsonQueryParserEQ:
@@ -128,7 +128,11 @@ func (j *JsonQueryVisitorImpl) VisitCompareExp(ctx *CompareExpContext) interface
 		panic("unknown operation")
 	}
 	defer func() { j.rightOp = nil }()
-	return apply(j.leftOp, j.rightOp)
+	ret, err := apply(j.leftOp, j.rightOp)
+	if err != nil {
+		panic(err)
+	}
+	return ret
 }
 
 func (j *JsonQueryVisitorImpl) VisitAttrPath(ctx *AttrPathContext) interface{} {

diff --git a/parser/null_operation.go b/parser/null_operation.go
@@ -3,42 +3,42 @@ package parser
 type NullOperation struct {
 }
 
-func (o *NullOperation) EQ(left Operand, right Operand) bool {
-	return left == nil
+func (o *NullOperation) EQ(left Operand, right Operand) (bool, error) {
+	return left == nil, nil
 }
 
-func (o *NullOperation) NE(left Operand, right Operand) bool {
-	return left != nil
+func (o *NullOperation) NE(left Operand, right Operand) (bool, error) {
+	return left != nil, nil
 }
 
-func (o *NullOperation) GT(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) GT(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) LT(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) LT(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) GE(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) GE(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) LE(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) LE(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) CO(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) CO(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) SW(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) SW(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) EW(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) EW(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
 
-func (o *NullOperation) IN(left Operand, right Operand) bool {
-	panic("not supported")
+func (o *NullOperation) IN(left Operand, right Operand) (bool, error) {
+	return false, ErrInvalidOperation
 }
diff --git a/parser/operation.go b/parser/operation.go
@@ -1,16 +1,22 @@
 package parser
 
+import "errors"
+
 type Operand interface{}
 
+var (
+	ErrInvalidOperation = errors.New("Invalid operation on the type")
+)
+
 type Operation interface {
-	EQ(left Operand, right Operand) bool
-	NE(left Operand, right Operand) bool
-	GT(left Operand, right Operand) bool
-	LT(left Operand, right Operand) bool
-	GE(left Operand, right Operand) bool
-	LE(left Operand, right Operand) bool
-	CO(left Operand, right Operand) bool
-	SW(left Operand, right Operand) bool
-	EW(left Operand, right Operand) bool
-	IN(left Operand, right Operand) bool
+	EQ(left Operand, right Operand) (bool, error)
+	NE(left Operand, right Operand) (bool, error)
+	GT(left Operand, right Operand) (bool, error)
+	LT(left Operand, right Operand) (bool, error)
+	GE(left Operand, right Operand) (bool, error)
+	LE(left Operand, right Operand) (bool, error)
+	CO(left Operand, right Operand) (bool, error)
+	SW(left Operand, right Operand) (bool, error)
+	EW(left Operand, right Operand) (bool, error)
+	IN(left Operand, right Operand) (bool, error)
 }