Allow skipping the destructor selectively

1 files changed, 5 insertions, 3 deletions

diff --git a/src/output_slr.cpp b/src/output_slr.cpp
index d2b9817..3c9e1c2 100644
--- a/src/output_slr.cpp
+++ b/src/output_slr.cpp
@@ -66,8 +66,7 @@ void output_slr_t::emit_state_reduce_code(const item_t &item, int rule_id) {
 		bool empty = true;
 		const auto &vars = generator->get_grammar().rules[rule_id].variables;
 		for (unsigned i = 0; i < vars.size(); i++) {
-			const std::string &var = vars[i];
-			if (var.empty())
+			if (vars[i].first.empty())
 				continue;
 
 			if (!empty)
@@ -88,7 +87,10 @@ void output_slr_t::emit_state_reduce_code(const item_t &item, int rule_id) {
 
 		std::fprintf(source_file, ");\n");
 
-		for (unsigned i = 0; i < rhs.size(); i++) {
+		for (unsigned i = 0; i < vars.size(); i++) {
+			if (!vars[i].second)
+				continue;
+
 			auto it = generator->get_grammar().destructors.find(rhs[i]);
 			if (it == generator->get_grammar().destructors.end())
 				continue;