From 75a8814cee6e3d1263cbc4de9123b6aeef4c3efb Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 9 May 2025 14:56:35 -0700 Subject: [PATCH] bifcl: Switch more namespacing in generated code to nested style --- tools/bifcl/builtin-func.l | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/bifcl/builtin-func.l b/tools/bifcl/builtin-func.l index daba11585f..a2e73e8a46 100644 --- a/tools/bifcl/builtin-func.l +++ b/tools/bifcl/builtin-func.l @@ -277,17 +277,17 @@ void init_alternative_mode() fprintf(fp_func_init, "#include \"zeek/Func.h\"\n"); fprintf(fp_func_init, "#include \"%s.h\"\n", input_filename); fprintf(fp_func_init, "\n"); - fprintf(fp_func_init, "namespace plugin { namespace %s {\n", plugin_canon); + fprintf(fp_func_init, "namespace plugin::%s {\n", plugin_canon); fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "void __bif_%s_init(zeek::plugin::Plugin* plugin)\n", name); fprintf(fp_func_init, "\t{\n"); fprintf(fp_func_register, "#include \"zeek/plugin/Manager.h\"\n"); fprintf(fp_func_register, "\n"); - fprintf(fp_func_register, "namespace plugin { namespace %s {\n", plugin_canon); + fprintf(fp_func_register, "namespace plugin::%s {\n", plugin_canon); fprintf(fp_func_register, "void __bif_%s_init(zeek::plugin::Plugin* plugin);\n", name); fprintf(fp_func_register, "zeek::plugin::detail::__RegisterBif __register_bifs_%s_%s(\"%s\", __bif_%s_init);\n", plugin_canon, name, plugin, name); - fprintf(fp_func_register, "} }\n"); + fprintf(fp_func_register, "}\n"); } } @@ -300,7 +300,7 @@ void finish_alternative_mode() { fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "\t}\n"); - fprintf(fp_func_init, "} }\n"); + fprintf(fp_func_init, "}\n"); fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "\n"); }