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

global_ids(): Include module names

Browse source 
Ad-hoc include module names in the global_ids() table. Table values will
have the type_name field set to "module" and their key in the table is
prefixed with "module " to avoid clashes with existing global identifiers
shadowing module names (Management::Node being an existing example).

Closes #3136
This commit is contained in:
Arne Welzel 2023-07-04 16:15:51 +02:00
parent f6f9dd2620
commit 4cde1c3c3f
8 changed files with 85 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scan.l
View file

@ -90,8 +90,6 @@ const char* last_tok_filename = 0;
const char* last_last_tok_filename = 0;
char last_tok[128];
extern std::set<std::string> module_names;
#define YY_USER_ACTION strncpy(last_tok, yytext, sizeof(last_tok) - 1); \
last_last_tok_filename = last_tok_filename; \
last_tok_filename = ::filename;
@ -882,7 +880,7 @@ void do_atifdef(const char* id)
// If the ID didn't exist, look to see if this is a module name instead.
bool found = (i != nullptr);
if ( ! found )
found = (module_names.count(id) != 0);
found = (zeek::detail::module_names().count(id) != 0);
if ( ! found )
begin_ignoring();
@ -897,7 +895,7 @@ void do_atifndef(const char *id)
// If the ID didn't exist, look to see if this is a module name instead.
bool found = (i != nullptr);
if ( ! found )
found = (module_names.count(id) != 0);
found = (zeek::detail::module_names().count(id) != 0);
if ( found )
begin_ignoring();