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

Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

Browse source 
Conflicts:
	aux/bro-aux
	aux/broccoli
This commit is contained in:
Robin Sommer 2014-07-10 20:11:52 -07:00
commit aeb8e71e8c
10 changed files with 106 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
testing/btest/Baseline/doc.broxygen.vectors/autogen-reST-vectors.rst Normal file
View file

@ -0,0 +1,33 @@
.. bro:id:: test_vector0
:Type: :bro:type:`vector` of :bro:type:`string`
:Default:
::
[]
Yield type is documented/cross-referenced for primitize types.
.. bro:id:: test_vector1
:Type: :bro:type:`vector` of :bro:type:`TestRecord`
:Default:
::
[]
Yield type is documented/cross-referenced for composite types.
.. bro:id:: test_vector2
:Type: :bro:type:`vector` of :bro:type:`vector` of :bro:type:`TestRecord`
:Default:
::
[]
Just showing an even fancier yield type.

20
testing/btest/doc/broxygen/vectors.bro Normal file
View file

@ -0,0 +1,20 @@
# @TEST-EXEC: bro -b -X broxygen.config %INPUT
# @TEST-EXEC: btest-diff autogen-reST-vectors.rst
@TEST-START-FILE broxygen.config
identifier test_vector* autogen-reST-vectors.rst
@TEST-END-FILE
type TestRecord: record {
field1: bool;
field2: count;
};
## Yield type is documented/cross-referenced for primitize types.
global test_vector0: vector of string;
## Yield type is documented/cross-referenced for composite types.
global test_vector1: vector of TestRecord;
## Just showing an even fancier yield type.
global test_vector2: vector of vector of TestRecord;