Unify plugin::Component and plugin::TaggedComponent into a single class

These two are almost always used in conjunction with each other, and
TaggedComponent is never used by itself. Combining them together into
a single class will help simplify some of the code around managing
the mapping between Tags and Components.

src/plugin/Component.cc

@@ -8,25 +8,16 @@
 namespace zeek::plugin
 	{
 
-Component::Component(component::Type arg_type, const std::string& arg_name)
+Tag::type_t Component::type_counter(0);
+
+Component::Component(component::Type arg_type, const std::string& arg_name,
+                     Tag::subtype_t tag_subtype, zeek::EnumTypePtr etype)
+	: type(arg_type), name(arg_name), tag(etype, 1, 0), etype(std::move(etype)),
+	  tag_subtype(tag_subtype)
 	{
-	type = arg_type;
-	name = arg_name;
 	canon_name = util::canonify_name(name);
 	}
 
-Component::~Component() { }
-
-const std::string& Component::Name() const
-	{
-	return name;
-	}
-
-component::Type Component::Type() const
-	{
-	return type;
-	}
-
 void Component::Describe(ODesc* d) const
 	{
 	d->Add("    ");
@@ -84,4 +75,20 @@ void Component::Describe(ODesc* d) const
 	d->Add(")");
 	}
 
+void Component::InitializeTag()
+	{
+	assert(tag_initialized == false);
+	tag_initialized = true;
+	tag = zeek::Tag(etype, ++type_counter, tag_subtype);
+	}
+
+/**
+ * @return The component's tag.
+ */
+zeek::Tag Component::Tag() const
+	{
+	assert(tag_initialized);
+	return tag;
+	}
+
 	} // namespace zeek::plugin

src/plugin/Component.h

@@ -6,6 +6,9 @@
 
 #include <string>
 
+#include "zeek/Tag.h"
+#include "zeek/Type.h"
+
 namespace zeek
 	{
 
@@ -49,13 +52,27 @@ public:
 	 *
 	 * @param name A descriptive name for the component.  This name must
 	 * be unique across all components of the same type.
+	 *
+	 * @param tag_subtype A subtype associated with this component that
+	 * further distinguishes it. The subtype will be integrated into
+	 * the Tag that the manager associates with this component,
+	 * and component instances can accordingly access it via Tag().
+	 * If not used, leave at zero.
+	 *
+	 * @param etype An enum type that describes the type for the tag in
+	 * script-land.
 	 */
-	Component(component::Type type, const std::string& name);
+	Component(component::Type type, const std::string& name, Tag::subtype_t tag_subtype = 0,
+	          zeek::EnumTypePtr etype = nullptr);
 
 	/**
 	 * Destructor.
 	 */
-	virtual ~Component();
+	virtual ~Component() = default;
+
+	// Disable.
+	Component(const Component& other) = delete;
+	Component operator=(const Component& other) = delete;
 
 	/**
 	 * Initialization function. This function has to be called before any
@@ -67,12 +84,12 @@ public:
 	/**
 	 * Returns the compoment's type.
 	 */
-	component::Type Type() const;
+	component::Type Type() const { return type; }
 
 	/**
 	 * Returns the compoment's name.
 	 */
-	const std::string& Name() const;
+	const std::string& Name() const { return name; }
 
 	/**
 	 * Returns a canonocalized version of the components's name.  The
@@ -93,6 +110,17 @@ public:
 	 */
 	void Describe(ODesc* d) const;
 
+	/**
+	 * Initializes tag by creating the unique tag value for this component.
+	 * Has to be called exactly once.
+	 */
+	void InitializeTag();
+
+	/**
+	 * @return The component's tag.
+	 */
+	zeek::Tag Tag() const;
+
 protected:
 	/**
 	 * Adds type specific information to the output of Describe().
@@ -104,13 +132,18 @@ protected:
 	virtual void DoDescribe(ODesc* d) const { }
 
 private:
-	// Disable.
-	Component(const Component& other);
-	Component operator=(const Component& other);
-
 	component::Type type;
 	std::string name;
 	std::string canon_name;
+
+	/** The automatically assigned component tag */
+	zeek::Tag tag;
+	EnumTypePtr etype;
+	Tag::subtype_t tag_subtype;
+	bool tag_initialized = false;
+
+	/** Used to generate globally unique tags */
+	static Tag::type_t type_counter;
 	};
 
 	} // namespace plugin

src/plugin/ComponentManager.h

@@ -21,7 +21,7 @@ namespace zeek::plugin
  * installs identifiers in the script-layer to identify them by a unique tag,
  * (a script-layer enum value).
  *
- * @tparam C A plugin::TaggedComponent type derivative.
+ * @tparam C A plugin::Component type derivative.
  */
 template <class C> class ComponentManager
 	{

src/plugin/TaggedComponent.cc

@@ -1,36 +0,0 @@
-#include "zeek/plugin/TaggedComponent.h"
-
-#include "zeek/IntrusivePtr.h"
-#include "zeek/Type.h"
-
-namespace zeek::plugin
-	{
-
-Tag::type_t TaggedComponent::type_counter(0);
-
-TaggedComponent::TaggedComponent(Tag::subtype_t subtype, EnumTypePtr etype)
-	: tag(etype, 1, 0), subtype(subtype), initialized(false), etype(std::move(etype))
-	{
-	}
-
-/**
- * Initializes tag by creating the unique tag value for thos componend.
- * Has to be called exactly once.
- */
-void TaggedComponent::InitializeTag()
-	{
-	assert(initialized == false);
-	initialized = true;
-	tag = zeek::Tag(etype, ++type_counter, subtype);
-	}
-
-/**
- * @return The component's tag.
- */
-zeek::Tag TaggedComponent::Tag() const
-	{
-	assert(initialized);
-	return tag;
-	}
-
-	} // namespace zeek::plugin

src/plugin/TaggedComponent.h

@@ -1,50 +0,0 @@
-#pragma once
-
-#include <cassert>
-
-#include "zeek/Tag.h"
-#include "zeek/Type.h"
-
-namespace zeek::plugin
-	{
-
-/**
- * A class which has a tag of a given type associated with it.
- */
-class TaggedComponent
-	{
-public:
-	/**
-	 * Constructor for TaggedComponend. Note that a unique value
-	 * for this component is only created when InitializeTag is
-	 * called.
-	 *
-	 * @param subtype A subtype associated with this component that
-	 * further distinguishes it. The subtype will be integrated into
-	 * the Tag that the manager associates with this component,
-	 * and component instances can accordingly access it via Tag().
-	 * If not used, leave at zero.
-	 */
-	explicit TaggedComponent(Tag::subtype_t subtype = 0, zeek::EnumTypePtr etype = nullptr);
-
-	/**
-	 * Initializes tag by creating the unique tag value for thos componend.
-	 * Has to be called exactly once.
-	 */
-	void InitializeTag();
-
-	/**
-	 * @return The component's tag.
-	 */
-	zeek::Tag Tag() const;
-
-private:
-	zeek::Tag tag; /**< The automatically assigned analyzer tag. */
-	Tag::subtype_t subtype;
-	bool initialized;
-	EnumTypePtr etype;
-	static Tag::type_t type_counter; /**< Used to generate globally
-	                                             unique tags. */
-	};
-
-	} // namespace zeek::plugin