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

method to add a fully-qualified enum name (module name included)

Browse source
This commit is contained in:
Vern Paxson 2021-04-01 18:45:42 -07:00
parent 341c284de9
commit 9557029cf2
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Type.cc
View file

@ -1414,8 +1414,12 @@ void EnumType::AddNameInternal(const string& full_name, bro_int_t val)
bro_int_t EnumType::Lookup(const string& module_name, const char* name) const bro_int_t EnumType::Lookup(const string& module_name, const char* name) const
{ {
NameMap::const_iterator pos = return Lookup(detail::make_full_var_name(module_name.c_str(), name));
names.find(detail::make_full_var_name(module_name.c_str(), name).c_str()); }
bro_int_t EnumType::Lookup(const string& full_name) const
{
NameMap::const_iterator pos = names.find(full_name.c_str());
if ( pos == names.end() ) if ( pos == names.end() )
return -1; return -1;

4
src/Type.h
View file

@ -720,8 +720,10 @@ public:
// added that aren't likewise explicitly initalized. // added that aren't likewise explicitly initalized.
void AddName(const std::string& module_name, const char* name, bro_int_t val, bool is_export, detail::Expr* deprecation = nullptr, bool from_redef = false); void AddName(const std::string& module_name, const char* name, bro_int_t val, bool is_export, detail::Expr* deprecation = nullptr, bool from_redef = false);
// -1 indicates not found. // -1 indicates not found. Second version is for full names
// that already incorporate the module.
bro_int_t Lookup(const std::string& module_name, const char* name) const; bro_int_t Lookup(const std::string& module_name, const char* name) const;
bro_int_t Lookup(const std::string& full_name) const;
const char* Lookup(bro_int_t value) const; // Returns 0 if not found const char* Lookup(bro_int_t value) const; // Returns 0 if not found