Fixed some bugs in Parser::firstSet and added a bit of caching. It still doesn't work quite right, though, there's some problem with nullable left recursion. However, it's better than it was, and I need to go to bed. More work later.

include/GraphStructuredStack.h

@@ -27,6 +27,7 @@ class GraphStructuredStack {
 		void addEdge(NodeTree<int>* start, NodeTree<int>* end, NodeTree<Symbol>* edge);
 		void clear();
 
+        std::vector<int> getFrontier(int frontier);
 		std::string toString();
 	private:
 		std::vector<std::vector<NodeTree<int>*>*> gss;

include/ParseAction.h

@@ -11,6 +11,7 @@
 #include <vector>
 #include <string>
 
+
 class ParseAction {
 	public:
 		enum ActionType { INVALID, REDUCE, SHIFT, ACCEPT, REJECT };
@@ -18,10 +19,11 @@ class ParseAction {
 		ParseAction(ActionType action, ParseRule* reduceRule);
 		ParseAction(ActionType action, int shiftState);
 		~ParseAction();
-		bool const equalsExceptLookahead(const ParseAction &other);
-		bool const operator==(const ParseAction &other);
-		bool const operator!=(const ParseAction &other);
-		std::string toString();
+		bool const equalsExceptLookahead(const ParseAction &other) const;
+		bool const operator==(const ParseAction &other) const;
+		bool const operator!=(const ParseAction &other) const;
+        bool const operator<(const ParseAction &other) const;
+        std::string toString(bool printRuleLookahead = true);
 		static std::string actionToString(ActionType action);
 
 		ActionType action;
@@ -31,4 +33,4 @@ class ParseAction {
 
 };
 
-#endif
+#endif

include/ParseRule.h

@@ -16,10 +16,10 @@ class ParseRule {
 		ParseRule();
 		ParseRule(Symbol leftHandle, int pointerIndex, std::vector<Symbol> &rightSide, std::vector<Symbol>* lookahead);
 		~ParseRule();
-		const bool equalsExceptLookahead(const ParseRule &other);
-		bool const operator==(const ParseRule &other);
-		bool const operator!=(const ParseRule &other);
-
+		const bool equalsExceptLookahead(const ParseRule &other) const;
+		bool const operator==(const ParseRule &other) const;
+		bool const operator!=(const ParseRule &other) const;
+        bool const operator<(const ParseRule &other) const; //Used for ordering so we can put ParseRule's in sets, and also so that ParseActions will have an ordering
 		ParseRule* clone();
 
 		void setLeftHandle(Symbol leftHandle);
@@ -40,7 +40,7 @@ class ParseRule {
 		void addLookahead(std::vector<Symbol>* lookahead);
 		std::vector<Symbol>* getLookahead();
 
-		std::string toString();
+		std::string toString(bool printLookahead = true);
 		std::string toDOT();
 
 	private:
@@ -51,4 +51,4 @@ class ParseRule {
 
 };
 
-#endif
+#endif

include/Parser.h

@@ -12,6 +12,7 @@
 #include "Table.h"
 
 #include <queue>
+#include <set>
 #include <map>
 #include <vector>
 #include <algorithm>
@@ -36,8 +37,13 @@ class Parser {
 		void importTable(char* tableData);
 
 	protected:
-		std::vector<Symbol>* firstSet(Symbol token);
-		std::vector<Symbol>* firstSet(Symbol token, std::vector<Symbol> avoidList);
+		std::vector<Symbol> firstSet(Symbol token, std::vector<Symbol> avoidList = std::vector<Symbol>(), bool addNewTokens = true);
+        bool isNullable(Symbol token);
+        bool isNullableHelper(Symbol token, std::set<Symbol> done);
+
+        std::map<Symbol, std::vector<Symbol>> tokenFirstSet;
+        std::map<Symbol, bool> tokenNullable;
+
 		std::vector<Symbol>* incrementiveFollowSet(ParseRule* rule);
 		virtual void closure(State* state);
 		virtual void addStates(std::vector< State* >* stateSets, State* state, std::queue<State*>* toDo);
@@ -65,4 +71,4 @@ class Parser {
 		NodeTree<Symbol>* reduceTreeCombine(Symbol newSymbol, std::vector<Symbol> &symbols);
 };
 
-#endif
+#endif

include/RNGLRParser.h

@@ -5,6 +5,8 @@
 #include <queue>
 #include <map>
 #include <vector>
+#include <set>
+#include <utility>
 #include <algorithm>
 #include "Parser.h"
 #include "Symbol.h"
@@ -16,6 +18,7 @@ class RNGLRParser: public Parser {
 		RNGLRParser();
 		~RNGLRParser();
 		NodeTree<Symbol>* parseInput(std::string inputString);
+        void printReconstructedFrontier(int frontier);
 
 	private:
 		void reducer(int i);

include/Table.h

@@ -1,5 +1,8 @@
 #include <fstream>
 
+#include <string>
+#include <utility>
+
 #include "util.h"
 #include "ParseRule.h"
 #include "ParseAction.h"
@@ -20,7 +23,8 @@ class Table {
 		void remove(int stateNum, Symbol tranSymbol);
 		std::vector<ParseAction*>* get(int state, Symbol token);
 		ParseAction* getShift(int state, Symbol token);
-		std::string toString();
+	    std::vector<std::pair<std::string, ParseAction>> stateAsParseActionVector(int state);
+        std::string toString();
 	private:
 		std::vector< std::vector< std::vector<ParseAction*>* >* >  table;
 		std::vector<Symbol> symbolIndexVec;