token: header file and include statement refactoring

added token forward declarations to header files as needed
(cannot remove include from table until token type is replaced)
- required moving rpn item equality operator function to source file
- moved token includes to source files as needed
- cleaned up some other forward declarations

basic/basic.h

@@ -30,11 +30,11 @@
 #include <vector>
 
 #include "ibcp.h"
-#include "token.h"
 #include "dictionary.h"
 
 class Translator;
 class Token;
+using TokenPtr = std::shared_ptr<Token>;
 class ProgramModel;
 class Recreator;
 class RpnItem;

parser.cpp

@@ -24,6 +24,7 @@
 
 #include "parser.h"
 #include "table.h"
+#include "token.h"
 #include "utility.h"
 
 

parser.h

@@ -27,9 +27,10 @@
 
 #include <sstream>
 
-#include "token.h"
+#include "ibcp.h"
 
 class Table;
+class Token;
 
 
 class Parser

rpnlist.cpp

@@ -24,6 +24,15 @@
 
 #include "rpnlist.h"
 #include "table.h"
+#include "token.h"
+
+
+// function to overload the comparison operator
+bool RpnItem::operator==(const RpnItem &other) const
+{
+    return *m_token == *other.m_token
+    && m_attached.size() == other.m_attached.size();
+}
 
 
 // function to overload the comparison operator

rpnlist.h

@@ -29,13 +29,12 @@
 #include <memory>
 #include <vector>
 
-#include "token.h"
-
 class Table;
+class Token;
+using TokenPtr = std::shared_ptr<Token>;
 class RpnItem;
 using RpnItemPtr = std::shared_ptr<RpnItem>;
 using RpnItemVector = std::vector<RpnItemPtr>;
-using RpnItemList = std::list<RpnItemPtr>;
 
 
 // class for holding an item in the RPN output list
@@ -61,11 +60,7 @@ class RpnItem
 		return m_attached;
 	}
 
-	bool operator==(const RpnItem &other) const
-	{
-		return *m_token == *other.m_token
-			&& m_attached.size() == other.m_attached.size();
-	}
+	bool operator==(const RpnItem &other) const;
 	bool operator!=(const RpnItem &other) const
 	{
 		return !(*this == other);
@@ -76,6 +71,8 @@ class RpnItem
 	RpnItemVector m_attached;		// array of attached item pointers
 };
 
+using RpnItemList = std::list<RpnItemPtr>;
+
 
 // class for holding a list of RPN items
 class RpnList

table.cpp

@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "table.h"
+#include "token.h"
 #include "utility.h"
 #include "basic/basic.h"
 

table.h

@@ -30,9 +30,13 @@
 #include <unordered_map>
 
 #include "ibcp.h"
+// TODO remove this include once token type is replaced with code type
 #include "token.h"
 #include "utility.h"
 
+class Token;
+using TokenPtr = std::shared_ptr<Token>;
+
 
 // bit definitions for flags field
 enum TableFlag : unsigned

token.h

@@ -32,10 +32,6 @@
 #include "ibcp.h"
 
 
-class Token;
-using TokenPtr = std::shared_ptr<Token>;
-
-
 class Token
 {
 public:
@@ -263,6 +259,8 @@ class Token
 	int m_index;			// index within encoded program code line
 };
 
+using TokenPtr = std::shared_ptr<Token>;
+
 
 // structure for holding information about an error exception
 struct TokenError

translator.h

@@ -31,6 +31,7 @@
 #include "rpnlist.h"
 
 class Table;
+class TokenError;
 
 
 class Translator