From 03e9e41e9e450a9e7fe97d93c0905b01d8a82bda Mon Sep 17 00:00:00 2001
From: kwullaer <kwullaer@hotmail.com>
Date: Wed, 25 Jan 2017 13:31:20 +0100
Subject: [PATCH] input parser changes

---
 src/inputparser.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/inputparser.cpp b/src/inputparser.cpp
index 3795ab2..9f40ca9 100644
--- a/src/inputparser.cpp
+++ b/src/inputparser.cpp
@@ -59,7 +59,7 @@ namespace pds {
 					*/
                     case ParsodusLexer::TERMINAL:
                         if(readingTerminals) {
-                            config.grammar.terminals.insert(token.content.substr(1, token.content.size - 1));
+                            config.grammar.terminals.insert(token.content.substr(1, token.content.size() - 2));
                         } else {
                             throw InputParserException("Found a terminal outside a grammar or terminals section: " + token.content);
                         }
@@ -68,12 +68,12 @@ namespace pds {
                         lexColon(lex, token);
                         if(token.type != ParsodusLexer::VARIABLE)
                             throw InputParserException("Expected to find a start variable, but found: " + token.content);
-                        config.grammar.start = token.content.substr(1, token.content.size - 1);
+                        config.grammar.start = token.content.substr(1, token.content.size() - 2);
                         break;
                     case ParsodusLexer::VARIABLE:
                         if(readingGrammar) {
                             if(config.grammar.variables.find(token.content) == config.grammar.variables.end())
-                                config.grammar.variables.insert(token.content.substr(1, token.content.size - 1));
+                                config.grammar.variables.insert(token.content.substr(1, token.content.size() - 2));
                            
                             std::string current_head = token.content;
                             // Parsing rule
@@ -85,7 +85,7 @@ namespace pds {
                             bool parsing_head = true;
                             while(parsing_head) {
                                 token = lex.nextToken();
-								token.content = token.content.substr(1, token.content.size - 1);
+								token.content = token.content.substr(1, token.content.size() - 2);
                                 switch(token.type) {
                                     case ParsodusLexer::VARIABLE:
                                         rule->tail.push_back(token.content);
@@ -133,7 +133,7 @@ namespace pds {
 									throw InputParserException("Expecting to find a terminal, but found '" + token.content + "' instead'");
 								if (config.grammar.precedence.find(token.type) == config.grammar.precedence)
 									throw InputParserException("Found same terminal in multiple precedence rules");
-								config.grammar.precedence.insert(make_pair(token.content.substr(1, token.content.size - 1), make_pair(counter++, precedence_type)));
+								config.grammar.precedence.insert(make_pair(token.content.substr(1, token.content.size() - 2), make_pair(counter++, precedence_type)));
 							}
 							
 						} else