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

Use std::move in some zeekygen::Manager methods

Browse source
This commit is contained in:
Jon Siwek 2020-05-07 21:30:57 -07:00
parent 4af1a26b1f
commit 16a8bf3318
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/zeekygen/Manager.cc
View file

@ -218,13 +218,14 @@ void Manager::ModuleUsage(const string& path, const string& module)
IdentifierInfo* Manager::CreateIdentifierInfo(IntrusivePtr<ID> id, ScriptInfo* script) IdentifierInfo* Manager::CreateIdentifierInfo(IntrusivePtr<ID> id, ScriptInfo* script)
{ {
auto prev = identifiers.GetInfo(id->Name()); const auto& id_name = id->Name();
IdentifierInfo* rval = prev ? prev : new IdentifierInfo(id, script); auto prev = identifiers.GetInfo(id_name);
IdentifierInfo* rval = prev ? prev : new IdentifierInfo(std::move(id), script);
rval->AddComments(comment_buffer); rval->AddComments(comment_buffer);
comment_buffer.clear(); comment_buffer.clear();
comment_buffer_map_t::iterator it = comment_buffer_map.find(id->Name()); comment_buffer_map_t::iterator it = comment_buffer_map.find(id_name);
if ( it != comment_buffer_map.end() ) if ( it != comment_buffer_map.end() )
{ {
@ -235,7 +236,7 @@ IdentifierInfo* Manager::CreateIdentifierInfo(IntrusivePtr<ID> id, ScriptInfo* s
if ( ! prev ) if ( ! prev )
{ {
all_info.push_back(rval); all_info.push_back(rval);
identifiers.map[id->Name()] = rval; identifiers.map[id_name] = rval;
} }
last_identifier_seen = rval; last_identifier_seen = rval;
@ -267,9 +268,9 @@ void Manager::StartType(IntrusivePtr<ID> id)
return; return;
} }
incomplete_type = CreateIdentifierInfo(id, script_info); DBG_LOG(DBG_ZEEKYGEN, "Making IdentifierInfo (incomplete) %s, in %s",
DBG_LOG(DBG_ZEEKYGEN, "Made IdentifierInfo (incomplete) %s, in %s",
id->Name(), script.c_str()); id->Name(), script.c_str());
incomplete_type = CreateIdentifierInfo(std::move(id), script_info);
} }
static bool IsEnumType(ID* id) static bool IsEnumType(ID* id)
@ -331,9 +332,9 @@ void Manager::Identifier(IntrusivePtr<ID> id)
return; return;
} }
CreateIdentifierInfo(id, script_info); DBG_LOG(DBG_ZEEKYGEN, "Making IdentifierInfo %s, in script %s",
DBG_LOG(DBG_ZEEKYGEN, "Made IdentifierInfo %s, in script %s",
id->Name(), script.c_str()); id->Name(), script.c_str());
CreateIdentifierInfo(std::move(id), script_info);
} }
void Manager::RecordField(const ID* id, const TypeDecl* field, void Manager::RecordField(const ID* id, const TypeDecl* field,