Skip to content

Commit

Permalink
Update cpp-jsonnet.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbarzowski
sbarzowski committed Feb 9, 2020
1 parent a7af40a commit 425405d
Show file tree
Hide file tree
Showing 13 changed files with 36,325 additions and 32,780 deletions.
69,025 changes: 36,285 additions & 32,740 deletions astgen/stdast.go
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cpp-jsonnet
Submodule cpp-jsonnet updated 86 files
+5 −5 .travis.yml
+6 −6 Makefile
+22 −2 README.md
+0 −3 case_studies/micro_fractal/appserv/main.py
+2 −2 case_studies/micro_fractal/appserv/templates/page.html
+216 −151 case_studies/micro_fractal/fractal.jsonnet
+5 −2 case_studies/micromanage/cmds.py
+10 −10 case_studies/micromanage/examples/hello_world_amazon.jsonnet
+20 −14 case_studies/micromanage/examples/hello_world_google.jsonnet
+0 −35 case_studies/micromanage/lib/mmlib/v0.1.0/cmd/apt.jsonnet
+0 −27 case_studies/micromanage/lib/mmlib/v0.1.0/cmd/cmd.jsonnet
+0 −11 case_studies/micromanage/lib/mmlib/v0.1.0/cmd/pip.jsonnet
+0 −342 case_studies/micromanage/lib/mmlib/v0.1.0/db/cassandra.jsonnet
+0 −104 case_studies/micromanage/lib/mmlib/v0.1.0/service/amazon.jsonnet
+0 −7 case_studies/micromanage/lib/mmlib/v0.1.0/service/base.jsonnet
+0 −336 case_studies/micromanage/lib/mmlib/v0.1.0/service/google.jsonnet
+0 −175 case_studies/micromanage/lib/mmlib/v0.1.0/web/nginx.jsonnet
+0 −16 case_studies/micromanage/lib/mmlib/v0.1.0/web/web.jsonnet
+0 −24 case_studies/micromanage/lib/mmlib/v0.1.1/amis/debian.jsonnet
+0 −33 case_studies/micromanage/lib/mmlib/v0.1.1/amis/ubuntu.jsonnet
+0 −977 case_studies/micromanage/lib/mmlib/v0.1.1/amis/ubuntu_raw.json
+0 −35 case_studies/micromanage/lib/mmlib/v0.1.1/cmd/apt.jsonnet
+0 −27 case_studies/micromanage/lib/mmlib/v0.1.1/cmd/cmd.jsonnet
+0 −11 case_studies/micromanage/lib/mmlib/v0.1.1/cmd/pip.jsonnet
+0 −371 case_studies/micromanage/lib/mmlib/v0.1.1/db/cassandra.jsonnet
+0 −320 case_studies/micromanage/lib/mmlib/v0.1.1/service/amazon.jsonnet
+0 −7 case_studies/micromanage/lib/mmlib/v0.1.1/service/base.jsonnet
+0 −352 case_studies/micromanage/lib/mmlib/v0.1.1/service/google.jsonnet
+0 −75 case_studies/micromanage/lib/mmlib/v0.1.1/web/nginx.jsonnet
+0 −20 case_studies/micromanage/lib/mmlib/v0.1.1/web/solutions.jsonnet
+0 −91 case_studies/micromanage/lib/mmlib/v0.1.1/web/uwsgi_flask.jsonnet
+0 −18 case_studies/micromanage/lib/mmlib/v0.1.1/web/web.jsonnet
+16 −16 case_studies/micromanage/lib/mmlib/v0.1.2/amis/debian.libsonnet
+14 −11 case_studies/micromanage/lib/mmlib/v0.1.2/amis/ubuntu.libsonnet
+43 −32 case_studies/micromanage/lib/mmlib/v0.1.2/cmd/apt.libsonnet
+25 −25 case_studies/micromanage/lib/mmlib/v0.1.2/cmd/cmd.libsonnet
+12 −8 case_studies/micromanage/lib/mmlib/v0.1.2/cmd/pip.libsonnet
+373 −333 case_studies/micromanage/lib/mmlib/v0.1.2/db/cassandra.libsonnet
+243 −289 case_studies/micromanage/lib/mmlib/v0.1.2/service/amazon.libsonnet
+37 −5 case_studies/micromanage/lib/mmlib/v0.1.2/service/base.libsonnet
+450 −314 case_studies/micromanage/lib/mmlib/v0.1.2/service/google.libsonnet
+61 −55 case_studies/micromanage/lib/mmlib/v0.1.2/web/nginx.libsonnet
+19 −16 case_studies/micromanage/lib/mmlib/v0.1.2/web/solutions.libsonnet
+109 −75 case_studies/micromanage/lib/mmlib/v0.1.2/web/uwsgi_flask.libsonnet
+62 −12 case_studies/micromanage/lib/mmlib/v0.1.2/web/web.libsonnet
+120 −69 case_studies/micromanage/micromanage.py
+1 −1 case_studies/micromanage/packer.py
+19 −27 case_studies/micromanage/service.py
+2 −2 case_studies/micromanage/service_amazon.py
+13 −12 case_studies/micromanage/service_google.py
+8 −8 case_studies/micromanage/tests/amazon/test_single_instance.jsonnet
+15 −13 case_studies/micromanage/tests/google/test_nested.jsonnet
+19 −17 case_studies/micromanage/tests/google/test_single_instance.jsonnet
+5 −3 case_studies/micromanage/validate.py
+5 −5 cmd/jsonnet.cpp
+0 −1 cmd/jsonnetfmt.cpp
+1 −1 cpp/CMakeLists.txt
+2 −2 doc/learning/community.html
+273 −73 doc/ref/stdlib.html
+1 −1 include/libjsonnet.h
+257 −249 stdlib/std.jsonnet
+1 −2 test_cmd/fmt_help.golden.stdout.cpp
+1 −2 test_cmd/fmt_no_args.golden.stderr
+1 −1 test_cmd/fmt_version1.golden.stdout
+1 −1 test_cmd/fmt_version2.golden.stdout
+1 −1 test_cmd/help.golden.stdout.cpp
+1 −1 test_cmd/help.golden.stdout.golang
+1 −1 test_cmd/no_args.golden.stderr.cpp
+1 −1 test_cmd/no_args.golden.stderr.golang
+1 −1 test_cmd/version1.golden.stdout
+1 −1 test_cmd/version2.golden.stdout
+1 −1 test_suite/error.equality_function.jsonnet.golden
+1 −0 test_suite/error.format.too_few_values.jsonnet
+1 −0 test_suite/error.format.too_few_values.jsonnet.fmt.golden
+22 −0 test_suite/error.format.too_few_values.jsonnet.golden
+5 −5 test_suite/error.inside_equals_array.jsonnet.golden
+5 −5 test_suite/error.inside_equals_object.jsonnet.golden
+4 −4 test_suite/error.invariant.equality.jsonnet.golden
+4 −4 test_suite/error.obj_assert.fail1.jsonnet.golden
+4 −4 test_suite/error.obj_assert.fail2.jsonnet.golden
+17 −0 test_suite/error.parse.object_comma.jsonnet
+1 −0 test_suite/error.parse.object_comma.jsonnet.golden
+1 −1 test_suite/error.sanity.jsonnet.golden
+1 −1 test_suite/refresh_golden.sh
+43 −7 test_suite/stdlib.jsonnet
+7 −0 test_suite/tests.source
2 changes: 1 addition & 1 deletion testdata/assert_equal4.golden
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RUNTIME ERROR: Assertion failed. {"x": 1} != {"x": 2}
-------------------------------------------------
<std>:787:7-50 function <anonymous>
<std>:792:7-50 function <anonymous>

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

