From b958e4c4788f1acb28398f640e0e5e80a45b3e12 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Wed, 18 Feb 2015 14:17:55 +0100
Subject: fixed a bug with empty fields.

---
 src/core/parser/stack/Stack.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/core/parser/stack/Stack.cpp')

diff --git a/src/core/parser/stack/Stack.cpp b/src/core/parser/stack/Stack.cpp
index 08f86e5..5b67248 100644
--- a/src/core/parser/stack/Stack.cpp
+++ b/src/core/parser/stack/Stack.cpp
@@ -16,8 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <sstream>
-
 #include <core/common/Logger.hpp>
 #include <core/common/Utils.hpp>
 #include <core/common/Exceptions.hpp>
@@ -256,7 +254,9 @@ void Stack::endCurrentHandler()
 			// Make sure the fieldEnd handler is called if the element still
 			// is in a field
 			if (info.inField) {
-				info.handler->fieldEnd();
+				if (info.inValidField) {
+					info.handler->fieldEnd();
+				}
 				info.fieldEnd();
 			}
 
@@ -300,8 +300,6 @@ bool Stack::ensureHandlerIsInField()
 		// Try to start a new default field, abort if this did not work
 		bool isDefault = true;
 		if (!info.handler->fieldStart(isDefault, info.fieldIdx)) {
-			info.handler->fieldEnd();
-			endCurrentHandler();
 			return false;
 		}
 
@@ -505,10 +503,9 @@ void Stack::fieldStart(bool isDefault)
 	// (the default field always is the last field) -- mark the command as
 	// invalid
 	if (info.hadDefaultField) {
-		logger().error(
-		    std::string("Got field start, but command \"") +
-		    currentCommandName() +
-		    std::string("\" does not have any more fields"));
+		logger().error(std::string("Got field start, but command \"") +
+		               currentCommandName() +
+		               std::string("\" does not have any more fields"));
 	}
 
 	// Copy the isDefault flag to a local variable, the fieldStart method will
@@ -559,7 +556,7 @@ void Stack::fieldEnd()
 
 	// Only continue if the current handler stack is in a valid state, do not
 	// call the fieldEnd function if something went wrong before
-	if (handlersValid() && !info.hadDefaultField) {
+	if (handlersValid() && !info.hadDefaultField && info.inValidField) {
 		try {
 			info.handler->fieldEnd();
 		}
@@ -587,5 +584,4 @@ void Stack::token(Variant token)
 	// TODO
 }
 }
-}
-
+}
\ No newline at end of file
-- 
cgit v1.2.3