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

GH-172: fix broxygen not merging bif and script identifier comments

Browse source 
Fixes GH-172
This commit is contained in:
Jon Siwek 2019-01-15 12:12:09 -06:00
parent 12f3ab303b
commit 6eee5ded61
6 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/broker/comm.bif
View file

@ -40,7 +40,6 @@ enum ErrorCode %{
CAF_ERROR = 100,
%}
## The possible states of a peer endpoint.
enum PeerStatus %{
INITIALIZING,
CONNECTING,

1
src/broker/store.bif
View file

@ -28,7 +28,6 @@ type Broker::QueryResult: record;
type Broker::BackendOptions: record;
## Enumerates the possible storage backends.
enum BackendType %{
MEMORY,
SQLITE,

11
src/broxygen/Manager.cc
View file

@ -211,7 +211,8 @@ void Manager::ModuleUsage(const string& path, const string& module)
IdentifierInfo* Manager::CreateIdentifierInfo(ID* id, ScriptInfo* script)
{
IdentifierInfo* rval = new IdentifierInfo(id, script);
auto prev = identifiers.GetInfo(id->Name());
IdentifierInfo* rval = prev ? prev : new IdentifierInfo(id, script);
rval->AddComments(comment_buffer);
comment_buffer.clear();
@ -224,8 +225,12 @@ IdentifierInfo* Manager::CreateIdentifierInfo(ID* id, ScriptInfo* script)
comment_buffer_map.erase(it);
}
all_info.push_back(rval);
identifiers.map[id->Name()] = rval;
if ( ! prev )
{
all_info.push_back(rval);
identifiers.map[id->Name()] = rval;
}
last_identifier_seen = rval;
if ( script )