Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

better printing of expressions

Browse source
This commit is contained in:
Vern Paxson 2024-05-16 11:53:36 -07:00
parent 25b71c7d66
commit 2befa8d3a9
34 changed files with 448 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Expr.cc
View file

@ -42,8 +42,8 @@ const char* expr_name(ExprTag t) {
"-",
"+",
"-",
"add",
"delete",
"add ",
"delete ",
"+=",
"-=",
"*",
@ -64,7 +64,7 @@ const char* expr_name(ExprTag t) {
">=",
">",
"?:",
"ref",
"ref ",
"=",
"[]",
"$",
@ -81,12 +81,12 @@ const char* expr_name(ExprTag t) {
"event",
"schedule",
"coerce",
"record_coerce",
"table_coerce",
"vector_coerce",
"to_any_coerce",
"from_any_coerce",
"sizeof",
"record_coerce ",
"table_coerce ",
"vector_coerce ",
"to_any_coerce ",
"from_any_coerce ",
"sizeof ",
"cast",
"is",
"[:]=",
@ -94,7 +94,7 @@ const char* expr_name(ExprTag t) {
"vec+=",
"[]=",
"$=",
"from_any_vec_coerce",
"from_any_vec_coerce ",
"any[]",
"ZAM-builtin()",
"nop",

8
testing/btest/Baseline.zam/opt.AST-side-effects/output
View file

@ -358,7 +358,7 @@ print 2 * g1, tbl_c_of_c[2], tbl_c_of_c2[1], tbl_c_of_b[100], tbl_s_of_s[4];
print 2 * g1, tbl_c_of_c[2], tbl_c_of_c2[1], tbl_c_of_b[100], tbl_s_of_s[4];
print table(11 = F)&default=function(){
tbl_s_of_s2[2] = two;
return (sizeoftbl_s_of_s2 < 9);
return (sizeof tbl_s_of_s2 < 9);
}, &optional;
} <...>/AST-side-effects.zeek, lines 247-261
Transformed: {
@ -376,7 +376,7 @@ print <internal>::#0, <internal>::#1, <internal>::#2, <internal>::#3, <internal>
print <internal>::#5, <internal>::#6, <internal>::#7, <internal>::#8, <internal>::#9;
<internal>::#10 = table(11 = F)&default=function(){
tbl_s_of_s2[2] = two;
return (sizeoftbl_s_of_s2 < 9);
return (sizeof tbl_s_of_s2 < 9);
}, &optional;
print <internal>::#10;
} <...>/AST-side-effects.zeek, lines 247-261
@ -392,7 +392,7 @@ print <internal>::#0, <internal>::#1, <internal>::#2, <internal>::#3, <internal>
print <internal>::#0, <internal>::#1, <internal>::#2, <internal>::#8, <internal>::#9;
<internal>::#10 = table(11 = F)&default=function(){
tbl_s_of_s2[2] = two;
return (sizeoftbl_s_of_s2 < 9);
return (sizeof tbl_s_of_s2 < 9);
}, &optional;
print <internal>::#10;
} <...>/AST-side-effects.zeek, lines 247-261
@ -408,7 +408,7 @@ print <internal>::#0, <internal>::#1, <internal>::#2, <internal>::#3, <internal>
print <internal>::#0, <internal>::#1, <internal>::#2, <internal>::#8, <internal>::#9;
<internal>::#10 = table(11 = F)&default=function(){
tbl_s_of_s2[2] = two;
return (sizeoftbl_s_of_s2 < 9);
return (sizeof tbl_s_of_s2 < 9);
}, &optional;
print <internal>::#10;
} <...>/AST-side-effects.zeek, lines 247-261

4
testing/btest/Baseline/bifs.from_json-11/.stderr
View file

