From 98c83e435b68094ddb577a14e0855fffd794c067 Mon Sep 17 00:00:00 2001
From: Robin Jadoul <robin.jadoul@gmail.com>
Date: Sun, 22 Jan 2017 12:50:34 +0100
Subject: [PATCH] Fix some issues introduced by error reporting

---
 include/Parsodus/backends/cppLR.h | 18 +++++++++++++-----
 templates/c++/lr.h                |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/Parsodus/backends/cppLR.h b/include/Parsodus/backends/cppLR.h
index 2337111..7b0fc64 100644
--- a/include/Parsodus/backends/cppLR.h
+++ b/include/Parsodus/backends/cppLR.h
@@ -58,10 +58,20 @@ namespace backends {
                 topLevel["num_rules"] = templ::make_string(std::to_string(grammar.rules.size()));
                 topLevel["num_symbols"] = templ::make_string(std::to_string(grammar.terminals.size() + 1 + grammar.variables.size())); // + 1 for EOF
 
+                std::set<std::string> terminals = grammar.terminals;
+                terminals.insert(util::EOF_PLACEHOLDER);
+
+                std::string lastTerminal = "";
                 std::vector<templ::TemplateContext> symbols;
-                for (auto& s : grammar.terminals)
-                    symbols.push_back(templ::make_map({{"symbol", templ::make_string("T_" + s)}}));
-                symbols.push_back(templ::make_map({{"symbol", templ::make_string("T_EOF")}}));
+                for (auto& s : terminals) {
+                    if (s == util::EOF_PLACEHOLDER)
+                        symbols.push_back(templ::make_map({{"symbol", templ::make_string("T_EOF")}}));
+                    else
+                        symbols.push_back(templ::make_map({{"symbol", templ::make_string("T_" + s)}}));
+                    lastTerminal = s;
+                }
+                topLevel["last_terminal"] = templ::make_string("T_" + lastTerminal);
+
 
                 for (auto& s : grammar.variables)
                     symbols.push_back(templ::make_map({{"symbol", templ::make_string("V_" + s)}}));
@@ -89,8 +99,6 @@ namespace backends {
                 }
                 topLevel["rulenames"] = templ::make_array(std::move(rulenamesT));
 
-                std::set<std::string> terminals = grammar.terminals;
-                terminals.insert(util::EOF_PLACEHOLDER);
                 std::vector<templ::TemplateContext> states(table.act.size());
                 for (std::size_t i = 0; i < table.act.size(); i++) {
                     std::map<const std::string, templ::TemplateContext> st;
diff --git a/templates/c++/lr.h b/templates/c++/lr.h
index 9c44c23..a63d480 100644
--- a/templates/c++/lr.h
+++ b/templates/c++/lr.h
@@ -155,7 +155,7 @@ Value {{name}}<Value>::parse() {
                     constexpr std::uint64_t verr = static_cast<std::uint64_t>({{name}}_Symbol::V_error);
                     std::vector<{{name}}_Symbol> expected;
                     {{#symbols}}
-                    if ({{name}}_Symbol::{{symbol}} <= {{name}}_Symbol::T_EOF && (TABLE[stateStack.top()][static_cast<std::uint64_t>({{name}}_Symbol::{{symbol}})] & 0x3) != ERROR) {
+                    if ({{name}}_Symbol::{{symbol}} <= {{name}}_Symbol::{{last_terminal}} && (TABLE[stateStack.top()][static_cast<std::uint64_t>({{name}}_Symbol::{{symbol}})] & 0x3) != ERROR) {
                         expected.emplace_back({{name}}_Symbol::{{symbol}});
                     }
                     {{/symbols}}