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

Use namespaces for NetVar type pointers.

Browse source 
Enums defined in bifs and records declared in bifs are now available
in the C++ layer in namespaces (before they were in the global namespace
with enum_* and rectype_* prefixes).

Namespaces are now BroTypePtr::Enum::<name-of-enum> and
BroTypePtr::Record::<name-of-record>
This commit is contained in:
Gregor Maier 2011-02-10 14:11:33 -08:00
parent 43a84866a0
commit 9c39abffef
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/builtin-func.y
View file

@ -214,11 +214,11 @@ definition: event_def
type_def: TOK_TYPE opt_ws TOK_ID opt_ws ':' opt_ws TOK_RECORD opt_ws ';'
{
fprintf(fp_netvar_h,
"extern RecordType* rectype_%s;\n", $3);
"namespace BroTypePtr { namespace Record { extern RecordType* %s; } }\n", $3);
fprintf(fp_netvar_def,
"RecordType* rectype_%s;\n", $3);
"namespace BroTypePtr { namespace Record { RecordType* %s; } }\n", $3);
fprintf(fp_netvar_init,
"\trectype_%s = internal_type(\"%s\")->AsRecordType();\n",
"\tBroTypePtr::Record::%s = internal_type(\"%s\")->AsRecordType();\n",
$3, $3);
}
;
@ -247,11 +247,11 @@ enum_def: enum_def_1 enum_list TOK_RPB
// Now generate the netvar's.
fprintf(fp_netvar_h,
"extern EnumType* enum_%s;\n", decl_name);
"namespace BroTypePtr { namespace Enum { extern EnumType* %s;\n } }", decl_name);
fprintf(fp_netvar_def,
"EnumType* enum_%s;\n", decl_name);
"namespace BroTypePtr { namespace Enum { EnumType* %s; } }\n", decl_name);
fprintf(fp_netvar_init,
"\tenum_%s = internal_type(\"%s\")->AsEnumType();\n",
"\tBroTypePtr::Enum::%s = internal_type(\"%s\")->AsEnumType();\n",
decl_name, decl_name);
}
;