Pull out table to it's own Table class in prep for adding RNGLR algorithm.

include/Parser.h

@@ -9,6 +9,7 @@
 #include "StringReader.h"
 #include "Lexer.h"
 #include "NodeTree.h"
+#include "Table.h"
 
 #include <map>
 #include <vector>
@@ -25,14 +26,13 @@ class Parser {
 		void loadGrammer(std::string grammerInputString);
 		std::vector<Symbol*>* firstSet(Symbol* token);
 		std::vector<Symbol*>* firstSet(Symbol* token, std::vector<Symbol*> &avoidList);
-		void printFirstSets();
 		std::vector<Symbol*>* incrementiveFollowSet(ParseRule* rule);
 		void createStateSet();
 		void closure(State* state);
 		void addStates(std::vector< State* >* stateSets, State* state);
+		int stateNum(State* state);
 		std::string stateSetToString();
-		void addToTable(State* fromState, Symbol* tranSymbol, ParseAction* action);
-		ParseAction* getTable(int state, Symbol* token);
+
 		NodeTree* parseInput(std::string inputString);
 
 		std::string grammerToString();
@@ -53,8 +53,8 @@ class Parser {
 		//The nullSymbol, ditto with above. Also used in comparisons
 		Symbol* nullSymbol;
 
-		std::vector< std::vector<ParseAction*>* >  table;
-		std::vector<Symbol*> symbolIndexVec;
+		Table table;
+
 
 		std::stack<int> stateStack;
 		std::stack<Symbol*> symbolStack;

include/Table.h

@@ -0,0 +1,27 @@
+#include "util.h"
+#include "ParseRule.h"
+#include "ParseAction.h"
+#include "Symbol.h"
+#include "State.h"
+
+#ifndef TABLE_H
+#define TABLE_H
+
+class Table {
+	public:
+		Table();
+		~Table();
+		void setSymbols(Symbol* EOFSymbol, Symbol* nullSymbol);
+		void add(int stateNum, Symbol* tranSymbol, ParseAction* action);
+		ParseAction* get(int state, Symbol* token);
+		std::string toString();
+	private:
+		std::vector< std::vector<ParseAction*>* >  table;
+		std::vector<Symbol*> symbolIndexVec;
+		//The EOFSymbol, a pointer because of use in table, etc
+		Symbol* EOFSymbol;
+		//The nullSymbol, ditto with above. Also used in comparisons
+		Symbol* nullSymbol;
+};
+
+#endif