Skip to content

Commit cd59751

Browse files
hanyucuihanyucui
authored
Distinguish go-jsonnet from cpp-jsonnet in version message (google#497)
Distinguish the Go implementation in the version message
1 parent 31d71aa commit cd59751

12 files changed

+15995
-15211
lines changed

‎astgen/stdast.go

Lines changed: 15964 additions & 15180 deletions
Large diffs are not rendered by default.

‎bazel/repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def jsonnet_go_repositories():
3232
_maybe(
3333
http_archive,
3434
name = "cpp_jsonnet",
35-
sha256 = "076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe",
36-
strip_prefix = "jsonnet-0.17.0",
37-
urls = ["https://github.com/google/jsonnet/archive/v0.17.0.tar.gz"],
35+
sha256 = "82d3cd35de8ef230d094b60a30e7659f415c350b0aa2bd62162cf2afdf163959",
36+
strip_prefix = "jsonnet-90cad75dcc2eafdcf059c901169d36539dc8a699",
37+
urls = ["https://github.com/google/jsonnet/archive/90cad75dcc2eafdcf059c901169d36539dc8a699.tar.gz"],
3838
)

‎cmd/jsonnet/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
)
3333

3434
func version(o io.Writer) {
35-
fmt.Fprintf(o, "Jsonnet commandline interpreter %s\n", jsonnet.Version())
35+
fmt.Fprintf(o, "Jsonnet commandline interpreter (Go implementation) %s\n", jsonnet.Version())
3636
}
3737

3838
func usage(o io.Writer) {

‎cpp-jsonnet

‎testdata/assert_equal4.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: Assertion failed. {"x": 1} != {"x": 2}
22
-------------------------------------------------
3-
<std>:807:7-50 function <anonymous>
3+
<std>:814:7-50 function <anonymous>
44

55
error 'Assertion failed. ' + a + ' != ' + b,
66

‎testdata/assert_equal5.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ RUNTIME ERROR: Assertion failed.
22
!=
33

44
-------------------------------------------------
5-
<std>:807:7-50 function <anonymous>
5+
<std>:814:7-50 function <anonymous>
66

77
error 'Assertion failed. ' + a + ' != ' + b,
88

‎testdata/assert_equal6.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: Assertion failed.  !=
22
-------------------------------------------------
3-
<std>:807:7-50 function <anonymous>
3+
<std>:814:7-50 function <anonymous>
44

55
error 'Assertion failed. ' + a + ' != ' + b,
66

‎testdata/percent_bad2.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
RUNTIME ERROR: Too many values to format: 1, expected 0
22
-------------------------------------------------
3-
<std>:677:11-86 function <format_codes_arr>
3+
<std>:684:11-86 function <format_codes_arr>
44

55
error ('Too many values to format: ' + std.length(arr) + ', expected ' + j)
66

77
-------------------------------------------------
8-
<std>:683:11-59 function <format_codes_arr>
8+
<std>:690:11-59 function <format_codes_arr>
99

1010
format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict
1111

1212
-------------------------------------------------
13-
<std>:774:7-48 function <anonymous>
13+
<std>:781:7-48 function <anonymous>
1414

1515
format_codes_arr(codes, [vals], 0, 0, ''),
1616

‎testdata/percent_format_str4.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
RUNTIME ERROR: Too many values to format: 2, expected 1
22
-------------------------------------------------
3-
<std>:677:11-86 function <format_codes_arr>
3+
<std>:684:11-86 function <format_codes_arr>
44

55
error ('Too many values to format: ' + std.length(arr) + ', expected ' + j)
66

77
-------------------------------------------------
8-
<std>:683:11-59 function <format_codes_arr>
8+
<std>:690:11-59 function <format_codes_arr>
99

1010
format_codes_arr(codes, arr, i + 1, j, v + code) tailstrict
1111

1212
-------------------------------------------------
13-
<std>:770:7-46 function <anonymous>
13+
<std>:777:7-46 function <anonymous>
1414

1515
format_codes_arr(codes, vals, 0, 0, '')
1616

‎testdata/percent_format_str5.golden

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
RUNTIME ERROR: Not enough values to format: 1, expected more than 1
22
-------------------------------------------------
3-
<std>:710:15-103 thunk <val> from <function <format_codes_arr>>
3+
<std>:717:15-103 thunk <val> from <function <format_codes_arr>>
44

55
error ('Not enough values to format: ' + std.length(arr) + ', expected more than ' + j2);
66

77
-------------------------------------------------
8-
<std>:715:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
8+
<std>:722:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
99

1010
format_code(val, code, tmp.fw, tmp2.prec, j2);
1111

1212
-------------------------------------------------
13-
<std>:585:22-25 thunk from <function <format_code>>
13+
<std>:592:22-25 thunk from <function <format_code>>
1414

1515
std.toString(val)
1616

1717
-------------------------------------------------
18-
<std>:585:9-26 function <format_code>
18+
<std>:592:9-26 function <format_code>
1919

2020
std.toString(val)
2121

2222
-------------------------------------------------
2323
... (skipped 10 frames)
2424
-------------------------------------------------
25-
<std>:726:11-64 function <format_codes_arr>
25+
<std>:733:11-64 function <format_codes_arr>
2626

2727
format_codes_arr(codes, arr, i + 1, j3, v + s_padded) tailstrict;
2828

2929
-------------------------------------------------
30-
<std>:770:7-46 function <anonymous>
30+
<std>:777:7-46 function <anonymous>
3131

3232
format_codes_arr(codes, vals, 0, 0, '')
3333

0 commit comments

Comments
 (0)