mirror of
https://github.com/zeek/zeek.git
synced 2025-10-15 04:58:21 +00:00
Fix record coercion for default inner record fields (addresses #973).
This commit is contained in:
parent
9a88dc500a
commit
7069f679c3
4 changed files with 88 additions and 9 deletions
|
@ -1,3 +1,21 @@
|
|||
[bar=4321, foo=[foo=1234, quux=9876]]
|
||||
[foo=1234, quux=9876]
|
||||
9876
|
||||
[bar=4231, foo=[foo=1000, quux=9876]]
|
||||
[foo=1000, quux=9876]
|
||||
9876
|
||||
[bar=4321, foo=[foo=10, quux=42]]
|
||||
[foo=10, quux=42]
|
||||
42
|
||||
[bar=100, foo=[foo=1234, quux=9876]]
|
||||
[foo=1234, quux=9876]
|
||||
9876
|
||||
[bar=100, foo=[foo=1001, quux=9876]]
|
||||
[foo=1001, quux=9876]
|
||||
9876
|
||||
[bar=100, foo=[foo=11, quux=7]]
|
||||
[foo=11, quux=7]
|
||||
7
|
||||
[a=13, c=13, v=[]]
|
||||
0
|
||||
[a=13, c=13, v=[test]]
|
||||
|
|
|
@ -7,12 +7,42 @@ type MyRecord: record {
|
|||
v: vector of string &default=vector();
|
||||
};
|
||||
|
||||
event bro_init()
|
||||
type Foo: record {
|
||||
foo: count;
|
||||
quux: count &default=9876;
|
||||
};
|
||||
|
||||
type Bar: record {
|
||||
bar: count;
|
||||
foo: Foo &default=[$foo=1234];
|
||||
};
|
||||
|
||||
function print_bar(b: Bar)
|
||||
{
|
||||
local r: MyRecord = [$c=13];
|
||||
print r;
|
||||
print |r$v|;
|
||||
r$v[|r$v|] = "test";
|
||||
print r;
|
||||
print |r$v|;
|
||||
print b;
|
||||
print b$foo;
|
||||
print b$foo$quux;
|
||||
}
|
||||
|
||||
global bar: Bar = [$bar=4321];
|
||||
global bar2: Bar = [$bar=4231, $foo=[$foo=1000]];
|
||||
global bar3: Bar = [$bar=4321, $foo=[$foo=10, $quux=42]];
|
||||
|
||||
print_bar(bar);
|
||||
print_bar(bar2);
|
||||
print_bar(bar3);
|
||||
|
||||
local bar4: Bar = [$bar=100];
|
||||
local bar5: Bar = [$bar=100, $foo=[$foo=1001]];
|
||||
local bar6: Bar = [$bar=100, $foo=[$foo=11, $quux=7]];
|
||||
|
||||
print_bar(bar4);
|
||||
print_bar(bar5);
|
||||
print_bar(bar6);
|
||||
|
||||
local r: MyRecord = [$c=13];
|
||||
print r;
|
||||
print |r$v|;
|
||||
r$v[|r$v|] = "test";
|
||||
print r;
|
||||
print |r$v|;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue