From e07f3f305d9846d298528f9b3f637fc5c6385071 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 2 May 2023 12:06:41 -0700 Subject: [PATCH] Remove parser error message for bro_init, et al --- NEWS | 5 +++++ src/parse.y | 7 ------- testing/btest/Baseline/language.bro_init/out | 3 --- .../btest/Baseline/language.bro_script_loaded/out | 2 -- testing/btest/language/bro_init.zeek | 12 ------------ testing/btest/language/bro_script_loaded.zeek | 8 -------- 6 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 testing/btest/Baseline/language.bro_init/out delete mode 100644 testing/btest/Baseline/language.bro_script_loaded/out delete mode 100644 testing/btest/language/bro_init.zeek delete mode 100644 testing/btest/language/bro_script_loaded.zeek diff --git a/NEWS b/NEWS index 806a43eac4..fce932ee92 100644 --- a/NEWS +++ b/NEWS @@ -59,6 +59,11 @@ Breaking Changes - The IRC_Data analyzer declaration has been moved to protocols/irc/IRC.h. +- The error message returned when using ``bro_init``, ``bro_done``, and + ``bro_script_loaded`` events is now removed. removed. Usage of these events + has returned that error during script parsing for a few years, and time has + come to finally remove it. + New Functionality ----------------- diff --git a/src/parse.y b/src/parse.y index 2334b2eae3..4db15571ab 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1488,13 +1488,6 @@ func_hdr: } | TOK_EVENT event_id func_params opt_attr { - const char* name = $2->Name(); - if ( util::streq("bro_init", name) || util::streq("bro_done", name) || util::streq("bro_script_loaded", name) ) - { - auto base = std::string(name).substr(4); - reporter->Error("event %s() is no longer available, use zeek_%s() instead", name, base.c_str()); - } - begin_func({NewRef{}, $2}, current_module.c_str(), FUNC_FLAVOR_EVENT, false, {NewRef{}, $3}, std::unique_ptr>{$4}); diff --git a/testing/btest/Baseline/language.bro_init/out b/testing/btest/Baseline/language.bro_init/out deleted file mode 100644 index 0b182fe89e..0000000000 --- a/testing/btest/Baseline/language.bro_init/out +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/bro_init.zeek, line 5: event bro_init() is no longer available, use zeek_init() instead -error in <...>/bro_init.zeek, line 10: event bro_done() is no longer available, use zeek_done() instead diff --git a/testing/btest/Baseline/language.bro_script_loaded/out b/testing/btest/Baseline/language.bro_script_loaded/out deleted file mode 100644 index 5fb003b55b..0000000000 --- a/testing/btest/Baseline/language.bro_script_loaded/out +++ /dev/null @@ -1,2 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/bro_script_loaded.zeek, line 5: event bro_script_loaded() is no longer available, use zeek_script_loaded() instead diff --git a/testing/btest/language/bro_init.zeek b/testing/btest/language/bro_init.zeek deleted file mode 100644 index 0beda04a7b..0000000000 --- a/testing/btest/language/bro_init.zeek +++ /dev/null @@ -1,12 +0,0 @@ -# @TEST-EXEC-FAIL: zeek -b %INPUT >out 2>&1 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out - -event bro_init() - { - print "ran bro_init()"; - } - -event bro_done() - { - print "ran bro_done()"; - } diff --git a/testing/btest/language/bro_script_loaded.zeek b/testing/btest/language/bro_script_loaded.zeek deleted file mode 100644 index fb3d080a31..0000000000 --- a/testing/btest/language/bro_script_loaded.zeek +++ /dev/null @@ -1,8 +0,0 @@ -# @TEST-EXEC-FAIL: zeek -b %INPUT >out 2>&1 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out - -event bro_script_loaded(path: string, level: count) &priority=5 - { - if ( /zeek_script_loaded.zeek/ in path ) - print "bro_script_loaded priority 5"; - }