Expand Down
2 changes: 1 addition & 1 deletion testdata/assert_equal5.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ RUNTIME ERROR: Assertion failed.
!=

-------------------------------------------------
<std>:787:7-50 function <anonymous>
<std>:792:7-50 function <anonymous>

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

Expand Down
2 changes: 1 addition & 1 deletion testdata/assert_equal6.golden
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RUNTIME ERROR: Assertion failed.  !=
-------------------------------------------------
<std>:787:7-50 function <anonymous>
<std>:792:7-50 function <anonymous>

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

Expand Down
2 changes: 1 addition & 1 deletion testdata/percent_bad.golden
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RUNTIME ERROR: Operator % cannot be used on types number and string.
-------------------------------------------------
<std>:229:7-94 function <anonymous>
<std>:239:7-94 function <anonymous>

error 'Operator % cannot be used on types ' + std.type(a) + ' and ' + std.type(b) + '.',

Expand Down
8 changes: 4 additions & 4 deletions testdata/percent_bad2.golden
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
RUNTIME ERROR: Too many values to format: 1, expected 0
-------------------------------------------------
<std>:657:11-86 function <format_codes_arr>
<std>:662:11-86 function <format_codes_arr>

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

-------------------------------------------------
<std>:663:11-59 function <format_codes_arr>
<std>:668:11-59 function <format_codes_arr>

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

-------------------------------------------------
<std>:754:7-48 function <anonymous>
<std>:759:7-48 function <anonymous>

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

-------------------------------------------------
<std>:227:7-23 function <anonymous>
<std>:237:7-23 function <anonymous>

std.format(a, b)

Expand Down
2 changes: 1 addition & 1 deletion testdata/percent_bad3.golden
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RUNTIME ERROR: Operator % cannot be used on types function and number.
-------------------------------------------------
<std>:229:7-94 function <anonymous>
<std>:239:7-94 function <anonymous>

error 'Operator % cannot be used on types ' + std.type(a) + ' and ' + std.type(b) + '.',

