From 8120e2fe0dbd218b747fc8a4cc507011d0bf9ef9 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@gmx.org>
Date: Mon, 25 May 2020 23:56:44 +0200
Subject: [PATCH] netlist: move netlist parsing where it belongs. (nw)

---
 src/lib/netlist/nl_factory.cpp |  7 ------
 src/lib/netlist/nl_factory.h   | 39 ++++++++++++++++++++--------------
 src/lib/netlist/nl_setup.cpp   |  9 +++++++-
 src/lib/netlist/nl_setup.h     |  1 +
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp
index 91eca7e61ba..e1b2556ea5a 100644
--- a/src/lib/netlist/nl_factory.cpp
+++ b/src/lib/netlist/nl_factory.cpp
@@ -74,13 +74,6 @@ namespace factory {
 		return pool.make_unique<NETLIB_NAME(wrapper)>(anetlist, name);
 	}
 
-	void library_element_t::macro_actions(nlparse_t &nparser, const pstring &name)
-	{
-		nparser.namespace_push(name);
-		nparser.include(this->name());
-		nparser.namespace_pop();
-	}
-
 
 } // namespace factory
  } // namespace netlist
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index be7c10037a9..d354e057482 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -12,6 +12,7 @@
 #include "plib/palloc.h"
 #include "plib/ptypes.h"
 #include "plib/putil.h"
+#include "plib/penum.h"
 
 #include <vector>
 
@@ -38,33 +39,47 @@
 
 namespace netlist {
 	class core_device_t;
-	class nlparse_t;
 	class netlist_state_t;
 
 namespace factory {
 
+	PENUM(element_type,
+		BUILTIN,
+		MACRO
+	)
+
 	struct properties
 	{
 		properties(const pstring &defparam, plib::source_location &&sourceloc)
 		: m_defparam(defparam)
 		, m_sourceloc(std::move(sourceloc))
+		, m_type(element_type::BUILTIN)
 		{ }
 
 		~properties() = default;
 		PCOPYASSIGNMOVE(properties, default)
 
-		const pstring &defparam() const noexcept
+		pstring defparam() const noexcept
 		{
 			return m_defparam;
 		}
 
-		const plib::source_location &source() const noexcept
+		plib::source_location source() const noexcept
 		{
 			return m_sourceloc;
 		}
+
+		element_type type() const noexcept { return m_type; }
+
+		properties &set_type(element_type t) noexcept
+		{
+			m_type = t;
+			return *this;
+		}
 	private:
 		pstring m_defparam;
 		plib::source_location m_sourceloc;
+		element_type m_type;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -83,16 +98,10 @@ namespace factory {
 			netlist_state_t &anetlist,
 			const pstring &name) = 0;
 
-		virtual void macro_actions(nlparse_t &nparser, const pstring &name)
-		{
-			plib::unused_var(nparser);
-			plib::unused_var(name);
-		}
-
-		const pstring &name() const noexcept { return m_name; }
-		const pstring &param_desc() const noexcept { return m_properties.defparam(); }
-		const plib::source_location &source() const noexcept { return m_properties.source(); }
-
+		pstring name() const noexcept { return m_name; }
+		pstring param_desc() const noexcept { return m_properties.defparam(); }
+		plib::source_location source() const noexcept { return m_properties.source(); }
+		element_type type() const noexcept { return m_properties.type(); }
 	private:
 		pstring m_name;                             ///< device name
 		properties m_properties;                    ///< source file and other information and settings
@@ -171,7 +180,7 @@ namespace factory {
 	public:
 
 		library_element_t(const pstring &name, properties &&props)
-		: element_t(name, std::move(props))
+		: element_t(name, std::move(properties(props).set_type(element_type::MACRO)))
 		{
 		}
 
@@ -179,8 +188,6 @@ namespace factory {
 			netlist_state_t &anetlist,
 			const pstring &name) override;
 
-		void macro_actions(nlparse_t &nparser, const pstring &name) override;
-
 	private:
 	};
 
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index d0e10561dff..179d8684082 100755
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -75,7 +75,14 @@ namespace netlist
 		// make sure we parse macro library entries
 		// FIXME: this could be done here if e.g. f
 		//        would have an indication that this is macro element.
-		f->macro_actions(*this, name);
+		if (f->type() == factory::element_type::MACRO)
+		{
+			namespace_push(name);
+			include(f->name());
+			namespace_pop();
+		}
+		//f->macro_actions(*this, name);
+
 		pstring key = build_fqn(name);
 		if (device_exists(key))
 		{
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 9a5569711e2..2f029728d33 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -146,6 +146,7 @@ namespace netlist
 
 	class core_device_t;
 	class param_t;
+	class nlparse_t;
 	class setup_t;
 	class netlist_state_t;
 	class netlist_t;