mirrors/go-jsonnet
1
0
Fork 0
mirror of https://github.com/google/go-jsonnet.git synced 2025-09-28 17:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Throw an error on negative shifts (#421)

Browse Source 
Throw an error on negative shifts
This commit is contained in:
Alexander Petrov 2020-06-12 19:42:02 +01:00 committed by GitHub
parent d1c1457520
commit 3bd1fb82ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtins.go
View File

@ -844,7 +844,7 @@ var builtinExponent = liftNumeric(func(f float64) float64 {
return float64(exponent) return float64(exponent)
}) })
func liftBitwise(f func(int64, int64) int64) func(*interpreter, traceElement, value, value) (value, error) { func liftBitwise(f func(int64, int64) int64, positiveRightArg bool) func(*interpreter, traceElement, value, value) (value, error) {
return func(i *interpreter, trace traceElement, xv, yv value) (value, error) { return func(i *interpreter, trace traceElement, xv, yv value) (value, error) {
x, err := i.getNumber(xv, trace) x, err := i.getNumber(xv, trace)
if err != nil { if err != nil {
@ -862,16 +862,18 @@ func liftBitwise(f func(int64, int64) int64) func(*interpreter, traceElement, va
msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, int64(math.MinInt64), int64(math.MaxInt64)) msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, int64(math.MinInt64), int64(math.MaxInt64))
return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace)) return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
} }
if positiveRightArg && y.value < 0 {
return nil, makeRuntimeError("Shift by negative exponent.", i.getCurrentStackTrace(trace))
}
return makeDoubleCheck(i, trace, float64(f(int64(x.value), int64(y.value)))) return makeDoubleCheck(i, trace, float64(f(int64(x.value), int64(y.value))))
} }
} }
// TODO(sbarzowski) negative shifts var builtinShiftL = liftBitwise(func(x, y int64) int64 { return x << uint(y%64) }, true)
var builtinShiftL = liftBitwise(func(x, y int64) int64 { return x << uint(y%64) }) var builtinShiftR = liftBitwise(func(x, y int64) int64 { return x >> uint(y%64) }, true)
var builtinShiftR = liftBitwise(func(x, y int64) int64 { return x >> uint(y%64) }) var builtinBitwiseAnd = liftBitwise(func(x, y int64) int64 { return x & y }, false)
var builtinBitwiseAnd = liftBitwise(func(x, y int64) int64 { return x & y }) var builtinBitwiseOr = liftBitwise(func(x, y int64) int64 { return x | y }, false)
var builtinBitwiseOr = liftBitwise(func(x, y int64) int64 { return x | y }) var builtinBitwiseXor = liftBitwise(func(x, y int64) int64 { return x ^ y }, false)
var builtinBitwiseXor = liftBitwise(func(x, y int64) int64 { return x ^ y })
func builtinObjectFieldsEx(i *interpreter, trace traceElement, objv, includeHiddenV value) (value, error) { func builtinObjectFieldsEx(i *interpreter, trace traceElement, objv, includeHiddenV value) (value, error) {
obj, err := i.getObject(objv, trace) obj, err := i.getObject(objv, trace)

11
testdata/bitwise_shift4.golden vendored
View File

@ -1 +1,10 @@
0 RUNTIME ERROR: Shift by negative exponent.
-------------------------------------------------
testdata/bitwise_shift4:1:1-15 $
10000 >> (-10)
-------------------------------------------------
During evaluation

1
testdata/bitwise_shift5.golden vendored Normal file
View File

@ -0,0 +1 @@
1099511627776

2
testdata/bitwise_shift5.jsonnet vendored Normal file
View File

@ -0,0 +1,2 @@
/* 1 << (1000 % 64) */
1 << 1000

10
testdata/bitwise_shift6.golden vendored Normal file
View File

@ -0,0 +1,10 @@
RUNTIME ERROR: Shift by negative exponent.
-------------------------------------------------
testdata/bitwise_shift6:1:1-13 $
1 << (0 - 1)
-------------------------------------------------
During evaluation

1
testdata/bitwise_shift6.jsonnet vendored Normal file
View File

@ -0,0 +1 @@
1 << (0 - 1)