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

Distinguish go-jsonnet from cpp-jsonnet in version message (#497)

Browse Source 
Distinguish the Go implementation in the version message
This commit is contained in:
Hanyu Cui 2021-01-13 11:46:15 -08:00 committed by GitHub
parent 31d71aaccd
commit cd59751527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 16156 additions and 15372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30852
astgen/stdast.go
View File

File diff suppressed because it is too large Load Diff

6
bazel/repositories.bzl
View File

@ -32,7 +32,7 @@ def jsonnet_go_repositories():
_maybe( _maybe(
http_archive, http_archive,
name = "cpp_jsonnet", name = "cpp_jsonnet",
sha256 = "076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe", sha256 = "82d3cd35de8ef230d094b60a30e7659f415c350b0aa2bd62162cf2afdf163959",
strip_prefix = "jsonnet-0.17.0", strip_prefix = "jsonnet-90cad75dcc2eafdcf059c901169d36539dc8a699",
urls = ["https://github.com/google/jsonnet/archive/v0.17.0.tar.gz"], urls = ["https://github.com/google/jsonnet/archive/90cad75dcc2eafdcf059c901169d36539dc8a699.tar.gz"],
) )

2
cmd/jsonnet/cmd.go
View File

@ -32,7 +32,7 @@ import (
) )
func version(o io.Writer) { func version(o io.Writer) {
fmt.Fprintf(o, "Jsonnet commandline interpreter %s\n", jsonnet.Version()) fmt.Fprintf(o, "Jsonnet commandline interpreter (Go implementation) %s\n", jsonnet.Version())
} }
func usage(o io.Writer) { func usage(o io.Writer) {

2
cpp-jsonnet

@ -1 +1 @@
Subproject commit 89ed89ce1213c6c363e721c81c4387db72f62a29 Subproject commit 90cad75dcc2eafdcf059c901169d36539dc8a699

2
testdata/assert_equal4.golden vendored
View File

@ -1,6 +1,6 @@
RUNTIME ERROR: Assertion failed. {"x": 1} != {"x": 2} RUNTIME ERROR: Assertion failed. {"x": 1} != {"x": 2}
------------------------------------------------- -------------------------------------------------
<std>:807:7-50 function <anonymous> <std>:814:7-50 function <anonymous>
error 'Assertion failed. ' + a + ' != ' + b, error 'Assertion failed. ' + a + ' != ' + b,

2
testdata/assert_equal5.golden vendored
View File

@ -2,7 +2,7 @@ RUNTIME ERROR: Assertion failed.
!= !=
------------------------------------------------- -------------------------------------------------
<std>:807:7-50 function <anonymous> <std>:814:7-50 function <anonymous>
error 'Assertion failed. ' + a + ' != ' + b, error 'Assertion failed. ' + a + ' != ' + b,

2
testdata/assert_equal6.golden vendored
View File

@ -1,6 +1,6 @@
RUNTIME ERROR: Assertion failed.  != RUNTIME ERROR: Assertion failed.  !=
------------------------------------------------- -------------------------------------------------
<std>:807:7-50 function <anonymous> <std>:814:7-50 function <anonymous>
error 'Assertion failed. ' + a + ' != ' + b, error 'Assertion failed. ' + a + ' != ' + b,

6
testdata/percent_bad2.golden vendored
View File

@ -1,16 +1,16 @@
RUNTIME ERROR: Too many values to format: 1, expected 0 RUNTIME ERROR: Too many values to format: 1, expected 0
------------------------------------------------- -------------------------------------------------
<std>:677:11-86 function <format_codes_arr> <std>:684:11-86 function <format_codes_arr>
error ('Too many values to format: ' + std.length(arr) + ', expected ' + j) error ('Too many values to format: ' + std.length(arr) + ', expected ' + j)
------------------------------------------------- -------------------------------------------------
<std>:683:11-59 function <format_codes_arr> <std>:690:11-59 function <format_codes_arr>
format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict
------------------------------------------------- -------------------------------------------------
<std>:774:7-48 function <anonymous> <std>:781:7-48 function <anonymous>
format_codes_arr(codes, [vals], 0, 0, ''), format_codes_arr(codes, [vals], 0, 0, ''),

6
testdata/percent_format_str4.golden vendored
View File

@ -1,16 +1,16 @@
RUNTIME ERROR: Too many values to format: 2, expected 1 RUNTIME ERROR: Too many values to format: 2, expected 1
------------------------------------------------- -------------------------------------------------
<std>:677:11-86 function <format_codes_arr> <std>:684:11-86 function <format_codes_arr>
error ('Too many values to format: ' + std.length(arr) + ', expected ' + j) error ('Too many values to format: ' + std.length(arr) + ', expected ' + j)
------------------------------------------------- -------------------------------------------------
<std>:683:11-59 function <format_codes_arr> <std>:690:11-59 function <format_codes_arr>
format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict
------------------------------------------------- -------------------------------------------------
<std>:770:7-46 function <anonymous> <std>:777:7-46 function <anonymous>
format_codes_arr(codes, vals, 0, 0, '') format_codes_arr(codes, vals, 0, 0, '')

12
testdata/percent_format_str5.golden vendored
View File

@ -1,33 +1,33 @@
RUNTIME ERROR: Not enough values to format: 1, expected more than 1 RUNTIME ERROR: Not enough values to format: 1, expected more than 1
------------------------------------------------- -------------------------------------------------
<std>:710:15-103 thunk <val> from <function <format_codes_arr>> <std>:717:15-103 thunk <val> from <function <format_codes_arr>>
error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2); error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2);
------------------------------------------------- -------------------------------------------------
<std>:715:27-30 thunk from <thunk <s> from <function <format_codes_arr>>> <std>:722:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
format_code(val, code, tmp.fw, tmp2.prec, j2); format_code(val, code, tmp.fw, tmp2.prec, j2);
------------------------------------------------- -------------------------------------------------
<std>:585:22-25 thunk from <function <format_code>> <std>:592:22-25 thunk from <function <format_code>>
std.toString(val) std.toString(val)
------------------------------------------------- -------------------------------------------------
<std>:585:9-26 function <format_code> <std>:592:9-26 function <format_code>
std.toString(val) std.toString(val)
------------------------------------------------- -------------------------------------------------
... (skipped 10 frames) ... (skipped 10 frames)
------------------------------------------------- -------------------------------------------------
<std>:726:11-64 function <format_codes_arr> <std>:733:11-64 function <format_codes_arr>
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict; format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
------------------------------------------------- -------------------------------------------------
<std>:770:7-46 function <anonymous> <std>:777:7-46 function <anonymous>
format_codes_arr(codes, vals, 0, 0, '') format_codes_arr(codes, vals, 0, 0, '')

