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

Rename BroList.h to ZeekList.h

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-07 09:57:06 -07:00
parent db36688bf0
commit 106a92a9a8
16 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Attr.h
View file

@ -6,7 +6,7 @@
#include <string>
#include "Obj.h"
#include "BroList.h"
#include "ZeekList.h"
#include "IntrusivePtr.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);

29
src/BroList.h
View file

@ -1,27 +1,2 @@
// See the file "COPYING" in the main distribution directory for copyright.
#pragma once
#include "List.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
using val_list = zeek::PList<zeek::Val>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
using expr_list = zeek::PList<zeek::detail::Expr>;
ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
using id_list = zeek::PList<zeek::detail::ID>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
using stmt_list = zeek::PList<zeek::detail::Stmt>;
namespace zeek { class Type; }
using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
using type_list = zeek::PList<zeek::Type>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
using attr_list = zeek::PList<zeek::detail::Attr>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail);
using timer_list = zeek::PList<zeek::detail::Timer, zeek::ListOrder::UNORDERED>;
#warning "BroList.h is deprecated and will be removed in v4.1. Use ZeekList.h instead."
#include "ZeekList.h"

2
src/Event.h
View file

@ -2,7 +2,7 @@
#pragma once
#include "BroList.h"
#include "ZeekList.h"
#include "analyzer/Analyzer.h"
#include "iosource/IOSource.h"
#include "Flare.h"

2
src/EventHandler.h
View file

@ -2,7 +2,7 @@
#pragma once
#include "BroList.h"
#include "ZeekList.h"
#include "ZeekArgs.h"
#include "Type.h"

2
src/Expr.h
View file

@ -8,7 +8,7 @@
#include <utility>
#include <optional>
#include "BroList.h"
#include "ZeekList.h"
#include "IntrusivePtr.h"
#include "Timer.h"
#include "Type.h"

2
src/Frame.h
View file

@ -2,7 +2,7 @@
#pragma once
#include "BroList.h" // for typedef val_list
#include "ZeekList.h" // for typedef val_list
#include "Obj.h"
#include "IntrusivePtr.h"
#include "ZeekArgs.h"

2
src/Func.h
View file

@ -9,7 +9,7 @@
#include <tuple>
#include <type_traits>
#include "BroList.h"
#include "ZeekList.h"
#include "Obj.h"
#include "IntrusivePtr.h"
#include "Type.h" /* for function_flavor */

2
src/Reporter.h
View file

@ -12,7 +12,7 @@
#include <unordered_set>
#include <unordered_map>
#include "BroList.h"
#include "ZeekList.h"
#include "net_util.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, analyzer);

2
src/Scope.h
View file

@ -8,7 +8,7 @@
#include <map>
#include "Obj.h"
#include "BroList.h"
#include "ZeekList.h"
#include "IntrusivePtr.h"
#include "TraverseTypes.h"

2
src/Stmt.h
View file

@ -4,7 +4,7 @@
// BRO statements.
#include "BroList.h"
#include "ZeekList.h"
#include "Dict.h"
#include "ID.h"
#include "Obj.h"

2
src/Type.h
View file

@ -4,7 +4,7 @@
#include "Obj.h"
#include "Attr.h"
#include "BroList.h"
#include "ZeekList.h"
#include "IntrusivePtr.h"
#include <string>

2
src/ZeekArgs.h
View file

@ -3,7 +3,7 @@
#pragma once
#include <vector>
#include "BroList.h"
#include "ZeekList.h"
namespace zeek {

27
src/ZeekList.h Normal file
View file

@ -0,0 +1,27 @@
// See the file "COPYING" in the main distribution directory for copyright.
#pragma once
#include "List.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
using val_list = zeek::PList<zeek::Val>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
using expr_list = zeek::PList<zeek::detail::Expr>;
ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
using id_list = zeek::PList<zeek::detail::ID>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
using stmt_list = zeek::PList<zeek::detail::Stmt>;
namespace zeek { class Type; }
using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
using type_list = zeek::PList<zeek::Type>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
using attr_list = zeek::PList<zeek::detail::Attr>;
ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail);
using timer_list = zeek::PList<zeek::detail::Timer, zeek::ListOrder::UNORDERED>;

2
src/file_analysis/File.h
View file

@ -9,7 +9,7 @@
#include "analyzer/Tag.h"
#include "AnalyzerSet.h"
#include "ZeekString.h"
#include "BroList.h" // for val_list
#include "ZeekList.h" // for val_list
#include "ZeekArgs.h"
#include "WeirdState.h"

2
src/input.h
View file

@ -5,7 +5,7 @@
#include <vector>
#include <string>
#include "BroList.h"
#include "ZeekList.h"
// These are required by the lexer in scan.l and are intentionally not namespaced.
extern int yyparse();

9
src/parse.y
View file

@ -78,15 +78,17 @@
#include <string.h>
#include <assert.h>
#include <set>
#include <string>
#include "input.h"
#include "BroList.h"
#include "ZeekList.h"
#include "Desc.h"
#include "Expr.h"
#include "Func.h"
#include "Stmt.h"
#include "Val.h"
#include "Var.h"
/* #include "analyzer/protocol/dns/DNS.h" */
#include "RE.h"
#include "Scope.h"
#include "Reporter.h"
@ -95,9 +97,6 @@
#include "module_util.h"
#include "IntrusivePtr.h"
#include <set>
#include <string>
extern const char* filename; // Absolute path of file currently being parsed.
extern const char* last_filename; // Absolute path of last file parsed.
extern const char* last_tok_filename;