@ -1,3 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 8: required field Foo$hello is missing in JSON (from_json({"t":null}, to_any_coerceFoo, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 9: required field Foo$hello is null in JSON (from_json({"hello": null, "t": true}, to_any_coerceFoo, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 8: required field Foo$hello is missing in JSON (from_json({"t":null}, to_any_coerce Foo, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 9: required field Foo$hello is null in JSON (from_json({"hello": null, "t": true}, to_any_coerce Foo, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-13/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 7: required field Foo$id_field is missing in JSON (from_json({"id-field": "Hello!"}, to_any_coerceFoo, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 7: required field Foo$id_field is missing in JSON (from_json({"id-field": "Hello!"}, to_any_coerce Foo, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-2/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], to_any_coerce10, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 4: from_json() requires a type argument (from_json([], to_any_coerce 10, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-3/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 4: JSON parse error: Missing a closing quotation mark in string. Offset: 5 (from_json({"hel, to_any_coercestring_vec, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 4: JSON parse error: Missing a closing quotation mark in string. Offset: 5 (from_json({"hel, to_any_coerce string_vec, from_json_default_key_mapper))

4
testing/btest/Baseline/bifs.from_json-4/.stderr
View file

@ -1,3 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 9: cannot convert JSON type 'array' to Zeek type 'bool' (from_json([], to_any_coercebool_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 10: cannot convert JSON type 'string' to Zeek type 'bool' (from_json({"a": "hello"}, to_any_coerceFoo, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 9: cannot convert JSON type 'array' to Zeek type 'bool' (from_json([], to_any_coerce bool_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 10: cannot convert JSON type 'string' to Zeek type 'bool' (from_json({"a": "hello"}, to_any_coerce Foo, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-5/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 4: tables are not supported (from_json([], to_any_coercetable_string_of_string, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 4: tables are not supported (from_json([], to_any_coerce table_string_of_string, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-6/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 5: wrong port format, must be <...>/(tcp|udp|icmp|unknown)/ (from_json("80", to_any_coerceport_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 5: wrong port format, must be <...>/(tcp|udp|icmp|unknown)/ (from_json("80", to_any_coerce port_t, from_json_default_key_mapper))

4
testing/btest/Baseline/bifs.from_json-7/.stderr
View file

@ -1,3 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 5: index type doesn't match (from_json([[1, false], [2]], to_any_coerceset_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 6: cannot convert JSON type 'number' to Zeek type 'bool' (from_json([[1, false], [2, 1]], to_any_coerceset_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 5: index type doesn't match (from_json([[1, false], [2]], to_any_coerce set_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 6: cannot convert JSON type 'number' to Zeek type 'bool' (from_json([[1, false], [2, 1]], to_any_coerce set_t, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-8/.stderr
View file

@ -1,3 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error: error compiling pattern /^?(.|\n)*(([[:print:]]{-}[[:alnum:]]foo))/
error in <...>/from_json.zeek, line 5: error compiling pattern (from_json("/([[:print:]]{-}[[:alnum:]]foo)/", to_any_coercepattern_t, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 5: error compiling pattern (from_json("/([[:print:]]{-}[[:alnum:]]foo)/", to_any_coerce pattern_t, from_json_default_key_mapper))

2
testing/btest/Baseline/bifs.from_json-9/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/from_json.zeek, line 7: 'Yellow' is not a valid enum for 'Color'. (from_json("Yellow", to_any_coerceColor, from_json_default_key_mapper))
error in <...>/from_json.zeek, line 7: 'Yellow' is not a valid enum for 'Color'. (from_json("Yellow", to_any_coerce Color, from_json_default_key_mapper))

4
testing/btest/Baseline/broker.store.invalid-handle/out
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
expression error in <...>/invalid-handle.zeek, line 23: incompatible "any" type (from_any_coercea)
expression error in <...>/invalid-handle.zeek, line 11: incompatible "any" type (from_any_coercea)
expression error in <...>/invalid-handle.zeek, line 23: incompatible "any" type (from_any_coerce a)
expression error in <...>/invalid-handle.zeek, line 11: incompatible "any" type (from_any_coerce a)
<timeout for print keys>

2
testing/btest/Baseline/core.option-runtime-errors-10/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: ID 'A' is not an option (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: ID 'A' is not an option (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-11/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 4: Option::on_change needs function argument; got 'count' for ID 'A' (Option::set_change_handler(A, to_any_coerceA, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 4: Option::on_change needs function argument; got 'count' for ID 'A' (Option::set_change_handler(A, to_any_coerce A, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-12/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: Third argument of passed function has to be string in Option::on_change for ID 'A'; got 'count' (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Third argument of passed function has to be string in Option::on_change for ID 'A'; got 'count' (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-13/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 4 (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 4 (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-2/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, to_any_coercehi, ))
error in <...>/option-runtime-errors.zeek, line 3: Incompatible type for set of ID 'A': got 'string', need 'count' (Option::set(A, to_any_coerce hi, ))

2
testing/btest/Baseline/core.option-runtime-errors-3/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, to_any_coerce6, ))
error in <...>/option-runtime-errors.zeek, line 3: ID 'A' is not an option (Option::set(A, to_any_coerce 6, ))

2
testing/btest/Baseline/core.option-runtime-errors-4/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: Second argument of passed function has to be count in Option::on_change for ID 'A'; got 'bool' (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Second argument of passed function has to be count in Option::on_change for ID 'A'; got 'bool' (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-5/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 1 (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Wrong number of arguments for passed function in Option::on_change for ID 'A'; expected 2 or 3, got 1 (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-6/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: Passed function needs to return type 'count' for ID 'A'; got 'bool' (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Passed function needs to return type 'count' for ID 'A'; got 'bool' (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-7/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-8/.stderr
View file

@ -1,3 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
warning in <...>/option-runtime-errors.zeek, line 4: handler for non-existing event cannot be invoked (option_changed)
error in <...>/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 7: Option::on_change needs function argument; not hook or event (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors-9/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 5: Could not find ID named 'A' (Option::set_change_handler(A, to_any_coerceoption_changed, (coerce 0 to int)))
error in <...>/option-runtime-errors.zeek, line 5: Could not find ID named 'A' (Option::set_change_handler(A, to_any_coerce option_changed, (coerce 0 to int)))

2
testing/btest/Baseline/core.option-runtime-errors/.stderr
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, to_any_coerce6, ))
error in <...>/option-runtime-errors.zeek, line 9: Could not find ID named 'B' (Option::set(B, to_any_coerce 6, ))

2
testing/btest/Baseline/language.void-errors-5/output
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/void-errors.zeek, line 4: cannot take size of void (sizeofx[3.4.5.6])
error in <...>/void-errors.zeek, line 4: cannot take size of void (sizeof x[3.4.5.6])

2
testing/btest/Baseline/language.void-errors-7/output
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/void-errors.zeek, line 5: can't assign void value (z = x())
error in <...>/void-errors.zeek, line 6: value of type void illegal (print x())
error in <...>/void-errors.zeek, line 7: cannot take size of void (sizeofx())
error in <...>/void-errors.zeek, line 7: cannot take size of void (sizeof x())

2
testing/btest/Baseline/language.wrong-delete-field/output
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/wrong-delete-field.zeek, line 10: illegal delete expression (deletex$a)
error in <...>/wrong-delete-field.zeek, line 10: illegal delete expression (delete x$a)

798
testing/btest/Baseline/plugins.hooks/output
View file

File diff suppressed because one or more lines are too long

2
testing/btest/Baseline/scripts.base.frameworks.logging.delay.static-errors-2/.stderr
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/main.zeek, line 642 and <...>/static-errors.zeek, line 12: type clash (Log::PostDelayCallback and post_delay_cb)
error in <...>/static-errors.zeek, line 12 and <...>/main.zeek, line 642: type mismatch (post_delay_cb and Log::PostDelayCallback)
error in <...>/static-errors.zeek, line 12: argument type mismatch in function call (Log::delay(id, to_any_coercerec, post_delay_cb))
error in <...>/static-errors.zeek, line 12: argument type mismatch in function call (Log::delay(id, to_any_coerce rec, post_delay_cb))

2
testing/btest/Baseline/scripts.base.frameworks.logging.delay.static-errors-3/.stderr
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/main.zeek, line 647 and <...>/static-errors.zeek, line 8: type clash (Log::DelayToken and 42)
error in <...>/static-errors.zeek, line 8 and <...>/main.zeek, line 647: type mismatch (42 and Log::DelayToken)
error in <...>/static-errors.zeek, line 8: argument type mismatch in function call (Log::delay_finish(id, to_any_coercerec, 42))
error in <...>/static-errors.zeek, line 8: argument type mismatch in function call (Log::delay_finish(id, to_any_coerce rec, 42))

2
testing/btest/Baseline/scripts.base.frameworks.logging.delay.static-errors-4/.stderr
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/main.zeek, line 647 and <...>/static-errors.zeek, line 8: arithmetic mixed with non-arithmetic (Log::DelayToken and 42)
error in <...>/static-errors.zeek, line 8 and <...>/main.zeek, line 647: type mismatch (42 and Log::DelayToken)
error in <...>/static-errors.zeek, line 8: argument type mismatch in function call (Log::delay_finish(id, to_any_coercerec, 42))
error in <...>/static-errors.zeek, line 8: argument type mismatch in function call (Log::delay_finish(id, to_any_coerce rec, 42))

2
testing/btest/Baseline/scripts.base.frameworks.logging.delay.static-errors/.stderr
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/main.zeek, line 642 and <...>/static-errors.zeek, line 16: type clash (Log::PostDelayCallback and post_delay_cb)
error in <...>/static-errors.zeek, line 16 and <...>/main.zeek, line 642: type mismatch (post_delay_cb and Log::PostDelayCallback)
error in <...>/static-errors.zeek, line 16: argument type mismatch in function call (Log::delay(id, to_any_coercerec, post_delay_cb))
error in <...>/static-errors.zeek, line 16: argument type mismatch in function call (Log::delay(id, to_any_coerce rec, post_delay_cb))