Expand Down
8 changes: 4 additions & 4 deletions testdata/percent_format_str4.golden
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
RUNTIME ERROR: Too many values to format: 2, expected 1
-------------------------------------------------
<std>:657:11-86 function <format_codes_arr>
<std>:662:11-86 function <format_codes_arr>

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

-------------------------------------------------
<std>:663:11-59 function <format_codes_arr>
<std>:668:11-59 function <format_codes_arr>

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

-------------------------------------------------
<std>:750:7-46 function <anonymous>
<std>:755:7-46 function <anonymous>

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

-------------------------------------------------
<std>:227:7-23 function <anonymous>
<std>:237:7-23 function <anonymous>

std.format(a, b)

Expand Down
18 changes: 9 additions & 9 deletions testdata/percent_format_str5.golden
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
RUNTIME ERROR: Not enough values to format: 1, expected at least 1
RUNTIME ERROR: Not enough values to format: 1, expected more than 1
-------------------------------------------------
<std>:690:15-102 thunk <val> from <function <format_codes_arr>>
<std>:695:15-103 thunk <val> from <function <format_codes_arr>>

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

-------------------------------------------------
<std>:695:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
<std>:700:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>

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

-------------------------------------------------
<std>:565:22-25 thunk from <function <format_code>>
<std>:570:22-25 thunk from <function <format_code>>

std.toString(val)

-------------------------------------------------
<std>:565:9-26 function <format_code>
<std>:570:9-26 function <format_code>

std.toString(val)

-------------------------------------------------
... (skipped 10 frames)
-------------------------------------------------
<std>:706:11-64 function <format_codes_arr>
<std>:711:11-64 function <format_codes_arr>

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

-------------------------------------------------
<std>:750:7-46 function <anonymous>
<std>:755:7-46 function <anonymous>

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

-------------------------------------------------
<std>:227:7-23 function <anonymous>
<std>:237:7-23 function <anonymous>

std.format(a, b)

Expand Down
18 changes: 9 additions & 9 deletions testdata/percent_format_str6.golden
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
RUNTIME ERROR: Not enough values to format: 1, expected at least 1
RUNTIME ERROR: Not enough values to format: 1, expected more than 1
-------------------------------------------------
<std>:690:15-102 thunk <val> from <function <format_codes_arr>>
<std>:695:15-103 thunk <val> from <function <format_codes_arr>>

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

-------------------------------------------------
<std>:695:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>
<std>:700:27-30 thunk from <thunk <s> from <function <format_codes_arr>>>

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

-------------------------------------------------
<std>:565:22-25 thunk from <function <format_code>>
<std>:570:22-25 thunk from <function <format_code>>

std.toString(val)

-------------------------------------------------
<std>:565:9-26 function <format_code>
<std>:570:9-26 function <format_code>

std.toString(val)

-------------------------------------------------
... (skipped 10 frames)
-------------------------------------------------
<std>:706:11-64 function <format_codes_arr>
<std>:711:11-64 function <format_codes_arr>

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

-------------------------------------------------
<std>:754:7-48 function <anonymous>
<std>:759:7-48 function <anonymous>

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

-------------------------------------------------
<std>:227:7-23 function <anonymous>
<std>:237:7-23 function <anonymous>

std.format(a, b)

Expand Down
14 changes: 7 additions & 7 deletions testdata/percent_format_str7.golden
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
RUNTIME ERROR: Format required number at 0, got string
-------------------------------------------------
<std>:(568:11)-(569:47) function <format_code>
<std>:(573:11)-(574:47) function <format_code>

error 'Format required number at '
+ i + ', got ' + std.type(val)

-------------------------------------------------
<std>:695:15-60 thunk <s> from <function <format_codes_arr>>
<std>:700:15-60 thunk <s> from <function <format_codes_arr>>

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

-------------------------------------------------
<std>:700:24-25 thunk from <thunk <s_padded> from <function <format_codes_arr>>>
<std>:705:24-25 thunk from <thunk <s_padded> from <function <format_codes_arr>>>

pad_left(s, tmp.fw, ' ');

-------------------------------------------------
<std>:475:30-33 thunk from <thunk from <function <pad_left>>>
<std>:480:30-33 thunk from <thunk from <function <pad_left>>>

padding(w - std.length(str), s) + str;

-------------------------------------------------
... (skipped 7 frames)
-------------------------------------------------
<std>:706:11-64 function <format_codes_arr>
<std>:711:11-64 function <format_codes_arr>

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

-------------------------------------------------
<std>:750:7-46 function <anonymous>
<std>:755:7-46 function <anonymous>

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

-------------------------------------------------
<std>:227:7-23 function <anonymous>
<std>:237:7-23 function <anonymous>

std.format(a, b)

Expand Down
2 changes: 1 addition & 1 deletion testdata/percent_mod_int5.golden
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RUNTIME ERROR: Division by zero.
-------------------------------------------------
<std>:225:7-23 builtin function <modulo>
<std>:235:7-23 builtin function <modulo>

std.modulo(a, b)

Expand Down

0 comments on commit 425405d

Please sign in to comment.