From b7f89b4fa3dc15dbe0fa12a27b4d9167f41664f2 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 12 Apr 2015 15:18:12 +0200
Subject: Add greedy flag to TokenDescriptor and SyntaxDescriptor and set it
 correctly. Shorten Stack "checkTokensAreUnambiguous" method

---
 src/core/model/Ontology.hpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/core/model/Ontology.hpp')

diff --git a/src/core/model/Ontology.hpp b/src/core/model/Ontology.hpp
index 2533b9d..014f912 100644
--- a/src/core/model/Ontology.hpp
+++ b/src/core/model/Ontology.hpp
@@ -555,9 +555,9 @@ public:
 	 */
 	SyntaxDescriptor getSyntaxDescriptor(ssize_t depth = -1)
 	{
-		SyntaxDescriptor stx{openToken.id, closeToken.id, Tokens::Empty,
-		                     const_cast<FieldDescriptor *>(this), depth};
-		return stx;
+		return {openToken.id,  closeToken.id,
+		        Tokens::Empty, const_cast<FieldDescriptor *>(this),
+		        depth,         true};
 	}
 
 	/**
@@ -645,7 +645,8 @@ public:
 	 */
 	virtual ManagedVector<FieldDescriptor> getFieldDescriptors() const
 	{
-		return ManagedVector<FieldDescriptor>(const_cast<Descriptor*>(this), fieldDescriptors.begin(),
+		return ManagedVector<FieldDescriptor>(const_cast<Descriptor *>(this),
+		                                      fieldDescriptors.begin(),
 		                                      fieldDescriptors.end());
 	}
 
@@ -934,9 +935,8 @@ public:
 	 */
 	virtual SyntaxDescriptor getSyntaxDescriptor(ssize_t depth = -1)
 	{
-		SyntaxDescriptor stx{openToken.id, closeToken.id, Tokens::Empty,
-		                     const_cast<Descriptor *>(this), depth};
-		return stx;
+		return {openToken.id,                   closeToken.id, Tokens::Empty,
+		        const_cast<Descriptor *>(this), depth,         true};
 	}
 
 	/**
@@ -1227,10 +1227,9 @@ public:
 	 */
 	SyntaxDescriptor getSyntaxDescriptor(ssize_t depth = -1) override
 	{
-		SyntaxDescriptor stx{getOpenToken().id, getCloseToken().id,
-		                     shortToken.id, const_cast<StructuredClass *>(this),
-		                     depth};
-		return stx;
+		return {getOpenToken().id, getCloseToken().id,
+		        shortToken.id,     const_cast<StructuredClass *>(this),
+		        depth,             shortToken.greedy};
 	}
 };
 
-- 
cgit v1.2.3