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

bifcl: Update namespace for *Type classes

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-09 17:05:09 -07:00
parent 6813ddaaa9
commit 73fb715657
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tools/bifcl/builtin-func.y
View file

@ -379,23 +379,23 @@ type_def: TOK_TYPE opt_ws TOK_ID opt_ws ':' opt_ws type_def_types opt_ws ';'
{
set_decl_name($3);
fprintf(fp_netvar_h, "namespace zeek { %s extern IntrusivePtr<%sType> %s; %s}\n",
fprintf(fp_netvar_h, "namespace zeek { %s extern IntrusivePtr<zeek::%sType> %s; %s}\n",
decl.c_namespace_start.c_str(), type_name.c_str(),
decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_h, "%s [[deprecated(\"Remove in v4.1. Use zeek::%s.\")]] extern %sType * %s; %s\n",
fprintf(fp_netvar_h, "%s [[deprecated(\"Remove in v4.1. Use zeek::%s.\")]] extern zeek::%sType * %s; %s\n",
decl.c_namespace_start.c_str(), decl.c_fullname.c_str(), type_name.c_str(),
decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_def, "namespace zeek { %s IntrusivePtr<%sType> %s; %s}\n",
fprintf(fp_netvar_def, "namespace zeek { %s IntrusivePtr<zeek::%sType> %s; %s}\n",
decl.c_namespace_start.c_str(), type_name.c_str(),
decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_def, "%s %sType * %s; %s\n",
fprintf(fp_netvar_def, "%s zeek::%sType * %s; %s\n",
decl.c_namespace_start.c_str(), type_name.c_str(),
decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_init,
"\tzeek::%s = zeek::id::find_type<%sType>(\"%s\");\n",
"\tzeek::%s = zeek::id::find_type<zeek::%sType>(\"%s\");\n",
decl.c_fullname.c_str(), type_name.c_str(),
decl.bro_fullname.c_str());
fprintf(fp_netvar_init,
@ -453,19 +453,19 @@ enum_def: enum_def_1 enum_list TOK_RPB opt_attr_list
fprintf(fp_netvar_h, "}; }\n");
// Now generate the netvar's.
fprintf(fp_netvar_h, "namespace zeek { %s extern IntrusivePtr<EnumType> %s; %s}\n",
fprintf(fp_netvar_h, "namespace zeek { %s extern IntrusivePtr<zeek::EnumType> %s; %s}\n",
decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_h, "%s [[deprecated(\"Remove in v4.1. Use zeek::%s.\")]] extern EnumType * %s; %s\n",
fprintf(fp_netvar_h, "%s [[deprecated(\"Remove in v4.1. Use zeek::%s.\")]] extern zeek::EnumType * %s; %s\n",
decl.c_namespace_start.c_str(), decl.c_fullname.c_str(),
decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_def, "namespace zeek { %s IntrusivePtr<EnumType> %s; %s}\n",
fprintf(fp_netvar_def, "namespace zeek { %s IntrusivePtr<zeek::EnumType> %s; %s}\n",
decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_def, "%s EnumType * %s; %s\n",
fprintf(fp_netvar_def, "%s zeek::EnumType * %s; %s\n",
decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str());
fprintf(fp_netvar_init,
"\tzeek::%s = zeek::id::find_type<EnumType>(\"%s\");\n",
"\tzeek::%s = zeek::id::find_type<zeek::EnumType>(\"%s\");\n",
decl.c_fullname.c_str(), decl.bro_fullname.c_str());
fprintf(fp_netvar_init,
"\t%s = zeek::%s.get();\n",