mirror of
https://github.com/google/go-jsonnet.git
synced 2025-09-29 09:21:03 +02:00
Update cpp-jsonnet
This commit is contained in:
Stanisław Barzowski
parent
f3873a7495
commit
2824579c7d
37075
astgen/stdast.go
37075
astgen/stdast.go
File diff suppressed because it is too large
Load Diff
@ -867,8 +867,8 @@ func liftBitwise(f func(int64, int64) int64) func(*interpreter, traceElement, va
|
||||
}
|
||||
|
||||
// TODO(sbarzowski) negative shifts
|
||||
var builtinShiftL = liftBitwise(func(x, y int64) int64 { return x << uint(y) })
|
||||
var builtinShiftR = liftBitwise(func(x, y int64) int64 { return x >> uint(y) })
|
||||
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) })
|
||||
var builtinBitwiseAnd = liftBitwise(func(x, y int64) int64 { return x & y })
|
||||
var builtinBitwiseOr = liftBitwise(func(x, y int64) int64 { return x | y })
|
||||
var builtinBitwiseXor = liftBitwise(func(x, y int64) int64 { return x ^ y })
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 1753f44619d347ac5fa72cd6d4df2a2d1a42ad8d
|
||||
Subproject commit 2a161cc0b49f26ecc20922981efdb4a8973f48d9
|
||||
2
testdata/assert_equal4.golden
vendored
2
testdata/assert_equal4.golden
vendored
@ -1,6 +1,6 @@
|
||||
RUNTIME ERROR: Assertion failed. {"x": 1} != {"x": 2}
|
||||
-------------------------------------------------
|
||||
<std>:792:7-50 function <anonymous>
|
||||
<std>:807:7-50 function <anonymous>
|
||||
|
||||
error 'Assertion failed. ' + a + ' != ' + b,
|
||||
|
||||
|
||||
2
testdata/assert_equal5.golden
vendored
2
testdata/assert_equal5.golden
vendored
@ -2,7 +2,7 @@ RUNTIME ERROR: Assertion failed.
|
||||
!=
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:792:7-50 function <anonymous>
|
||||
<std>:807:7-50 function <anonymous>
|
||||
|
||||
error 'Assertion failed. ' + a + ' != ' + b,
|
||||
|
||||
|
||||
2
testdata/assert_equal6.golden
vendored
2
testdata/assert_equal6.golden
vendored
@ -1,6 +1,6 @@
|
||||
RUNTIME ERROR: Assertion failed. [31m !=
|
||||
-------------------------------------------------
|
||||
<std>:792:7-50 function <anonymous>
|
||||
<std>:807:7-50 function <anonymous>
|
||||
|
||||
error 'Assertion failed. ' + a + ' != ' + b,
|
||||
|
||||
|
||||
6
testdata/percent_bad2.golden
vendored
6
testdata/percent_bad2.golden
vendored
@ -1,16 +1,16 @@
|
||||
RUNTIME ERROR: Too many values to format: 1, expected 0
|
||||
-------------------------------------------------
|
||||
<std>:662:11-86 function <format_codes_arr>
|
||||
<std>:677:11-86 function <format_codes_arr>
|
||||
|
||||
error ('Too many values to format: ' + std.length(arr) + ', expected ' + j)
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:668:11-59 function <format_codes_arr>
|
||||
<std>:683:11-59 function <format_codes_arr>
|
||||
|
||||
format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:759:7-48 function <anonymous>
|
||||
<std>:774:7-48 function <anonymous>
|
||||
|
||||
format_codes_arr(codes, [vals], 0, 0, ''),
|
||||
|
||||
|
||||
6
testdata/percent_format_str4.golden
vendored
6
testdata/percent_format_str4.golden
vendored
@ -1,16 +1,16 @@
|
||||
RUNTIME ERROR: Too many values to format: 2, expected 1
|
||||
-------------------------------------------------
|
||||
<std>:662:11-86 function <format_codes_arr>
|
||||
<std>:677:11-86 function <format_codes_arr>
|
||||
|
||||
error ('Too many values to format: ' + std.length(arr) + ', expected ' + j)
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:668:11-59 function <format_codes_arr>
|
||||
<std>:683:11-59 function <format_codes_arr>
|
||||
|
||||
format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:755:7-46 function <anonymous>
|
||||
<std>:770:7-46 function <anonymous>
|
||||
|
||||
format_codes_arr(codes, vals, 0, 0, '')
|
||||
|
||||
|
||||
12
testdata/percent_format_str5.golden
vendored
12
testdata/percent_format_str5.golden
vendored
@ -1,33 +1,33 @@
|
||||
RUNTIME ERROR: Not enough values to format: 1, expected more than 1
|
||||
-------------------------------------------------
|
||||
<std>:695:15-103 thunk <val> from <function <format_codes_arr>>
|
||||
<std>:710:15-103 thunk <val> from <function <format_codes_arr>>
|
||||
|
||||
error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2);
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:700:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
|
||||
<std>:715:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
|
||||
|
||||
format_code(val, code, tmp.fw, tmp2.prec, j2);
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:570:22-25 thunk from <function <format_code>>
|
||||
<std>:585:22-25 thunk from <function <format_code>>
|
||||
|
||||
std.toString(val)
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:570:9-26 function <format_code>
|
||||
<std>:585:9-26 function <format_code>
|
||||
|
||||
std.toString(val)
|
||||
|
||||
-------------------------------------------------
|
||||
... (skipped 10 frames)
|
||||
-------------------------------------------------
|
||||
<std>:711:11-64 function <format_codes_arr>
|
||||
<std>:726:11-64 function <format_codes_arr>
|
||||
|
||||
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:755:7-46 function <anonymous>
|
||||
<std>:770:7-46 function <anonymous>
|
||||
|
||||
format_codes_arr(codes, vals, 0, 0, '')
|
||||
|
||||
|
||||
12
testdata/percent_format_str6.golden
vendored
12
testdata/percent_format_str6.golden
vendored
@ -1,33 +1,33 @@
|
||||
RUNTIME ERROR: Not enough values to format: 1, expected more than 1
|
||||
-------------------------------------------------
|
||||
<std>:695:15-103 thunk <val> from <function <format_codes_arr>>
|
||||
<std>:710:15-103 thunk <val> from <function <format_codes_arr>>
|
||||
|
||||
error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2);
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:700:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
|
||||
<std>:715:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
|
||||
|
||||
format_code(val, code, tmp.fw, tmp2.prec, j2);
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:570:22-25 thunk from <function <format_code>>
|
||||
<std>:585:22-25 thunk from <function <format_code>>
|
||||
|
||||
std.toString(val)
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:570:9-26 function <format_code>
|
||||
<std>:585:9-26 function <format_code>
|
||||
|
||||
std.toString(val)
|
||||
|
||||
-------------------------------------------------
|
||||
... (skipped 10 frames)
|
||||
-------------------------------------------------
|
||||
<std>:711:11-64 function <format_codes_arr>
|
||||
<std>:726:11-64 function <format_codes_arr>
|
||||
|
||||
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:759:7-48 function <anonymous>
|
||||
<std>:774:7-48 function <anonymous>
|
||||
|
||||
format_codes_arr(codes, [vals], 0, 0, ''),
|
||||
|
||||
|
||||
10
testdata/percent_format_str7.golden
vendored
10
testdata/percent_format_str7.golden
vendored
@ -1,17 +1,17 @@
|
||||
RUNTIME ERROR: Format required number at 0, got string
|
||||
-------------------------------------------------
|
||||
<std>:(573:11)-(574:47) function <format_code>
|
||||
<std>:(588:11)-(589:47) function <format_code>
|
||||
|
||||
error 'Format required number at '
|
||||
+ i + ', got ' + std.type(val)
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:700:15-60 thunk <s> from <function <format_codes_arr>>
|
||||
<std>:715:15-60 thunk <s> from <function <format_codes_arr>>
|
||||
|
||||
format_code(val, code, tmp.fw, tmp2.prec, j2);
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:705:24-25 thunk from <thunk <s_padded> from <function <format_codes_arr>>>
|
||||
<std>:720:24-25 thunk from <thunk <s_padded> from <function <format_codes_arr>>>
|
||||
|
||||
pad_left(s, tmp.fw, ' ');
|
||||
|
||||
@ -23,12 +23,12 @@ RUNTIME ERROR: Format required number at 0, got string
|
||||
-------------------------------------------------
|
||||
... (skipped 7 frames)
|
||||
-------------------------------------------------
|
||||
<std>:711:11-64 function <format_codes_arr>
|
||||
<std>:726:11-64 function <format_codes_arr>
|
||||
|
||||
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
|
||||
|
||||
-------------------------------------------------
|
||||
<std>:755:7-46 function <anonymous>
|
||||
<std>:770:7-46 function <anonymous>
|
||||
|
||||
format_codes_arr(codes, vals, 0, 0, '')
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user