12
testdata/percent_format_str6.golden vendored
View File

@ -1,33 +1,33 @@
RUNTIME ERROR: Not enough values to format: 1, expected more than 1 RUNTIME ERROR: Not enough values to format: 1, expected more than 1
------------------------------------------------- -------------------------------------------------
<std>:710:15-103 thunk <val> from <function <format_codes_arr>> <std>:717:15-103 thunk <val> from <function <format_codes_arr>>
error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2); error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2);
------------------------------------------------- -------------------------------------------------
<std>:715:27-30 thunk from <thunk <s> from <function <format_codes_arr>>> <std>:722:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
format_code(val, code, tmp.fw, tmp2.prec, j2); format_code(val, code, tmp.fw, tmp2.prec, j2);
------------------------------------------------- -------------------------------------------------
<std>:585:22-25 thunk from <function <format_code>> <std>:592:22-25 thunk from <function <format_code>>
std.toString(val) std.toString(val)
------------------------------------------------- -------------------------------------------------
<std>:585:9-26 function <format_code> <std>:592:9-26 function <format_code>
std.toString(val) std.toString(val)
------------------------------------------------- -------------------------------------------------
... (skipped 10 frames) ... (skipped 10 frames)
------------------------------------------------- -------------------------------------------------
<std>:726:11-64 function <format_codes_arr> <std>:733:11-64 function <format_codes_arr>
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict; format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
------------------------------------------------- -------------------------------------------------
<std>:774:7-48 function <anonymous> <std>:781:7-48 function <anonymous>
format_codes_arr(codes, [vals], 0, 0, ''), format_codes_arr(codes, [vals], 0, 0, ''),

10
testdata/percent_format_str7.golden vendored
View File

@ -1,17 +1,17 @@
RUNTIME ERROR: Format required number at 0, got string RUNTIME ERROR: Format required number at 0, got string
------------------------------------------------- -------------------------------------------------
<std>:(588:11)-(589:47) function <format_code> <std>:(595:11)-(596:47) function <format_code>
error 'Format required number at ' error 'Format required number at '
+ i + ', got ' + std.type(val) + i + ', got ' + std.type(val)
------------------------------------------------- -------------------------------------------------
<std>:715:15-60 thunk <s> from <function <format_codes_arr>> <std>:722:15-60 thunk <s> from <function <format_codes_arr>>
format_code(val, code, tmp.fw, tmp2.prec, j2); format_code(val, code, tmp.fw, tmp2.prec, j2);
------------------------------------------------- -------------------------------------------------
<std>:720:24-25 thunk from <thunk <s_padded> from <function <format_codes_arr>>> <std>:727:24-25 thunk from <thunk <s_padded> from <function <format_codes_arr>>>
pad_left(s, tmp.fw, ' '); pad_left(s, tmp.fw, ' ');
@ -23,12 +23,12 @@ RUNTIME ERROR: Format required number at 0, got string
------------------------------------------------- -------------------------------------------------
... (skipped 7 frames) ... (skipped 7 frames)
------------------------------------------------- -------------------------------------------------
<std>:726:11-64 function <format_codes_arr> <std>:733:11-64 function <format_codes_arr>
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict; format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
------------------------------------------------- -------------------------------------------------
<std>:770:7-46 function <anonymous> <std>:777:7-46 function <anonymous>
format_codes_arr(codes, vals, 0, 0, '') format_codes_arr(codes, vals, 0, 0, '')