Merge lp:~verifydtapn-contributers/verifydtapn/partial-order into lp:verifydtapn

[Peter Gjøl Jensen]

Adds zero-time partial order reduction to the engine.
Adds support for timed-safety-games to the engine.
Also refactores all around for improved performance.
New successor-generator, used by all engines.

[Jiri Srba (srba)]

Tested on about 30 small workflow nets. Compiles on all platforms.

review: Approve

=== modified file 'makefile.linux64'
--- makefile.linux64	2015-08-20 13:27:02 +0000
+++ makefile.linux64	2018-01-07 20:09:44 +0000
@@ -8,9 +8,9 @@
 CUT				= cut
 
 # Compiler and linker flags
-CFLAGS 			=  -DBOOST_DISABLE_THREADS -DNDEBUG -DDISABLE_ASSERTX -static -O3 -Wall -mtune=core2
+CFLAGS 			= -std=c++14 -DBOOST_DISABLE_THREADS -DNDEBUG -DDISABLE_ASSERTX -static -O3 -Wall -mtune=core2
 
-LDFLAGS 		= -DBOOST_DISABLE_THREADS -DNDEBUG -DDISABLE_ASSERTX -static -O3 -Wall -mtune=core2
+LDFLAGS 		= -std=c++14 -DBOOST_DISABLE_THREADS -DNDEBUG -DDISABLE_ASSERTX -static -O3 -Wall -mtune=core2
 
 # Input files
 SOURCES			= $(shell find * -name "*.cpp")	

=== modified file 'src/Core/ArgsParser.cpp'
--- src/Core/ArgsParser.cpp	2017-09-15 14:38:02 +0000
+++ src/Core/ArgsParser.cpp	2018-01-07 20:09:44 +0000
@@ -20,6 +20,8 @@
 static const std::string WORKFLOW = "workflow";
 static const std::string STRONG_WORKFLOW_BOUND = "strong-workflow-bound";
 static const std::string CALCULATE_CMAX = "calculate-cmax";
+static const std::string REPLACE = "replace";
+static const std::string ORDER = "partial-order";
 
 std::ostream& operator<<(std::ostream& out, const Switch& flag) {
 	flag.print(out);
@@ -181,7 +183,13 @@
     parsers.push_back(
             new Switch ("n", CALCULATE_CMAX,
             "Calculate the place bounds"));
-
+    parsers.push_back(
+            new SwitchWithStringArg("r", REPLACE,
+            "Replace placeholder in model with value, format PLACEHOLDER=VALUE;..", ""));
+    parsers.push_back(
+        new Switch("i", ORDER,
+        "Disable partial order reduction"));
+    
     };
 
 void ArgsParser::printHelp() const {
@@ -404,6 +412,45 @@
 	return result;
 }
 
+std::map<std::string, int> ArgsParser::parseReplace(const option& option) const
+{
+    std::map<std::string, int> replace;
+    const std::string param = option.second;
+    
+    size_t split = 0;
+    do {
+        size_t equal = param.find("=", split);
+        if(equal != std::string::npos)
+        {
+            std::string name = param.substr(split, equal - split);
+            std::string val;
+            split = param.find(":", equal);
+            ++equal;
+            if(split == std::string::npos)
+                val = param.substr(equal, param.size() - equal);
+            else
+                val = param.substr(equal, split - equal);
+            
+            try{
+                int res = boost::lexical_cast<unsigned long long>(val);
+                replace[name] = res;
+            } catch (boost::bad_lexical_cast & e) {
+		std::cout << "Invalid value '" << option.second << "' for option '--"
+				<< option.first << "'" << std::endl;
+		exit(1);
+            }
+            if(split >= param.size()) break;
+            ++split;
+        }
+        else
+        {
+            break;
+        }
+
+    } while(split != std::string::npos);
+    return replace;
+}
+
 std::vector<std::string> ArgsParser::parseIncPlaces(
 		const std::string& string) const {
 	std::vector<std::string> vec;
@@ -452,13 +499,18 @@
 	bool calculateCmax = boost::lexical_cast<bool>(
 			map.find(CALCULATE_CMAX)->second);
 
+        std::map<std::string, int> replace = parseReplace(*map.find(REPLACE));
         
         assert(map.find(GCD) != map.end());
         bool enableGCDLowerGuards = boost::lexical_cast<bool>(
 			map.find(GCD)->second);
+
+        bool order = boost::lexical_cast<bool>(
+			map.find(ORDER)->second);
         
 	return VerificationOptions(search, verification, memoptimization, kbound, trace,
-			xml_trace, max_constant, keep_dead, enableGCDLowerGuards, workflow, workflowBound, calculateCmax);
+			xml_trace, max_constant, keep_dead, enableGCDLowerGuards, workflow,
+                        workflowBound, calculateCmax, replace, !order);
 
 }
 }

=== modified file 'src/Core/ArgsParser.hpp'
--- src/Core/ArgsParser.hpp	2017-09-18 13:45:47 +0000
+++ src/Core/ArgsParser.hpp	2018-01-07 20:09:44 +0000
@@ -89,6 +89,7 @@
 		unsigned int tryParseInt(const option& option) const;
 		unsigned long long tryParseLongLong(const option& option) const;
 		std::vector<std::string> parseIncPlaces(const std::string& string) const;
+                std::map<std::string, int> parseReplace(const option& option) const;
 		void initialize();
 		void printHelp() const;
 		void printVersion() const;

=== modified file 'src/Core/QueryParser/AST.cpp'
--- src/Core/QueryParser/AST.cpp	2014-02-16 19:20:25 +0000
+++ src/Core/QueryParser/AST.cpp	2018-01-07 20:09:44 +0000
@@ -8,12 +8,12 @@
 			return new NotExpression(*this);
 		}
 
-		void NotExpression::accept(Visitor& visitor, Result& context) const
+		void NotExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
 
-		void BoolExpression::accept(Visitor& visitor, Result& context) const
+		void BoolExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -23,7 +23,7 @@
 			return new BoolExpression(*this);
 		}
 
-                void DeadlockExpression::accept(Visitor& visitor, Result& context) const
+                void DeadlockExpression::accept(Visitor& visitor, Result& context)
 		{      
 			visitor.visit(*this, context);
 		}
@@ -33,7 +33,7 @@
 			return new DeadlockExpression(*this);
 		}
         
-		void AtomicProposition::accept(Visitor& visitor, Result& context) const
+		void AtomicProposition::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -48,7 +48,7 @@
 			return new AndExpression(*this);
 		}
                 
-		void AndExpression::accept(Visitor& visitor, Result& context) const
+		void AndExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -58,12 +58,12 @@
 			return new OrExpression(*this);
 		}
 
-                void OrExpression::accept(Visitor& visitor, Result& context) const
+                void OrExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
                 
-		void PlusExpression::accept(Visitor& visitor, Result& context) const
+		void PlusExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -73,7 +73,7 @@
 			return new PlusExpression(*this);
 		}
                 
-                void SubtractExpression::accept(Visitor& visitor, Result& context) const
+                void SubtractExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -83,7 +83,7 @@
 			return new SubtractExpression(*this);
 		}
                 
-                void MinusExpression::accept(Visitor& visitor, Result& context) const
+                void MinusExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -93,7 +93,7 @@
 			return new MinusExpression(*this);
 		}
 
-                void MultiplyExpression::accept(Visitor& visitor, Result& context) const
+                void MultiplyExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -103,7 +103,7 @@
 			return new MultiplyExpression(*this);
 		}
                 
-                void NumberExpression::accept(Visitor& visitor, Result& context) const
+                void NumberExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -113,7 +113,7 @@
 			return new NumberExpression(*this);
 		} 
                 
-                void IdentifierExpression::accept(Visitor& visitor, Result& context) const
+                void IdentifierExpression::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}
@@ -128,7 +128,7 @@
 			return new Query(*this);
 		}
 
-		void Query::accept(Visitor& visitor, Result& context) const
+		void Query::accept(Visitor& visitor, Result& context)
 		{
 			visitor.visit(*this, context);
 		}

=== modified file 'src/Core/QueryParser/AST.hpp'
--- src/Core/QueryParser/AST.hpp	2014-02-16 19:20:25 +0000
+++ src/Core/QueryParser/AST.hpp	2018-01-07 20:09:44 +0000
@@ -5,390 +5,467 @@
 #include <iostream>
 #include "Visitor.hpp"
 
-namespace VerifyTAPN{
-	namespace AST {
-
-		class Visitable
-		{
-		public:
-			virtual void accept(Visitor& visitor, Result& context) const = 0;
-		};
-
-		class Expression : public Visitable
-		{
-		public:
-			virtual ~Expression() { };
-			virtual Expression* clone() const = 0;
-		};
-
-		class NotExpression : public Expression
-		{
-		public:
-			explicit NotExpression(Expression* expr) : expr(expr) { };
-			NotExpression(const NotExpression& other) : expr(other.expr->clone()) { };
-			NotExpression& operator=(const NotExpression& other)
-			{
-				if(&other != this){
-					delete expr;
-					expr = other.expr->clone();
-				}
-
-				return *this;
-			}
-
-			virtual ~NotExpression(){
-				if( expr ) delete expr;
-			};
-
-			virtual NotExpression* clone() const;
-			virtual void accept(Visitor& visitor, Result& context) const;
-
-			const Expression& getChild() const { return *expr; }
-		private:
-			Expression* expr;
-		};
-                
-                class DeadlockExpression : public Expression
-                {
-                    public:
-			explicit DeadlockExpression() {};
-			virtual ~DeadlockExpression() { };
-
-			virtual DeadlockExpression* clone() const;
-			virtual void accept(Visitor& visitor, Result& context) const;
-                };
-
-		class BoolExpression : public Expression
-		{
-		public:
-			explicit BoolExpression(bool value) : value(value) {};
-			virtual ~BoolExpression() { };
-
-			virtual BoolExpression* clone() const;
-			virtual void accept(Visitor& visitor, Result& context) const;
-
-			bool getValue() const { return value; };
-		private:
-			bool value;
-		};
-
-		class AtomicProposition : public Expression
-		{
-		public:
-			AtomicProposition(ArithmeticExpression* left, std::string* op,ArithmeticExpression* right) : left(left), op(op->begin(), op->end()), right(right){};
-			AtomicProposition(const AtomicProposition& other) : left(other.left), op(other.op), right(other.right) { };
-			AtomicProposition& operator=(const AtomicProposition& other)
-			{
-				if(&other != this){
-					left = other.left;
-					op = other.op;
-					right = other.right;
-				}
-				return *this;
-			}
-
-			virtual ~AtomicProposition() { };
-
-                        ArithmeticExpression& getLeft() const {return *left;};
-                        ArithmeticExpression& getRight() const {return *right;};
-                        std::string getOperator() const {return op;};
-                         
-			virtual AtomicProposition* clone() const;
-			virtual void accept(Visitor& visitor, Result& context) const;
-
-		private:
-			ArithmeticExpression* left;
-			std::string op;
-			ArithmeticExpression* right;
-		};
-
-		class AndExpression : public Expression
-		{
-		public:
-			AndExpression(Expression* left, Expression* right) : left(left), right(right) { };
-			AndExpression(const AndExpression& other) : left(other.left->clone()), right(other.right->clone()) {};
-			AndExpression& operator=(const AndExpression& other)
-			{
-				if(&other != this){
-					delete left;
-					delete right;
-
-					left = other.left->clone();
-					right = other.right->clone();
-				}
-				return *this;
-			}
-
-			virtual ~AndExpression() {
-				if( left ) delete left;
-				if( right ) delete right;
-			}
-
-			virtual AndExpression* clone() const;
-			void accept(Visitor& visitor, Result& context) const;
-
-			const Expression& getLeft() const { return *left; }
-			const Expression& getRight() const { return *right; }
-		private:
-			Expression* left;
-			Expression* right;
-		};
-
-		class OrExpression : public Expression
-		{
-		public:
-			OrExpression(Expression* left, Expression* right) : left(left), right(right) { };
-			OrExpression(const OrExpression& other) : left(other.left->clone()), right(other.right->clone()) { };
-			OrExpression& operator=(const OrExpression& other)
-			{
-				if(&other != this){
-					delete left;
-					delete right;
-
-					left = other.left->clone();
-					right = other.right->clone();
-				}
-				return *this;
-			}
-
-
-			virtual ~OrExpression(){
-				if( left ) delete left;
-				if( right ) delete right;
-			};
-
-
-
-			virtual OrExpression* clone() const;
-			virtual void accept(Visitor& visitor, Result& context) const;
-
-			const Expression& getLeft() const { return *left; }
-			const Expression& getRight() const { return *right; }
-		private:
-			Expression* left;
-			Expression* right;
-		};
-                
-                class ArithmeticExpression : public Visitable
-                {
-                    public:
-			virtual ~ArithmeticExpression() { };
-			virtual ArithmeticExpression* clone() const = 0;
-                };
-
-                class OperationExpression : public ArithmeticExpression {
-                protected:
-
-                    OperationExpression(ArithmeticExpression* left, ArithmeticExpression* right) : left(left), right(right) {
-                    };
-
-                    OperationExpression(const OperationExpression& other) : left(other.left), right(other.right) {
-                    };
-
-                    OperationExpression& operator=(const OperationExpression& other) {
-                        if (&other != this) {
-                            delete left;
-                            left = other.left;
-                            delete right;
-                            right = other.right;
-                        }
-                        return *this;
-                    }
-                    
-                    virtual ~OperationExpression() {
-                    };
-                    
-                public:
-                    ArithmeticExpression& getLeft() const {return *left;};
-                    ArithmeticExpression& getRight() const {return *right;};
-                    
-                protected:
-                    ArithmeticExpression* left;
-                    ArithmeticExpression* right;
-                };
-
-                class PlusExpression : public OperationExpression {
-                public:
-
-                    PlusExpression(ArithmeticExpression* left, ArithmeticExpression* right)
-                    : OperationExpression(left, right) {
-                    };
-
-                    PlusExpression(const PlusExpression& other)
-                    : OperationExpression(other) {
-                    };
-
-                    PlusExpression& operator=(const PlusExpression& other) {
-                        if (&other != this) {
-                            left = other.left;
-                            right = other.right;
-                        }
-                        return *this;
-                    }
-
-                    virtual ~PlusExpression() {
-                    };
-
-                    virtual PlusExpression* clone() const;
-                    virtual void accept(Visitor& visitor, Result& context) const;
-
-                };
-
-                class SubtractExpression : public OperationExpression {
-                public:
-
-                    SubtractExpression(ArithmeticExpression* left, ArithmeticExpression* right)
-                    : OperationExpression(left, right) {
-                    };
-
-                    SubtractExpression(const SubtractExpression& other)
-                    : OperationExpression(other) {
-                    };
-
-                    SubtractExpression& operator=(const SubtractExpression& other) {
-                        if (&other != this) {
-                            left = other.left;
-                            right = other.right;
-                        }
-                        return *this;
-                    }
-
-                    virtual ~SubtractExpression() {
-                    };
-
-                    virtual SubtractExpression* clone() const;
-                    virtual void accept(Visitor& visitor, Result& context) const;
-                };
-
-                class MinusExpression : public ArithmeticExpression {
-                public:
-                    MinusExpression(ArithmeticExpression* value) : value(value) {
-                    };
-
-                    MinusExpression(const MinusExpression& other)
-                    : value(other.value) {
-                    };
-
-                    MinusExpression& operator=(const MinusExpression& other) {
-                        if (&other != this) {
-                            value = other.value;
-                        }
-                        return *this;
-                    }
-
-                    ArithmeticExpression& getValue() const { return *value;};
-                    
-                    virtual ~MinusExpression() {
-                    };
-                    virtual MinusExpression* clone() const;
-                    virtual void accept(Visitor& visitor, Result& context) const;
-                private:
-                    ArithmeticExpression* value;
-                };
-
-                class MultiplyExpression : public OperationExpression {
-                public:
-
-                    MultiplyExpression(ArithmeticExpression* left, ArithmeticExpression* right)
-                    : OperationExpression(left, right) {
-                    };
-
-                    MultiplyExpression(const MultiplyExpression& other)
-                    : OperationExpression(other) {
-                    };
-
-                    MultiplyExpression& operator=(const MultiplyExpression& other) {
-                        if (&other != this) {
-                            left = other.left;
-                            right = other.right;
-                        }
-                        return *this;
-                    }
-
-                    virtual ~MultiplyExpression() {
-                    };
-                    virtual MultiplyExpression* clone() const;
-                    virtual void accept(Visitor& visitor, Result& context) const;
-                };
-
-                class NumberExpression : public ArithmeticExpression {
-                public:
-
-                    NumberExpression(int i) : value(i) {
-                    }
-
-                    NumberExpression(const NumberExpression& other) : value(other.value) {
-                    };
-
-                    NumberExpression& operator=(const NumberExpression& other) {
-                        value = other.value;
-                        return *this;
-                    };
-
-                    int getValue() const {return value;};
-                    
-                    virtual ~NumberExpression() {
-                    };
-                    virtual NumberExpression* clone() const;
-                    virtual void accept(Visitor& visitor, Result& context) const;
-                private:
-                    int value;
-                };
-
-                class IdentifierExpression : public ArithmeticExpression {
-                public:
-
-                    IdentifierExpression(int placeIndex) : place(placeIndex) {
-                    }
-
-                    IdentifierExpression(const IdentifierExpression& other) : place(other.place) {
-                    };
-
-                    IdentifierExpression& operator=(const IdentifierExpression& other) {
-                        place = other.place;
-                        return *this;
-                    };
-
-                    int getPlace() const { return place;};
-                    
-                    virtual ~IdentifierExpression() {
-                    };
-                    virtual IdentifierExpression* clone() const;
-                    virtual void accept(Visitor& visitor, Result& context) const;
-                private:
-                    int place;
-                };
-        
-                
-		enum Quantifier { EF, AG, EG, AF};
-
-		class Query : public Visitable
-		{
-		public:
-			Query(Quantifier quantifier, Expression* expr) : quantifier(quantifier), expr(expr) { };
-			Query(const Query& other) : quantifier(other.quantifier), expr(other.expr->clone()) { };
-			Query& operator=(const Query& other)
-			{
-				if(&other != this){
-					delete expr;
-					expr = other.expr->clone();
-				}
-				return *this;
-			}
-
-			virtual ~Query() { if( expr ) delete expr; }
-
-			virtual Query* clone() const;
-			virtual void accept(Visitor& visitor, Result& context) const;
-
-			Quantifier getQuantifier() const { return quantifier; }
-			const Expression& getChild() const { return *expr; }
-			void setQuantifier(Quantifier q){ quantifier = q; }
-		private:
-			Quantifier quantifier;
-			Expression* expr;
-		};
-	}
+namespace VerifyTAPN {
+    namespace AST {
+
+        class Visitable {
+        public:
+            virtual void accept(Visitor& visitor, Result& context) = 0;
+            int32_t eval = 0;
+        };
+
+        class Expression : public Visitable {
+        public:
+
+            virtual ~Expression() {
+            };
+            virtual Expression* clone() const = 0;
+        };
+
+        class NotExpression : public Expression {
+        public:
+
+            explicit NotExpression(Expression* expr) : expr(expr) {
+            };
+
+            NotExpression(const NotExpression& other) : expr(other.expr->clone()) {
+            };
+
+            NotExpression& operator=(const NotExpression& other) {
+                if (&other != this) {
+                    delete expr;
+                    expr = other.expr->clone();
+                }
+
+                return *this;
+            }
+
+            virtual ~NotExpression() {
+                if (expr) delete expr;
+            };
+
+            virtual NotExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+
+            Expression& getChild() const {
+                return *expr;
+            }
+        private:
+            Expression* expr;
+        };
+
+        class DeadlockExpression : public Expression {
+        public:
+
+            explicit DeadlockExpression() {
+            };
+
+            virtual ~DeadlockExpression() {
+            };
+
+            virtual DeadlockExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+        };
+
+        class BoolExpression : public Expression {
+        public:
+
+            explicit BoolExpression(bool value) : value(value) {
+            };
+
+            virtual ~BoolExpression() {
+            };
+
+            virtual BoolExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+
+            bool getValue() const {
+                return value;
+            };
+        private:
+            bool value;
+        };
+
+        class AtomicProposition : public Expression {
+        public:
+
+            AtomicProposition(ArithmeticExpression* left, std::string* op, ArithmeticExpression* right) : left(left), op(op->begin(), op->end()), right(right) {
+            };
+
+            AtomicProposition(const AtomicProposition& other) : left(other.left), op(other.op), right(other.right) {
+            };
+
+            AtomicProposition& operator=(const AtomicProposition& other) {
+                if (&other != this) {
+                    left = other.left;
+                    op = other.op;
+                    right = other.right;
+                }
+                return *this;
+            }
+
+            virtual ~AtomicProposition() {
+            };
+
+            ArithmeticExpression& getLeft() const {
+                return *left;
+            };
+
+            ArithmeticExpression& getRight() const {
+                return *right;
+            };
+
+            std::string getOperator() const {
+                return op;
+            };
+
+            virtual AtomicProposition* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+
+        private:
+            ArithmeticExpression* left;
+            std::string op;
+            ArithmeticExpression* right;
+        };
+
+        class AndExpression : public Expression {
+        public:
+
+            AndExpression(Expression* left, Expression* right) : left(left), right(right) {
+            };
+
+            AndExpression(const AndExpression& other) : left(other.left->clone()), right(other.right->clone()) {
+            };
+
+            AndExpression& operator=(const AndExpression& other) {
+                if (&other != this) {
+                    delete left;
+                    delete right;
+
+                    left = other.left->clone();
+                    right = other.right->clone();
+                }
+                return *this;
+            }
+
+            virtual ~AndExpression() {
+                if (left) delete left;
+                if (right) delete right;
+            }
+
+            virtual AndExpression* clone() const;
+            void accept(Visitor& visitor, Result& context);
+
+            Expression& getLeft() const {
+                return *left;
+            }
+
+            Expression& getRight() const {
+                return *right;
+            }
+        private:
+            Expression* left;
+            Expression* right;
+        };
+
+        class OrExpression : public Expression {
+        public:
+
+            OrExpression(Expression* left, Expression* right) : left(left), right(right) {
+            };
+
+            OrExpression(const OrExpression& other) : left(other.left->clone()), right(other.right->clone()) {
+            };
+
+            OrExpression& operator=(const OrExpression& other) {
+                if (&other != this) {
+                    delete left;
+                    delete right;
+
+                    left = other.left->clone();
+                    right = other.right->clone();
+                }
+                return *this;
+            }
+
+            virtual ~OrExpression() {
+                if (left) delete left;
+                if (right) delete right;
+            };
+
+
+
+            virtual OrExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+
+            Expression& getLeft() const {
+                return *left;
+            }
+
+            Expression& getRight() const {
+                return *right;
+            }
+        private:
+            Expression* left;
+            Expression* right;
+        };
+
+        class ArithmeticExpression : public Visitable {
+        public:
+
+            virtual ~ArithmeticExpression() {
+            };
+            virtual ArithmeticExpression* clone() const = 0;
+        };
+
+        class OperationExpression : public ArithmeticExpression {
+        protected:
+
+            OperationExpression(ArithmeticExpression* left, ArithmeticExpression* right) : left(left), right(right) {
+            };
+
+            OperationExpression(const OperationExpression& other) : left(other.left), right(other.right) {
+            };
+
+            OperationExpression& operator=(const OperationExpression& other) {
+                if (&other != this) {
+                    delete left;
+                    left = other.left;
+                    delete right;
+                    right = other.right;
+                }
+                return *this;
+            }
+
+            virtual ~OperationExpression() {
+            };
+
+        public:
+
+            ArithmeticExpression& getLeft() {
+                return *left;
+            };
+
+            ArithmeticExpression& getRight() {
+                return *right;
+            };
+
+        protected:
+            ArithmeticExpression* left;
+            ArithmeticExpression* right;
+        };
+
+        class PlusExpression : public OperationExpression {
+        public:
+
+            PlusExpression(ArithmeticExpression* left, ArithmeticExpression* right)
+            : OperationExpression(left, right) {
+            };
+
+            PlusExpression(const PlusExpression& other)
+            : OperationExpression(other) {
+            };
+
+            PlusExpression& operator=(const PlusExpression& other) {
+                if (&other != this) {
+                    left = other.left;
+                    right = other.right;
+                }
+                return *this;
+            }
+
+            virtual ~PlusExpression() {
+            };
+
+            virtual PlusExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+
+        };
+
+        class SubtractExpression : public OperationExpression {
+        public:
+
+            SubtractExpression(ArithmeticExpression* left, ArithmeticExpression* right)
+            : OperationExpression(left, right) {
+            };
+
+            SubtractExpression(const SubtractExpression& other)
+            : OperationExpression(other) {
+            };
+
+            SubtractExpression& operator=(const SubtractExpression& other) {
+                if (&other != this) {
+                    left = other.left;
+                    right = other.right;
+                }
+                return *this;
+            }
+
+            virtual ~SubtractExpression() {
+            };
+
+            virtual SubtractExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+        };
+
+        class MinusExpression : public ArithmeticExpression {
+        public:
+
+            MinusExpression(ArithmeticExpression* value) : value(value) {
+            };
+
+            MinusExpression(const MinusExpression& other)
+            : value(other.value) {
+            };
+
+            MinusExpression& operator=(const MinusExpression& other) {
+                if (&other != this) {
+                    value = other.value;
+                }
+                return *this;
+            }
+
+            ArithmeticExpression& getValue() const {
+                return *value;
+            };
+
+            virtual ~MinusExpression() {
+            };
+            virtual MinusExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+        private:
+            ArithmeticExpression* value;
+        };
+
+        class MultiplyExpression : public OperationExpression {
+        public:
+
+            MultiplyExpression(ArithmeticExpression* left, ArithmeticExpression* right)
+            : OperationExpression(left, right) {
+            };
+
+            MultiplyExpression(const MultiplyExpression& other)
+            : OperationExpression(other) {
+            };
+
+            MultiplyExpression& operator=(const MultiplyExpression& other) {
+                if (&other != this) {
+                    left = other.left;
+                    right = other.right;
+                }
+                return *this;
+            }
+
+            virtual ~MultiplyExpression() {
+            };
+            virtual MultiplyExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+        };
+
+        class NumberExpression : public ArithmeticExpression {
+        public:
+
+            NumberExpression(int i) : value(i) {
+            }
+
+            NumberExpression(const NumberExpression& other) : value(other.value) {
+            };
+
+            NumberExpression& operator=(const NumberExpression& other) {
+                value = other.value;
+                return *this;
+            };
+
+            int getValue() const {
+                return value;
+            };
+
+            virtual ~NumberExpression() {
+            };
+            virtual NumberExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+        private:
+            int value;
+        };
+
+        class IdentifierExpression : public ArithmeticExpression {
+        public:
+
+            IdentifierExpression(int placeIndex) : place(placeIndex) {
+            }
+
+            IdentifierExpression(const IdentifierExpression& other) : place(other.place) {
+            };
+
+            IdentifierExpression& operator=(const IdentifierExpression& other) {
+                place = other.place;
+                return *this;
+            };
+
+            int getPlace() const {
+                return place;
+            };
+
+            virtual ~IdentifierExpression() {
+            };
+            virtual IdentifierExpression* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+        private:
+            int place;
+        };
+
+        enum Quantifier {
+            EF, AG, EG, AF, CF, CG
+        };
+
+        class Query : public Visitable {
+        public:
+
+            Query(Quantifier quantifier, Expression* expr) : quantifier(quantifier), expr(expr) {
+            };
+
+            Query(const Query& other) : quantifier(other.quantifier), expr(other.expr->clone()) {
+            };
+
+            Query& operator=(const Query& other) {
+                if (&other != this) {
+                    delete expr;
+                    expr = other.expr->clone();
+                }
+                return *this;
+            }
+
+            virtual ~Query() {
+                if (expr) delete expr;
+            }
+
+            virtual Query* clone() const;
+            virtual void accept(Visitor& visitor, Result& context);
+
+            Quantifier getQuantifier() const {
+                return quantifier;
+            }
+
+            const Expression& getConstChild() const {
+                return *expr;
+            }
+
+            Expression* getChild() {
+                return expr;
+            }
+
+            void setChild(Expression* expr) {
+                this->expr = expr;
+            }
+
+            void setQuantifier(Quantifier q) {
+                quantifier = q;
+            }
+        private:
+            Quantifier quantifier;
+            Expression* expr;
+        };
+    }
 }
 
 #endif /* AST_HPP_ */

=== modified file 'src/Core/QueryParser/Generated/lexer.cpp'
--- src/Core/QueryParser/Generated/lexer.cpp	2014-08-07 20:48:41 +0000
+++ src/Core/QueryParser/Generated/lexer.cpp	2018-01-07 20:09:44 +0000
@@ -9,7 +9,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -47,7 +47,6 @@
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -55,7 +54,6 @@
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -86,6 +84,8 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -333,7 +333,7 @@
 
 /* Begin user sect3 */
 
-#define yywrap(n) 1
+#define yywrap() 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -359,13 +359,13 @@
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (yy_size_t) (yy_cp - yy_bp); \
+	yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 26
-#define YY_END_OF_BUFFER 27
+#define YY_NUM_RULES 28
+#define YY_END_OF_BUFFER 29
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -373,14 +373,15 @@
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[61] =
+static yyconst flex_int16_t yy_accept[69] =
     {   0,
-        0,    0,   27,   26,    1,    2,   13,   26,   20,   21,
-       24,   22,   23,    3,   14,   16,   19,   25,   25,   25,
-       25,   25,   25,   25,   26,   25,   25,    1,    2,    9,
-        3,   15,   17,   18,   25,   25,   25,   25,   25,    8,
-       25,    8,    6,    5,    4,    7,    9,   25,   25,   13,
-       25,   25,   25,   10,   25,   11,   25,   25,   12,    0
+        0,    0,   29,   28,    1,    2,   14,   28,   21,   22,
+       25,   23,   24,    3,   26,   15,   17,   20,   27,   27,
+       27,   27,   27,   27,   27,   27,   28,   27,   27,    1,
+        2,   10,    3,   16,   18,   19,   27,    6,    5,   27,
+       27,   27,   27,    9,   27,    9,    4,    7,   27,   10,
+       27,   27,   14,   27,   27,   27,   27,   11,   27,   27,
+       12,   27,   27,   27,   27,    8,   13,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -390,15 +391,15 @@
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    2,    4,    1,    1,    1,    1,    5,    1,    6,
         7,    8,    9,    1,   10,    1,    1,   11,   11,   11,
-       11,   11,   11,   11,   11,   11,   11,    1,    1,   12,
-       13,   14,    1,    1,   15,   16,   16,   16,   17,   18,
-       19,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-        1,    1,    1,    1,   16,    1,   20,   16,   21,   22,
+       11,   11,   11,   11,   11,   11,   11,   12,    1,   13,
+       14,   15,    1,    1,   16,   17,   17,   17,   18,   19,
+       20,   17,   17,   17,   17,   17,   17,   17,   17,   17,
+       17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
+        1,    1,    1,    1,   17,    1,   21,   17,   22,   23,
 
-       23,   24,   16,   16,   16,   16,   25,   26,   16,   27,
-       28,   16,   16,   29,   30,   31,   32,   16,   16,   16,
-       16,   16,    1,   33,    1,    1,    1,    1,    1,    1,
+       24,   25,   17,   17,   17,   17,   26,   27,   17,   28,
+       29,   17,   17,   30,   31,   32,   33,   17,   17,   17,
+       17,   17,    1,   34,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -415,66 +416,68 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[34] =
+static yyconst flex_int32_t yy_meta[35] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        2,    1,    1,    1,    2,    2,    2,    2,    2,    2,
+        2,    1,    1,    1,    1,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    1
-    } ;
-
-static yyconst flex_int16_t yy_base[62] =
-    {   0,
-        0,   19,   71,   72,   68,   66,   72,   63,   72,   72,
-       72,   72,   72,   56,   53,   52,   51,    0,   36,   39,
-       41,   32,   30,   29,   24,   19,   21,   54,   52,   72,
-       43,   72,   72,   72,    0,   31,   32,   25,   19,    0,
-       17,   72,    0,    0,    0,    0,    0,   26,   17,    0,
-       23,   19,   21,    0,   15,    0,   21,   16,    0,   72,
-       33
-    } ;
-
-static yyconst flex_int16_t yy_def[62] =
-    {   0,
-       60,    1,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   61,   61,   61,
-       61,   61,   61,   61,   60,   61,   61,   60,   60,   60,
-       60,   60,   60,   60,   61,   61,   61,   61,   61,   61,
-       61,   60,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,    0,
-       60
-    } ;
-
-static yyconst flex_int16_t yy_nxt[106] =
+        2,    2,    2,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[70] =
+    {   0,
+        0,   17,   78,   79,   75,   73,   79,   70,   79,   79,
+       79,   79,   79,   63,   79,   59,   58,   57,   17,    0,
+       42,   45,   47,   38,   36,   35,   30,   21,   34,   60,
+       58,   79,   49,   79,   79,   79,    0,    0,    0,   36,
+       37,   30,   24,    0,   22,   79,    0,    0,   26,    0,
+       30,   21,    0,   27,   18,   22,   24,    0,   17,   17,
+        0,   16,   22,   16,   16,    0,    0,   79,   36
+    } ;
+
+static yyconst flex_int16_t yy_def[70] =
+    {   0,
+       68,    1,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   69,   69,
+       69,   69,   69,   69,   69,   69,   68,   69,   69,   68,
+       68,   68,   68,   68,   68,   68,   69,   69,   69,   69,
+       69,   69,   69,   69,   69,   68,   69,   69,   69,   69,
+       69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
+       69,   69,   69,   69,   69,   69,   69,    0,   68
+    } ;
+
+static yyconst flex_int16_t yy_nxt[114] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   15,   16,   17,   18,   18,   18,   18,   18,   19,
-       18,   20,   18,   21,   18,   18,   22,   23,   18,   18,
-       24,   18,   25,   26,   35,   27,   43,   44,   45,   46,
-       59,   58,   57,   56,   55,   54,   53,   52,   51,   50,
-       49,   48,   47,   31,   29,   28,   42,   41,   40,   39,
-       38,   37,   36,   34,   33,   32,   31,   30,   29,   28,
-       60,    3,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
+       14,   15,   16,   17,   18,   19,   20,   20,   20,   20,
+       21,   20,   22,   20,   23,   20,   20,   24,   25,   20,
+       20,   26,   20,   27,   28,   38,   39,   37,   29,   47,
+       48,   67,   66,   65,   64,   63,   62,   61,   60,   59,
+       58,   57,   56,   55,   54,   53,   52,   51,   50,   33,
+       31,   30,   49,   46,   45,   44,   43,   42,   41,   40,
+       36,   35,   34,   33,   32,   31,   30,   68,    3,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
 
-       60,   60,   60,   60,   60
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68
     } ;
 
-static yyconst flex_int16_t yy_chk[106] =
+static yyconst flex_int16_t yy_chk[114] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    2,   61,    2,   26,   26,   27,   27,
-       58,   57,   55,   53,   52,   51,   49,   48,   41,   39,
-       38,   37,   36,   31,   29,   28,   25,   24,   23,   22,
-       21,   20,   19,   17,   16,   15,   14,    8,    6,    5,
-        3,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
+        1,    1,    1,    1,    2,   19,   19,   69,    2,   28,
+       28,   65,   64,   63,   62,   60,   59,   57,   56,   55,
+       54,   52,   51,   49,   45,   43,   42,   41,   40,   33,
+       31,   30,   29,   27,   26,   25,   24,   23,   22,   21,
+       18,   17,   16,   14,    8,    6,    5,    3,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
 
-       60,   60,   60,   60,   60
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -510,7 +513,7 @@
 #define yyterminate() return token::END
 #line 26 "src/Core/QueryParser/flex.ll"
 # define YY_USER_ACTION  yylloc->columns (yyleng);
-#line 514 "src/Core/QueryParser/Generated/lexer.cpp"
+#line 517 "src/Core/QueryParser/Generated/lexer.cpp"
 
 #define INITIAL 0
 
@@ -597,7 +600,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -608,7 +611,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -698,7 +701,7 @@
 
   yylloc->step ();
 
-#line 702 "src/Core/QueryParser/Generated/lexer.cpp"
+#line 705 "src/Core/QueryParser/Generated/lexer.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -752,13 +755,13 @@
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 61 )
+				if ( yy_current_state >= 69 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 60 );
+		while ( yy_current_state != 68 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -820,47 +823,47 @@
 case 8:
 YY_RULE_SETUP
 #line 44 "src/Core/QueryParser/flex.ll"
-{ return token::OR; }
+{ return token::CONTROL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
 #line 45 "src/Core/QueryParser/flex.ll"
-{ return token::AND; }
+{ return token::OR; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
 #line 46 "src/Core/QueryParser/flex.ll"
-{ return token::BOOL_TRUE; }
+{ return token::AND; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
 #line 47 "src/Core/QueryParser/flex.ll"
-{ return token::BOOL_FALSE; }
+{ return token::BOOL_TRUE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
 #line 48 "src/Core/QueryParser/flex.ll"
-{ return token::DEADLOCK; }
+{ return token::BOOL_FALSE; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
 #line 49 "src/Core/QueryParser/flex.ll"
-{ return token::NOT; }
+{ return token::DEADLOCK; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
 #line 50 "src/Core/QueryParser/flex.ll"
-{ yylval->string = new std::string(yytext); return token::LESS; }
+{ return token::NOT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
 #line 51 "src/Core/QueryParser/flex.ll"
-{ yylval->string = new std::string(yytext); return token::LESSEQUAL; }
+{ yylval->string = new std::string(yytext); return token::LESS; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
 #line 52 "src/Core/QueryParser/flex.ll"
-{ yylval->string = new std::string(yytext); return token::EQUAL; }
+{ yylval->string = new std::string(yytext); return token::LESSEQUAL; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
@@ -870,49 +873,59 @@
 case 18:
 YY_RULE_SETUP
 #line 54 "src/Core/QueryParser/flex.ll"
-{ yylval->string = new std::string(yytext); return token::GREATEREQUAL; }
+{ yylval->string = new std::string(yytext); return token::EQUAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 55 "src/Core/QueryParser/flex.ll"
-{ yylval->string = new std::string(yytext); return token::GREATER; }
+{ yylval->string = new std::string(yytext); return token::GREATEREQUAL; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 56 "src/Core/QueryParser/flex.ll"
-{return token::LPARAN;}
+{ yylval->string = new std::string(yytext); return token::GREATER; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 57 "src/Core/QueryParser/flex.ll"
-{return token::RPARAN;}
+{return token::LPARAN;}
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 58 "src/Core/QueryParser/flex.ll"
-{return token::PLUS;}
+{return token::RPARAN;}
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 59 "src/Core/QueryParser/flex.ll"
-{return token::MINUS;}
+{return token::PLUS;}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 60 "src/Core/QueryParser/flex.ll"
+{return token::MINUS;}
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 61 "src/Core/QueryParser/flex.ll"
 {return token::MULTIPLY;}
 	YY_BREAK
-case 25:
+case 26:
 YY_RULE_SETUP
 #line 62 "src/Core/QueryParser/flex.ll"
+{return token::COLON;}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 64 "src/Core/QueryParser/flex.ll"
 { yylval->string = new std::string(yytext); return token::IDENTIFIER; }
 	YY_BREAK
-case 26:
+case 28:
 YY_RULE_SETUP
-#line 64 "src/Core/QueryParser/flex.ll"
+#line 66 "src/Core/QueryParser/flex.ll"
 ECHO;
 	YY_BREAK
-#line 916 "src/Core/QueryParser/Generated/lexer.cpp"
+#line 929 "src/Core/QueryParser/Generated/lexer.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1106,7 +1119,7 @@
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) ((yy_c_buf_p) - b->yy_ch_buf);
@@ -1206,7 +1219,7 @@
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 61 )
+			if ( yy_current_state >= 69 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1234,13 +1247,13 @@
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 61 )
+		if ( yy_current_state >= 69 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 60);
+	yy_is_jam = (yy_current_state == 68);
 
-	return yy_is_jam ? 0 : yy_current_state;
+		return yy_is_jam ? 0 : yy_current_state;
 }
 
 #ifndef YY_NO_INPUT
@@ -1291,7 +1304,7 @@
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( yywrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1429,10 +1442,6 @@
 	yyfree((void *) b  );
 }
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
@@ -1637,8 +1646,8 @@
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
@@ -1646,7 +1655,8 @@
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -1876,7 +1886,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 64 "src/Core/QueryParser/flex.ll"
+#line 66 "src/Core/QueryParser/flex.ll"
 
 
 namespace VerifyTAPN

=== modified file 'src/Core/QueryParser/Generated/location.hh'
--- src/Core/QueryParser/Generated/location.hh	2014-08-07 20:48:41 +0000
+++ src/Core/QueryParser/Generated/location.hh	2018-01-07 20:09:44 +0000
@@ -1,72 +1,83 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Locations for Bison parsers in C++
-   
-      Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
+// A Bison parser, made by GNU Bison 3.0.2.
+
+// Locations for Bison parsers in C++
+
+// Copyright (C) 2002-2013 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
 
 /**
- ** \file location.hh
+ ** \file src/Core/QueryParser/Generated/location.hh
  ** Define the VerifyTAPN::location class.
  */
 
-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+#ifndef YY_YY_SRC_CORE_QUERYPARSER_GENERATED_LOCATION_HH_INCLUDED
+# define YY_YY_SRC_CORE_QUERYPARSER_GENERATED_LOCATION_HH_INCLUDED
 
-# include <iostream>
-# include <string>
 # include "position.hh"
 
-
-/* Line 162 of location.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+#line 5 "src/Core/QueryParser/grammar.yy" // location.cc:291
 namespace VerifyTAPN {
-
-/* Line 162 of location.cc  */
-#line 53 "src/Core/QueryParser/Generated/location.hh"
-
+#line 46 "src/Core/QueryParser/Generated/location.hh" // location.cc:291
   /// Abstract a location.
   class location
   {
   public:
 
-    /// Construct a location.
-    location ()
-      : begin (), end ()
+    /// Construct a location from \a b to \a e.
+    location (const position& b, const position& e)
+      : begin (b)
+      , end (e)
+    {
+    }
+
+    /// Construct a 0-width location in \a p.
+    explicit location (const position& p = position ())
+      : begin (p)
+      , end (p)
+    {
+    }
+
+    /// Construct a 0-width location in \a f, \a l, \a c.
+    explicit location (std::string* f,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : begin (f, l, c)
+      , end (f, l, c)
     {
     }
 
 
     /// Initialization.
-    inline void initialize (std::string* fn)
+    void initialize (std::string* f = YY_NULLPTR,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
     {
-      begin.initialize (fn);
+      begin.initialize (f, l, c);
       end = begin;
     }
 
@@ -74,19 +85,19 @@
      ** \{ */
   public:
     /// Reset initial location to final location.
-    inline void step ()
+    void step ()
     {
       begin = end;
     }
 
     /// Extend the current location to the COUNT next columns.
-    inline void columns (unsigned int count = 1)
+    void columns (int count = 1)
     {
       end += count;
     }
 
     /// Extend the current location to the COUNT next lines.
-    inline void lines (unsigned int count = 1)
+    void lines (int count = 1)
     {
       end.lines (count);
     }
@@ -101,26 +112,35 @@
   };
 
   /// Join two location objects to create a location.
-  inline const location operator+ (const location& begin, const location& end)
+  inline location operator+ (location res, const location& end)
   {
-    location res = begin;
     res.end = end.end;
     return res;
   }
 
-  /// Add two location objects.
-  inline const location operator+ (const location& begin, unsigned int width)
-  {
-    location res = begin;
-    res.columns (width);
-    return res;
-  }
-
-  /// Add and assign a location.
-  inline location& operator+= (location& res, unsigned int width)
-  {
-    res.columns (width);
-    return res;
+  /// Change end position in place.
+  inline location& operator+= (location& res, int width)
+  {
+    res.columns (width);
+    return res;
+  }
+
+  /// Change end position.
+  inline location operator+ (location res, int width)
+  {
+    return res += width;
+  }
+
+  /// Change end position in place.
+  inline location& operator-= (location& res, int width)
+  {
+    return res += -width;
+  }
+
+  /// Change end position.
+  inline location operator- (const location& begin, int width)
+  {
+    return begin + -width;
   }
 
   /// Compare two location objects.
@@ -143,27 +163,25 @@
    **
    ** Avoid duplicate information.
    */
-  inline std::ostream& operator<< (std::ostream& ostr, const location& loc)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
-    position last = loc.end - 1;
-    ostr << loc.begin;
-    if (last.filename
-	&& (!loc.begin.filename
-	    || *loc.begin.filename != *last.filename))
-      ostr << '-' << last;
-    else if (loc.begin.line != last.line)
-      ostr << '-' << last.line  << '.' << last.column;
-    else if (loc.begin.column != last.column)
-      ostr << '-' << last.column;
+    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    ostr << loc.begin// << "(" << loc.end << ") "
+;
+    if (loc.end.filename
+        && (!loc.begin.filename
+            || *loc.begin.filename != *loc.end.filename))
+      ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col;
+    else if (loc.begin.line < loc.end.line)
+      ostr << '-' << loc.end.line << '.' << end_col;
+    else if (loc.begin.column < end_col)
+      ostr << '-' << end_col;
     return ostr;
   }
 
-
-/* Line 271 of location.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+#line 5 "src/Core/QueryParser/grammar.yy" // location.cc:291
 } // VerifyTAPN
-
-/* Line 271 of location.cc  */
-#line 168 "src/Core/QueryParser/Generated/location.hh"
-
-#endif // not BISON_LOCATION_HH
+#line 187 "src/Core/QueryParser/Generated/location.hh" // location.cc:291
+#endif // !YY_YY_SRC_CORE_QUERYPARSER_GENERATED_LOCATION_HH_INCLUDED

=== modified file 'src/Core/QueryParser/Generated/parser.cpp'
--- src/Core/QueryParser/Generated/parser.cpp	2014-08-07 20:48:41 +0000
+++ src/Core/QueryParser/Generated/parser.cpp	2018-01-07 20:09:44 +0000
@@ -1,68 +1,65 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton implementation for Bison LALR(1) parsers in C++
-   
-      Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-/* First part of user declarations.  */
-
-
-/* Line 311 of lalr1.cc  */
-#line 41 "src/Core/QueryParser/Generated/parser.cpp"
-
+// A Bison parser, made by GNU Bison 3.0.2.
+
+// Skeleton implementation for Bison LALR(1) parsers in C++
+
+// Copyright (C) 2002-2013 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+
+// First part of user declarations.
+
+#line 37 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:399
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 #include "parser.hpp"
 
-/* User implementation prologue.  */
-
-
-/* Line 317 of lalr1.cc  */
-#line 50 "src/Core/QueryParser/Generated/parser.cpp"
-/* Unqualified %code blocks.  */
-
-/* Line 318 of lalr1.cc  */
-#line 38 "src/Core/QueryParser/grammar.yy"
+// User implementation prologue.
+
+#line 51 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:407
+// Unqualified %code blocks.
+#line 38 "src/Core/QueryParser/grammar.yy" // lalr1.cc:408
 
 	#include "../TAPNQueryParser.hpp"
 
-
-
-/* Line 318 of lalr1.cc  */
-#line 61 "src/Core/QueryParser/Generated/parser.cpp"
+#line 57 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:408
+
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
-#   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
+#   include <libintl.h> // FIXME: INFRINGES ON USER NAME SPACE.
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  endif
 # endif
@@ -71,62 +68,78 @@
 # endif
 #endif
 
-/* Suppress unused-variable warnings by "using" E.  */
-#define YYUSE(e) ((void) (e))
-
-/* Enable debugging if requested.  */
+#define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
+
+// Suppress unused-variable warnings by "using" E.
+#define YYUSE(E) ((void) (E))
+
+// Enable debugging if requested.
 #if YYDEBUG
 
-/* A pseudo ostream that takes yydebug_ into account.  */
+// A pseudo ostream that takes yydebug_ into account.
 # define YYCDEBUG if (yydebug_) (*yycdebug_)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)	\
-do {							\
-  if (yydebug_)						\
-    {							\
-      *yycdebug_ << Title << ' ';			\
-      yy_symbol_print_ ((Type), (Value), (Location));	\
-      *yycdebug_ << std::endl;				\
-    }							\
-} while (false)
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug_)				\
-    yy_reduce_print_ (Rule);		\
-} while (false)
-
-# define YY_STACK_PRINT()		\
-do {					\
-  if (yydebug_)				\
-    yystack_print_ ();			\
-} while (false)
-
-#else /* !YYDEBUG */
+# define YY_SYMBOL_PRINT(Title, Symbol)         \
+  do {                                          \
+    if (yydebug_)                               \
+    {                                           \
+      *yycdebug_ << Title << ' ';               \
+      yy_print_ (*yycdebug_, Symbol);           \
+      *yycdebug_ << std::endl;                  \
+    }                                           \
+  } while (false)
+
+# define YY_REDUCE_PRINT(Rule)          \
+  do {                                  \
+    if (yydebug_)                       \
+      yy_reduce_print_ (Rule);          \
+  } while (false)
+
+# define YY_STACK_PRINT()               \
+  do {                                  \
+    if (yydebug_)                       \
+      yystack_print_ ();                \
+  } while (false)
+
+#else // !YYDEBUG
 
 # define YYCDEBUG if (false) std::cerr
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_REDUCE_PRINT(Rule)
-# define YY_STACK_PRINT()
-
-#endif /* !YYDEBUG */
-
-#define yyerrok		(yyerrstatus_ = 0)
-#define yyclearin	(yychar = yyempty_)
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
+# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE(Symbol)
+# define YY_REDUCE_PRINT(Rule)           static_cast<void>(0)
+# define YY_STACK_PRINT()                static_cast<void>(0)
+
+#endif // !YYDEBUG
+
+#define yyerrok         (yyerrstatus_ = 0)
+#define yyclearin       (yyempty = true)
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 
-
-/* Line 380 of lalr1.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+#line 5 "src/Core/QueryParser/grammar.yy" // lalr1.cc:474
 namespace VerifyTAPN {
-
-/* Line 380 of lalr1.cc  */
-#line 129 "src/Core/QueryParser/Generated/parser.cpp"
-#if YYERROR_VERBOSE
+#line 143 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:474
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -151,7 +164,7 @@
             case '\\':
               if (*++yyp != '\\')
                 goto do_not_strip_quotes;
-              /* Fall through.  */
+              // Fall through.
             default:
               yyr += *yyp;
               break;
@@ -165,7 +178,6 @@
     return yystr;
   }
 
-#endif
 
   /// Build a parser object.
   Parser::Parser (VerifyTAPN::TAPNQueryParser& driver_yyarg)
@@ -175,230 +187,344 @@
       yycdebug_ (&std::cerr),
 #endif
       driver (driver_yyarg)
-  {
-  }
+  {}
 
   Parser::~Parser ()
-  {
+  {}
+
+
+  /*---------------.
+  | Symbol types.  |
+  `---------------*/
+
+  inline
+  Parser::syntax_error::syntax_error (const location_type& l, const std::string& m)
+    : std::runtime_error (m)
+    , location (l)
+  {}
+
+  // basic_symbol.
+  template <typename Base>
+  inline
+  Parser::basic_symbol<Base>::basic_symbol ()
+    : value ()
+  {}
+
+  template <typename Base>
+  inline
+  Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
+    : Base (other)
+    , value ()
+    , location (other.location)
+  {
+    value = other.value;
+  }
+
+
+  template <typename Base>
+  inline
+  Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
+    : Base (t)
+    , value (v)
+    , location (l)
+  {}
+
+
+  /// Constructor for valueless symbols.
+  template <typename Base>
+  inline
+  Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const location_type& l)
+    : Base (t)
+    , value ()
+    , location (l)
+  {}
+
+  template <typename Base>
+  inline
+  Parser::basic_symbol<Base>::~basic_symbol ()
+  {
+  }
+
+  template <typename Base>
+  inline
+  void
+  Parser::basic_symbol<Base>::move (basic_symbol& s)
+  {
+    super_type::move(s);
+    value = s.value;
+    location = s.location;
+  }
+
+  // by_type.
+  inline
+  Parser::by_type::by_type ()
+     : type (empty)
+  {}
+
+  inline
+  Parser::by_type::by_type (const by_type& other)
+    : type (other.type)
+  {}
+
+  inline
+  Parser::by_type::by_type (token_type t)
+    : type (yytranslate_ (t))
+  {}
+
+  inline
+  void
+  Parser::by_type::move (by_type& that)
+  {
+    type = that.type;
+    that.type = empty;
+  }
+
+  inline
+  int
+  Parser::by_type::type_get () const
+  {
+    return type;
+  }
+
+
+  // by_state.
+  inline
+  Parser::by_state::by_state ()
+    : state (empty)
+  {}
+
+  inline
+  Parser::by_state::by_state (const by_state& other)
+    : state (other.state)
+  {}
+
+  inline
+  void
+  Parser::by_state::move (by_state& that)
+  {
+    state = that.state;
+    that.state = empty;
+  }
+
+  inline
+  Parser::by_state::by_state (state_type s)
+    : state (s)
+  {}
+
+  inline
+  Parser::symbol_number_type
+  Parser::by_state::type_get () const
+  {
+    return state == empty ? 0 : yystos_[state];
+  }
+
+  inline
+  Parser::stack_symbol_type::stack_symbol_type ()
+  {}
+
+
+  inline
+  Parser::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
+    : super_type (s, that.location)
+  {
+    value = that.value;
+    // that is emptied.
+    that.type = empty;
+  }
+
+  inline
+  Parser::stack_symbol_type&
+  Parser::stack_symbol_type::operator= (const stack_symbol_type& that)
+  {
+    state = that.state;
+    value = that.value;
+    location = that.location;
+    return *this;
+  }
+
+
+  template <typename Base>
+  inline
+  void
+  Parser::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
+  {
+    if (yymsg)
+      YY_SYMBOL_PRINT (yymsg, yysym);
+
+    // User destructor.
+    switch (yysym.type_get ())
+    {
+            case 3: // IDENTIFIER
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 362 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 4: // LESS
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 369 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 5: // LESSEQUAL
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 376 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 6: // EQUAL
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 383 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 7: // GREATEREQUAL
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 390 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 8: // GREATER
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 397 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 28: // query
+
+#line 58 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.query); }
+#line 404 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 29: // expression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 411 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 30: // arithmeticExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.arexpr); }
+#line 418 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 31: // multiplyExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.arexpr); }
+#line 425 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 32: // arithmeticParantheses
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.arexpr); }
+#line 432 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 33: // parExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 439 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 34: // notExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 446 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 35: // orExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 453 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 36: // andExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 460 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 37: // boolExpression
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 467 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 38: // atomicProposition
+
+#line 57 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.expr); }
+#line 474 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+      case 39: // compareOp
+
+#line 56 "src/Core/QueryParser/grammar.yy" // lalr1.cc:599
+        { delete (yysym.value.string); }
+#line 481 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:599
+        break;
+
+
+      default:
+        break;
+    }
   }
 
 #if YYDEBUG
-  /*--------------------------------.
-  | Print this symbol on YYOUTPUT.  |
-  `--------------------------------*/
-
-  inline void
-  Parser::yy_symbol_value_print_ (int yytype,
-			   const semantic_type* yyvaluep, const location_type* yylocationp)
-  {
-    YYUSE (yylocationp);
-    YYUSE (yyvaluep);
-    switch (yytype)
-      {
-         default:
-	  break;
-      }
-  }
-
-
+  template <typename Base>
   void
-  Parser::yy_symbol_print_ (int yytype,
-			   const semantic_type* yyvaluep, const location_type* yylocationp)
+  Parser::yy_print_ (std::ostream& yyo,
+                                     const basic_symbol<Base>& yysym) const
   {
-    *yycdebug_ << (yytype < yyntokens_ ? "token" : "nterm")
-	       << ' ' << yytname_[yytype] << " ("
-	       << *yylocationp << ": ";
-    yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
-    *yycdebug_ << ')';
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
+    symbol_number_type yytype = yysym.type_get ();
+    yyo << (yytype < yyntokens_ ? "token" : "nterm")
+        << ' ' << yytname_[yytype] << " ("
+        << yysym.location << ": ";
+    YYUSE (yytype);
+    yyo << ')';
   }
 #endif
 
-  void
-  Parser::yydestruct_ (const char* yymsg,
-			   int yytype, semantic_type* yyvaluep, location_type* yylocationp)
-  {
-    YYUSE (yylocationp);
-    YYUSE (yymsg);
-    YYUSE (yyvaluep);
-
-    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-    switch (yytype)
-      {
-        case 3: /* "IDENTIFIER" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 236 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 4: /* "LESS" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 245 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 5: /* "LESSEQUAL" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 254 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 6: /* "EQUAL" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 263 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 7: /* "GREATEREQUAL" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 272 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 8: /* "GREATER" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 281 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 26: /* "query" */
-
-/* Line 480 of lalr1.cc  */
-#line 58 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->query); };
-
-/* Line 480 of lalr1.cc  */
-#line 290 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 27: /* "expression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 299 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 28: /* "arithmeticExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->arexpr); };
-
-/* Line 480 of lalr1.cc  */
-#line 308 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 29: /* "multiplyExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->arexpr); };
-
-/* Line 480 of lalr1.cc  */
-#line 317 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 30: /* "arithmeticParantheses" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->arexpr); };
-
-/* Line 480 of lalr1.cc  */
-#line 326 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 31: /* "parExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 335 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 32: /* "notExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 344 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 33: /* "orExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 353 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 34: /* "andExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 362 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 35: /* "boolExpression" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 371 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 36: /* "atomicProposition" */
-
-/* Line 480 of lalr1.cc  */
-#line 57 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->expr); };
-
-/* Line 480 of lalr1.cc  */
-#line 380 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-      case 37: /* "compareOp" */
-
-/* Line 480 of lalr1.cc  */
-#line 56 "src/Core/QueryParser/grammar.yy"
-	{ delete (yyvaluep->string); };
-
-/* Line 480 of lalr1.cc  */
-#line 389 "src/Core/QueryParser/Generated/parser.cpp"
-	break;
-
-	default:
-	  break;
-      }
-  }
-
+  inline
+  void
+  Parser::yypush_ (const char* m, state_type s, symbol_type& sym)
+  {
+    stack_symbol_type t (s, sym);
+    yypush_ (m, t);
+  }
+
+  inline
+  void
+  Parser::yypush_ (const char* m, stack_symbol_type& s)
+  {
+    if (m)
+      YY_SYMBOL_PRINT (m, s);
+    yystack_.push (s);
+  }
+
+  inline
   void
   Parser::yypop_ (unsigned int n)
   {
-    yystate_stack_.pop (n);
-    yysemantic_stack_.pop (n);
-    yylocation_stack_.pop (n);
+    yystack_.pop (n);
   }
 
 #if YYDEBUG
@@ -426,140 +552,144 @@
   {
     yydebug_ = l;
   }
-#endif
+#endif // YYDEBUG
+
+  inline Parser::state_type
+  Parser::yy_lr_goto_state_ (state_type yystate, int yysym)
+  {
+    int yyr = yypgoto_[yysym - yyntokens_] + yystate;
+    if (0 <= yyr && yyr <= yylast_ && yycheck_[yyr] == yystate)
+      return yytable_[yyr];
+    else
+      return yydefgoto_[yysym - yyntokens_];
+  }
+
+  inline bool
+  Parser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  Parser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
 
   int
   Parser::parse ()
   {
-    /// Lookahead and lookahead in internal form.
-    int yychar = yyempty_;
-    int yytoken = 0;
+    /// Whether yyla contains a lookahead.
+    bool yyempty = true;
 
-    /* State.  */
+    // State.
     int yyn;
+    /// Length of the RHS of the rule being reduced.
     int yylen = 0;
-    int yystate = 0;
 
-    /* Error handling.  */
+    // Error handling.
     int yynerrs_ = 0;
     int yyerrstatus_ = 0;
 
-    /// Semantic value of the lookahead.
-    semantic_type yylval;
-    /// Location of the lookahead.
-    location_type yylloc;
+    /// The lookahead symbol.
+    symbol_type yyla;
+
     /// The locations where the error started and ended.
-    location_type yyerror_range[2];
-
-    /// $$.
-    semantic_type yyval;
-    /// @$.
-    location_type yyloc;
-
+    stack_symbol_type yyerror_range[3];
+
+    /// The return value of parse ().
     int yyresult;
 
+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
+    try
+      {
     YYCDEBUG << "Starting parse" << std::endl;
 
 
-    /* User initialization code.  */
-    
-/* Line 559 of lalr1.cc  */
-#line 21 "src/Core/QueryParser/grammar.yy"
+    // User initialization code.
+    #line 21 "src/Core/QueryParser/grammar.yy" // lalr1.cc:725
 {
   // Initialize the initial location.
-  yylloc.begin.filename = yylloc.end.filename = &driver.file;
+  yyla.location.begin.filename = yyla.location.end.filename = &driver.file;
 }
 
-/* Line 559 of lalr1.cc  */
-#line 475 "src/Core/QueryParser/Generated/parser.cpp"
+#line 618 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:725
 
-    /* Initialize the stacks.  The initial state will be pushed in
+    /* Initialize the stack.  The initial state will be set in
        yynewstate, since the latter expects the semantical and the
        location values to have been already stored, initialize these
        stacks with a primary value.  */
-    yystate_stack_ = state_stack_type (0);
-    yysemantic_stack_ = semantic_stack_type (0);
-    yylocation_stack_ = location_stack_type (0);
-    yysemantic_stack_.push (yylval);
-    yylocation_stack_.push (yylloc);
+    yystack_.clear ();
+    yypush_ (YY_NULLPTR, 0, yyla);
 
-    /* New state.  */
+    // A new symbol was pushed on the stack.
   yynewstate:
-    yystate_stack_.push (yystate);
-    YYCDEBUG << "Entering state " << yystate << std::endl;
+    YYCDEBUG << "Entering state " << yystack_[0].state << std::endl;
 
-    /* Accept?  */
-    if (yystate == yyfinal_)
+    // Accept?
+    if (yystack_[0].state == yyfinal_)
       goto yyacceptlab;
 
     goto yybackup;
 
-    /* Backup.  */
+    // Backup.
   yybackup:
 
-    /* Try to take a decision without lookahead.  */
-    yyn = yypact_[yystate];
-    if (yyn == yypact_ninf_)
-      goto yydefault;
-
-    /* Read a lookahead token.  */
-    if (yychar == yyempty_)
-      {
-	YYCDEBUG << "Reading a token: ";
-	yychar = yylex (&yylval, &yylloc, driver);
-      }
-
-
-    /* Convert token to internal form.  */
-    if (yychar <= yyeof_)
-      {
-	yychar = yytoken = yyeof_;
-	YYCDEBUG << "Now at end of input." << std::endl;
-      }
-    else
-      {
-	yytoken = yytranslate_ (yychar);
-	YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-      }
-
-    /* If the proper action on seeing token YYTOKEN is to reduce or to
-       detect an error, take that action.  */
-    yyn += yytoken;
-    if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken)
-      goto yydefault;
-
-    /* Reduce or error.  */
+    // Try to take a decision without lookahead.
+    yyn = yypact_[yystack_[0].state];
+    if (yy_pact_value_is_default_ (yyn))
+      goto yydefault;
+
+    // Read a lookahead token.
+    if (yyempty)
+      {
+        YYCDEBUG << "Reading a token: ";
+        try
+          {
+            yyla.type = yytranslate_ (yylex (&yyla.value, &yyla.location, driver));
+          }
+        catch (const syntax_error& yyexc)
+          {
+            error (yyexc);
+            goto yyerrlab1;
+          }
+        yyempty = false;
+      }
+    YY_SYMBOL_PRINT ("Next token is", yyla);
+
+    /* If the proper action on seeing token YYLA.TYPE is to reduce or
+       to detect an error, take that action.  */
+    yyn += yyla.type_get ();
+    if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.type_get ())
+      goto yydefault;
+
+    // Reduce or error.
     yyn = yytable_[yyn];
     if (yyn <= 0)
       {
-	if (yyn == 0 || yyn == yytable_ninf_)
-	goto yyerrlab;
-	yyn = -yyn;
-	goto yyreduce;
+        if (yy_table_value_is_error_ (yyn))
+          goto yyerrlab;
+        yyn = -yyn;
+        goto yyreduce;
       }
 
-    /* Shift the lookahead token.  */
-    YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-    /* Discard the token being shifted.  */
-    yychar = yyempty_;
-
-    yysemantic_stack_.push (yylval);
-    yylocation_stack_.push (yylloc);
-
-    /* Count tokens shifted since error; after three, turn off error
-       status.  */
+    // Discard the token being shifted.
+    yyempty = true;
+
+    // Count tokens shifted since error; after three, turn off error status.
     if (yyerrstatus_)
       --yyerrstatus_;
 
-    yystate = yyn;
+    // Shift the lookahead token.
+    yypush_ ("Shifting", yyn, yyla);
     goto yynewstate;
 
   /*-----------------------------------------------------------.
   | yydefault -- do the default action for the current state.  |
   `-----------------------------------------------------------*/
   yydefault:
-    yyn = yydefact_[yystate];
+    yyn = yydefact_[yystack_[0].state];
     if (yyn == 0)
       goto yyerrlab;
     goto yyreduce;
@@ -569,276 +699,262 @@
   `-----------------------------*/
   yyreduce:
     yylen = yyr2_[yyn];
-    /* If YYLEN is nonzero, implement the default value of the action:
-       `$$ = $1'.  Otherwise, use the top of the stack.
-
-       Otherwise, the following line sets YYVAL to garbage.
-       This behavior is undocumented and Bison
-       users should not rely upon it.  */
-    if (yylen)
-      yyval = yysemantic_stack_[yylen - 1];
-    else
-      yyval = yysemantic_stack_[0];
-
     {
-      slice<location_type, location_stack_type> slice (yylocation_stack_, yylen);
-      YYLLOC_DEFAULT (yyloc, slice, yylen);
-    }
-    YY_REDUCE_PRINT (yyn);
-    switch (yyn)
+      stack_symbol_type yylhs;
+      yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);
+      /* If YYLEN is nonzero, implement the default value of the
+         action: '$$ = $1'.  Otherwise, use the top of the stack.
+
+         Otherwise, the following line sets YYLHS.VALUE to garbage.
+         This behavior is undocumented and Bison users should not rely
+         upon it.  */
+      if (yylen)
+        yylhs.value = yystack_[yylen - 1].value;
+      else
+        yylhs.value = yystack_[0].value;
+
+      // Compute the default @$.
       {
-	  case 2:
+        slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
+        YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+      }
 
-/* Line 678 of lalr1.cc  */
-#line 62 "src/Core/QueryParser/grammar.yy"
-    { (yyval.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::EF, (yysemantic_stack_[(2) - (2)].expr)); driver.setAST((yyval.query)); }
+      // Perform the reduction.
+      YY_REDUCE_PRINT (yyn);
+      try
+        {
+          switch (yyn)
+            {
+  case 2:
+#line 62 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::EF, (yystack_[0].value.expr)); driver.setAST((yylhs.value.query)); }
+#line 732 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 3:
-
-/* Line 678 of lalr1.cc  */
-#line 63 "src/Core/QueryParser/grammar.yy"
-    { (yyval.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::AG, (yysemantic_stack_[(2) - (2)].expr)); driver.setAST((yyval.query)); }
+#line 63 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::AG, (yystack_[0].value.expr)); driver.setAST((yylhs.value.query)); }
+#line 738 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 4:
-
-/* Line 678 of lalr1.cc  */
-#line 64 "src/Core/QueryParser/grammar.yy"
-    { (yyval.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::EG, (yysemantic_stack_[(2) - (2)].expr)); driver.setAST((yyval.query)); }
+#line 64 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::EG, (yystack_[0].value.expr)); driver.setAST((yylhs.value.query)); }
+#line 744 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 5:
-
-/* Line 678 of lalr1.cc  */
-#line 65 "src/Core/QueryParser/grammar.yy"
-    { (yyval.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::AF, (yysemantic_stack_[(2) - (2)].expr)); driver.setAST((yyval.query)); }
+#line 65 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::AF, (yystack_[0].value.expr)); driver.setAST((yylhs.value.query)); }
+#line 750 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 6:
-
-/* Line 678 of lalr1.cc  */
-#line 68 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr); }
+#line 66 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    {(yylhs.value.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::CF, (yystack_[0].value.expr)); driver.setAST((yylhs.value.query));}
+#line 756 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 7:
-
-/* Line 678 of lalr1.cc  */
-#line 69 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr); }
+#line 67 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    {(yylhs.value.query) = new VerifyTAPN::AST::Query(VerifyTAPN::AST::CG, (yystack_[0].value.expr)); driver.setAST((yylhs.value.query));}
+#line 762 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 8:
-
-/* Line 678 of lalr1.cc  */
-#line 70 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr); }
+#line 70 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[0].value.expr); }
+#line 768 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 9:
-
-/* Line 678 of lalr1.cc  */
-#line 71 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr); }
+#line 71 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[0].value.expr); }
+#line 774 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 10:
-
-/* Line 678 of lalr1.cc  */
-#line 72 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr); }
+#line 72 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[0].value.expr); }
+#line 780 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 11:
-
-/* Line 678 of lalr1.cc  */
-#line 73 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr); }
+#line 73 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[0].value.expr); }
+#line 786 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 12:
-
-/* Line 678 of lalr1.cc  */
-#line 79 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = new VerifyTAPN::AST::PlusExpression((yysemantic_stack_[(3) - (1)].arexpr), (yysemantic_stack_[(3) - (3)].arexpr)); }
+#line 74 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[0].value.expr); }
+#line 792 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 13:
-
-/* Line 678 of lalr1.cc  */
-#line 80 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = new VerifyTAPN::AST::SubtractExpression((yysemantic_stack_[(3) - (1)].arexpr), (yysemantic_stack_[(3) - (3)].arexpr)); }
+#line 75 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[0].value.expr); }
+#line 798 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 14:
-
-/* Line 678 of lalr1.cc  */
-#line 81 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = new VerifyTAPN::AST::MinusExpression((yysemantic_stack_[(2) - (2)].arexpr)); }
+#line 81 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = new VerifyTAPN::AST::PlusExpression((yystack_[2].value.arexpr), (yystack_[0].value.arexpr)); }
+#line 804 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 15:
-
-/* Line 678 of lalr1.cc  */
-#line 82 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = (yysemantic_stack_[(1) - (1)].arexpr); }
+#line 82 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = new VerifyTAPN::AST::SubtractExpression((yystack_[2].value.arexpr), (yystack_[0].value.arexpr)); }
+#line 810 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 16:
-
-/* Line 678 of lalr1.cc  */
-#line 85 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = new VerifyTAPN::AST::MultiplyExpression((yysemantic_stack_[(3) - (1)].arexpr), (yysemantic_stack_[(3) - (3)].arexpr)); }
+#line 83 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = new VerifyTAPN::AST::MinusExpression((yystack_[0].value.arexpr)); }
+#line 816 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 17:
-
-/* Line 678 of lalr1.cc  */
-#line 86 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = (yysemantic_stack_[(1) - (1)].arexpr); }
+#line 84 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = (yystack_[0].value.arexpr); }
+#line 822 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 18:
-
-/* Line 678 of lalr1.cc  */
-#line 89 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = (yysemantic_stack_[(3) - (2)].arexpr); }
+#line 87 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = new VerifyTAPN::AST::MultiplyExpression((yystack_[2].value.arexpr), (yystack_[0].value.arexpr)); }
+#line 828 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 19:
-
-/* Line 678 of lalr1.cc  */
-#line 90 "src/Core/QueryParser/grammar.yy"
-    { (yyval.arexpr) = new VerifyTAPN::AST::NumberExpression((yysemantic_stack_[(1) - (1)].number));}
+#line 88 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = (yystack_[0].value.arexpr); }
+#line 834 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 20:
-
-/* Line 678 of lalr1.cc  */
-#line 91 "src/Core/QueryParser/grammar.yy"
+#line 91 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = (yystack_[1].value.arexpr); }
+#line 840 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
+    break;
+
+  case 21:
+#line 92 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.arexpr) = new VerifyTAPN::AST::NumberExpression((yystack_[0].value.number));}
+#line 846 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
+    break;
+
+  case 22:
+#line 93 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
     { 
-                                                                    int placeIndex = driver.getTAPN().getPlaceIndex(*(yysemantic_stack_[(1) - (1)].string));
-                                                                    delete (yysemantic_stack_[(1) - (1)].string);
-                                                                    if(placeIndex == -1) error((yylocation_stack_[(1) - (1)]), "unknown place"); 
-                                                                    (yyval.arexpr) = new VerifyTAPN::AST::IdentifierExpression(placeIndex); 
+                                                                    int placeIndex = driver.getTAPN().getPlaceIndex(*(yystack_[0].value.string));
+                                                                    delete (yystack_[0].value.string);
+                                                                    if(placeIndex == -1) error(yystack_[0].location, "unknown place"); 
+                                                                    (yylhs.value.arexpr) = new VerifyTAPN::AST::IdentifierExpression(placeIndex); 
                                                                  }
-    break;
-
-  case 21:
-
-/* Line 678 of lalr1.cc  */
-#line 99 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr); }
-    break;
-
-  case 22:
-
-/* Line 678 of lalr1.cc  */
-#line 100 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::NotExpression((yysemantic_stack_[(2) - (2)].expr)); }
+#line 857 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 23:
-
-/* Line 678 of lalr1.cc  */
-#line 101 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::OrExpression((yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)); }
+#line 101 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = (yystack_[1].value.expr); }
+#line 863 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 24:
-
-/* Line 678 of lalr1.cc  */
-#line 102 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::AndExpression((yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)); }
+#line 102 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::NotExpression((yystack_[0].value.expr)); }
+#line 869 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 25:
-
-/* Line 678 of lalr1.cc  */
-#line 103 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::BoolExpression(true); }
+#line 103 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::OrExpression((yystack_[2].value.expr), (yystack_[0].value.expr)); }
+#line 875 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 26:
-
-/* Line 678 of lalr1.cc  */
-#line 104 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::BoolExpression(false); }
+#line 104 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::AndExpression((yystack_[2].value.expr), (yystack_[0].value.expr)); }
+#line 881 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 27:
-
-/* Line 678 of lalr1.cc  */
-#line 106 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::AtomicProposition((yysemantic_stack_[(3) - (1)].arexpr), (yysemantic_stack_[(3) - (2)].string), (yysemantic_stack_[(3) - (3)].arexpr)); }
+#line 105 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::BoolExpression(true); }
+#line 887 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
     break;
 
   case 28:
-
-/* Line 678 of lalr1.cc  */
-#line 107 "src/Core/QueryParser/grammar.yy"
-    { (yyval.expr) = new VerifyTAPN::AST::DeadlockExpression(); }
-    break;
-
-
-
-/* Line 678 of lalr1.cc  */
-#line 788 "src/Core/QueryParser/Generated/parser.cpp"
-	default:
-          break;
-      }
-    YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
-
-    yypop_ (yylen);
-    yylen = 0;
-    YY_STACK_PRINT ();
-
-    yysemantic_stack_.push (yyval);
-    yylocation_stack_.push (yyloc);
-
-    /* Shift the result of the reduction.  */
-    yyn = yyr1_[yyn];
-    yystate = yypgoto_[yyn - yyntokens_] + yystate_stack_[0];
-    if (0 <= yystate && yystate <= yylast_
-	&& yycheck_[yystate] == yystate_stack_[0])
-      yystate = yytable_[yystate];
-    else
-      yystate = yydefgoto_[yyn - yyntokens_];
+#line 106 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::BoolExpression(false); }
+#line 893 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
+    break;
+
+  case 29:
+#line 108 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::AtomicProposition((yystack_[2].value.arexpr), (yystack_[1].value.string), (yystack_[0].value.arexpr)); }
+#line 899 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
+    break;
+
+  case 30:
+#line 109 "src/Core/QueryParser/grammar.yy" // lalr1.cc:847
+    { (yylhs.value.expr) = new VerifyTAPN::AST::DeadlockExpression(); }
+#line 905 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
+    break;
+
+
+#line 909 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:847
+            default:
+              break;
+            }
+        }
+      catch (const syntax_error& yyexc)
+        {
+          error (yyexc);
+          YYERROR;
+        }
+      YY_SYMBOL_PRINT ("-> $$ =", yylhs);
+      yypop_ (yylen);
+      yylen = 0;
+      YY_STACK_PRINT ();
+
+      // Shift the result of the reduction.
+      yypush_ (YY_NULLPTR, yylhs);
+    }
     goto yynewstate;
 
-  /*------------------------------------.
-  | yyerrlab -- here on detecting error |
-  `------------------------------------*/
+  /*--------------------------------------.
+  | yyerrlab -- here on detecting error.  |
+  `--------------------------------------*/
   yyerrlab:
-    /* If not already recovering from an error, report this error.  */
+    // If not already recovering from an error, report this error.
     if (!yyerrstatus_)
       {
-	++yynerrs_;
-	error (yylloc, yysyntax_error_ (yystate, yytoken));
+        ++yynerrs_;
+        error (yyla.location, yysyntax_error_ (yystack_[0].state,
+                                           yyempty ? yyempty_ : yyla.type_get ()));
       }
 
-    yyerror_range[0] = yylloc;
+
+    yyerror_range[1].location = yyla.location;
     if (yyerrstatus_ == 3)
       {
-	/* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+        /* If just tried and failed to reuse lookahead token after an
+           error, discard it.  */
 
-	if (yychar <= yyeof_)
-	  {
-	  /* Return failure if at end of input.  */
-	  if (yychar == yyeof_)
-	    YYABORT;
-	  }
-	else
-	  {
-	    yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);
-	    yychar = yyempty_;
-	  }
+        // Return failure if at end of input.
+        if (yyla.type_get () == yyeof_)
+          YYABORT;
+        else if (!yyempty)
+          {
+            yy_destroy_ ("Error: discarding", yyla);
+            yyempty = true;
+          }
       }
 
-    /* Else will try to reuse lookahead token after shifting the error
-       token.  */
+    // Else will try to reuse lookahead token after shifting the error token.
     goto yyerrlab1;
 
 
@@ -852,311 +968,318 @@
        code.  */
     if (false)
       goto yyerrorlab;
-
-    yyerror_range[0] = yylocation_stack_[yylen - 1];
-    /* Do not reclaim the symbols of the rule which action triggered
+    yyerror_range[1].location = yystack_[yylen - 1].location;
+    /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
     yylen = 0;
-    yystate = yystate_stack_[0];
     goto yyerrlab1;
 
   /*-------------------------------------------------------------.
   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
   `-------------------------------------------------------------*/
   yyerrlab1:
-    yyerrstatus_ = 3;	/* Each real token shifted decrements this.  */
-
-    for (;;)
-      {
-	yyn = yypact_[yystate];
-	if (yyn != yypact_ninf_)
-	{
-	  yyn += yyterror_;
-	  if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
-	    {
-	      yyn = yytable_[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
-
-	/* Pop the current state because it cannot handle the error token.  */
-	if (yystate_stack_.height () == 1)
-	YYABORT;
-
-	yyerror_range[0] = yylocation_stack_[0];
-	yydestruct_ ("Error: popping",
-		     yystos_[yystate],
-		     &yysemantic_stack_[0], &yylocation_stack_[0]);
-	yypop_ ();
-	yystate = yystate_stack_[0];
-	YY_STACK_PRINT ();
-      }
-
-    yyerror_range[1] = yylloc;
-    // Using YYLLOC is tempting, but would change the location of
-    // the lookahead.  YYLOC is available though.
-    YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
-    yysemantic_stack_.push (yylval);
-    yylocation_stack_.push (yyloc);
-
-    /* Shift the error token.  */
-    YY_SYMBOL_PRINT ("Shifting", yystos_[yyn],
-		     &yysemantic_stack_[0], &yylocation_stack_[0]);
-
-    yystate = yyn;
+    yyerrstatus_ = 3;   // Each real token shifted decrements this.
+    {
+      stack_symbol_type error_token;
+      for (;;)
+        {
+          yyn = yypact_[yystack_[0].state];
+          if (!yy_pact_value_is_default_ (yyn))
+            {
+              yyn += yyterror_;
+              if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
+                {
+                  yyn = yytable_[yyn];
+                  if (0 < yyn)
+                    break;
+                }
+            }
+
+          // Pop the current state because it cannot handle the error token.
+          if (yystack_.size () == 1)
+            YYABORT;
+
+          yyerror_range[1].location = yystack_[0].location;
+          yy_destroy_ ("Error: popping", yystack_[0]);
+          yypop_ ();
+          YY_STACK_PRINT ();
+        }
+
+      yyerror_range[2].location = yyla.location;
+      YYLLOC_DEFAULT (error_token.location, yyerror_range, 2);
+
+      // Shift the error token.
+      error_token.state = yyn;
+      yypush_ ("Shifting", error_token);
+    }
     goto yynewstate;
 
-    /* Accept.  */
+    // Accept.
   yyacceptlab:
     yyresult = 0;
     goto yyreturn;
 
-    /* Abort.  */
+    // Abort.
   yyabortlab:
     yyresult = 1;
     goto yyreturn;
 
   yyreturn:
-    if (yychar != yyempty_)
-      yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc);
+    if (!yyempty)
+      yy_destroy_ ("Cleanup: discarding lookahead", yyla);
 
-    /* Do not reclaim the symbols of the rule which action triggered
+    /* Do not reclaim the symbols of the rule whose action triggered
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
-    while (yystate_stack_.height () != 1)
+    while (1 < yystack_.size ())
       {
-	yydestruct_ ("Cleanup: popping",
-		   yystos_[yystate_stack_[0]],
-		   &yysemantic_stack_[0],
-		   &yylocation_stack_[0]);
-	yypop_ ();
+        yy_destroy_ ("Cleanup: popping", yystack_[0]);
+        yypop_ ();
       }
 
     return yyresult;
   }
+    catch (...)
+      {
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
+        // Do not try to display the values of the reclaimed symbols,
+        // as their printer might throw an exception.
+        if (!yyempty)
+          yy_destroy_ (YY_NULLPTR, yyla);
+
+        while (1 < yystack_.size ())
+          {
+            yy_destroy_ (YY_NULLPTR, yystack_[0]);
+            yypop_ ();
+          }
+        throw;
+      }
+  }
+
+  void
+  Parser::error (const syntax_error& yyexc)
+  {
+    error (yyexc.location, yyexc.what());
+  }
 
   // Generate an error message.
   std::string
-  Parser::yysyntax_error_ (int yystate, int tok)
+  Parser::yysyntax_error_ (state_type yystate, symbol_number_type yytoken) const
   {
-    std::string res;
-    YYUSE (yystate);
-#if YYERROR_VERBOSE
-    int yyn = yypact_[yystate];
-    if (yypact_ninf_ < yyn && yyn <= yylast_)
-      {
-	/* Start YYX at -YYN if negative to avoid negative indexes in
-	   YYCHECK.  */
-	int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	/* Stay within bounds of both yycheck and yytname.  */
-	int yychecklim = yylast_ - yyn + 1;
-	int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
-	int count = 0;
-	for (int x = yyxbegin; x < yyxend; ++x)
-	  if (yycheck_[x + yyn] == x && x != yyterror_)
-	    ++count;
-
-	// FIXME: This method of building the message is not compatible
-	// with internationalization.  It should work like yacc.c does it.
-	// That is, first build a string that looks like this:
-	// "syntax error, unexpected %s or %s or %s"
-	// Then, invoke YY_ on this string.
-	// Finally, use the string as a format to output
-	// yytname_[tok], etc.
-	// Until this gets fixed, this message appears in English only.
-	res = "syntax error, unexpected ";
-	res += yytnamerr_ (yytname_[tok]);
-	if (count < 5)
-	  {
-	    count = 0;
-	    for (int x = yyxbegin; x < yyxend; ++x)
-	      if (yycheck_[x + yyn] == x && x != yyterror_)
-		{
-		  res += (!count++) ? ", expecting " : " or ";
-		  res += yytnamerr_ (yytname_[x]);
-		}
-	  }
-      }
-    else
-#endif
-      res = YY_("syntax error");
-    return res;
+    std::string yyres;
+    // Number of reported tokens (one for the "unexpected", one per
+    // "expected").
+    size_t yycount = 0;
+    // Its maximum.
+    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+    // Arguments of yyformat.
+    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+    /* There are many possibilities here to consider:
+       - If this state is a consistent state with a default action, then
+         the only way this function was invoked is if the default action
+         is an error action.  In that case, don't check for expected
+         tokens because there are none.
+       - The only way there can be no lookahead present (in yytoken) is
+         if this state is a consistent state with a default action.
+         Thus, detecting the absence of a lookahead is sufficient to
+         determine that there is no unexpected or expected token to
+         report.  In that case, just report a simple "syntax error".
+       - Don't assume there isn't a lookahead just because this state is
+         a consistent state with a default action.  There might have
+         been a previous inconsistent state, consistent state with a
+         non-default action, or user semantic action that manipulated
+         yyla.  (However, yyla is currently not documented for users.)
+       - Of course, the expected token list depends on states to have
+         correct lookahead information, and it depends on the parser not
+         to perform extra reductions after fetching a lookahead from the
+         scanner and before detecting a syntax error.  Thus, state
+         merging (from LALR or IELR) and default reductions corrupt the
+         expected token list.  However, the list is correct for
+         canonical LR with one exception: it will still contain any
+         token that will not be accepted due to an error action in a
+         later state.
+    */
+    if (yytoken != yyempty_)
+      {
+        yyarg[yycount++] = yytname_[yytoken];
+        int yyn = yypact_[yystate];
+        if (!yy_pact_value_is_default_ (yyn))
+          {
+            /* Start YYX at -YYN if negative to avoid negative indexes in
+               YYCHECK.  In other words, skip the first -YYN actions for
+               this state because they are default actions.  */
+            int yyxbegin = yyn < 0 ? -yyn : 0;
+            // Stay within bounds of both yycheck and yytname.
+            int yychecklim = yylast_ - yyn + 1;
+            int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+            for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
+              if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
+                  && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
+                {
+                  if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                    {
+                      yycount = 1;
+                      break;
+                    }
+                  else
+                    yyarg[yycount++] = yytname_[yyx];
+                }
+          }
+      }
+
+    char const* yyformat = YY_NULLPTR;
+    switch (yycount)
+      {
+#define YYCASE_(N, S)                         \
+        case N:                               \
+          yyformat = S;                       \
+        break
+        YYCASE_(0, YY_("syntax error"));
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+      }
+
+    // Argument number.
+    size_t yyi = 0;
+    for (char const* yyp = yyformat; *yyp; ++yyp)
+      if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
+        {
+          yyres += yytnamerr_ (yyarg[yyi++]);
+          ++yyp;
+        }
+      else
+        yyres += *yyp;
+    return yyres;
   }
 
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-  const signed char Parser::yypact_ninf_ = -29;
+  const signed char Parser::yypact_ninf_ = -11;
+
+  const signed char Parser::yytable_ninf_ = -1;
+
   const signed char
   Parser::yypact_[] =
   {
-        46,    -1,    -1,    -1,    -1,     7,   -29,   -29,    -1,     9,
-     -29,   -29,   -29,    25,    -2,    43,    14,   -29,   -29,   -29,
-     -29,   -29,   -29,   -29,    -2,    -2,    -2,   -29,    -6,    38,
-      -1,   -29,    18,    14,    -1,    -1,   -29,   -29,   -29,   -29,
-     -29,    25,    25,    18,    25,   -29,   -29,    40,    -5,   -29,
-      14,    14,     3,   -29
+      49,     2,     2,     2,     2,    22,    16,   -11,   -11,     2,
+      11,   -11,   -11,   -11,     4,    -9,    48,    19,   -11,   -11,
+     -11,   -11,   -11,   -11,   -11,    -9,    -9,    -9,     9,   -11,
+      25,    26,     2,   -11,     3,    19,     2,     2,   -11,   -11,
+     -11,   -11,   -11,     4,     4,     3,     4,     2,     2,   -11,
+     -11,    33,    29,   -11,    19,    19,   -10,   -11,    -9,    -9
   };
 
-  /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-     doesn't specify something else to do.  Zero means the default is an
-     error.  */
   const unsigned char
   Parser::yydefact_[] =
   {
-         0,     0,     0,     0,     0,     0,    20,    19,     0,     0,
-      25,    26,    28,     0,     2,     0,    15,    17,     6,     7,
-       8,     9,    11,    10,     3,     5,     4,     1,     0,     0,
-       0,    22,     0,    14,     0,     0,    29,    30,    31,    32,
-      33,     0,     0,     0,     0,    21,    18,     0,    23,    24,
-      12,    13,    27,    16
+       0,     0,     0,     0,     0,     0,     0,    22,    21,     0,
+       0,    27,    28,    30,     0,     2,     0,    17,    19,     8,
+       9,    10,    11,    13,    12,     3,     5,     4,     0,     1,
+       0,     0,     0,    24,     0,    16,     0,     0,    31,    32,
+      33,    34,    35,     0,     0,     0,     0,     0,     0,    23,
+      20,     0,    25,    26,    14,    15,    29,    18,     7,     6
   };
 
-  /* YYPGOTO[NTERM-NUM].  */
   const signed char
   Parser::yypgoto_[] =
   {
-       -29,   -29,     2,    -8,   -12,   -28,    22,   -29,   -29,   -29,
-     -29,   -29,   -29
+     -11,   -11,    -1,    -5,    -6,    18,    55,   -11,   -11,   -11,
+     -11,   -11,   -11
   };
 
-  /* YYDEFGOTO[NTERM-NUM].  */
   const signed char
   Parser::yydefgoto_[] =
   {
-        -1,     5,    28,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    43
+      -1,     6,    30,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    45
   };
 
-  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule which
-     number is the opposite.  If zero, do what YYDEFACT says.  */
-  const signed char Parser::yytable_ninf_ = -1;
   const unsigned char
   Parser::yytable_[] =
   {
-        29,    33,     6,    14,    24,    25,    26,    27,     7,    45,
-      34,    35,    35,     8,    34,    35,    53,     9,    10,    11,
-      12,     6,    13,    30,    47,    41,    42,     7,     6,    50,
-      51,    31,    32,     0,     7,    52,    48,    49,    44,    32,
-       0,    13,    36,    37,    38,    39,    40,    36,    37,    38,
-      39,    40,     0,    46,     0,    46,     1,     2,     3,     4,
-      41,    42,    41,    42,     0,    41,    42
+      15,    25,    26,    27,    31,     7,     7,     7,    35,    36,
+      37,     8,     8,     8,    43,    44,    29,     9,    34,    34,
+      47,    48,    10,    11,    12,    13,    32,    14,    14,    51,
+      38,    39,    40,    41,    42,    52,    53,    54,    55,    28,
+      56,    49,    50,    36,    37,    46,    58,    59,    37,    50,
+      43,    44,    38,    39,    40,    41,    42,    43,    44,     1,
+       2,     3,     4,     5,    57,    33,     0,     0,     0,     0,
+       0,     0,    43,    44
   };
 
-  /* YYCHECK.  */
   const signed char
   Parser::yycheck_[] =
   {
-         8,    13,     3,     1,     2,     3,     4,     0,     9,    15,
-      16,    17,    17,    14,    16,    17,    44,    18,    19,    20,
-      21,     3,    23,    14,    32,    22,    23,     9,     3,    41,
-      42,     9,    14,    -1,     9,    43,    34,    35,    24,    14,
-      -1,    23,     4,     5,     6,     7,     8,     4,     5,     6,
-       7,     8,    -1,    15,    -1,    15,    10,    11,    12,    13,
-      22,    23,    22,    23,    -1,    22,    23
+       1,     2,     3,     4,     9,     3,     3,     3,    14,    18,
+      19,     9,     9,     9,    24,    25,     0,    15,    15,    15,
+      11,    12,    20,    21,    22,    23,    15,    25,    25,    34,
+       4,     5,     6,     7,     8,    36,    37,    43,    44,    17,
+      45,    16,    16,    18,    19,    26,    47,    48,    19,    16,
+      24,    25,     4,     5,     6,     7,     8,    24,    25,    10,
+      11,    12,    13,    14,    46,    10,    -1,    -1,    -1,    -1,
+      -1,    -1,    24,    25
   };
 
-  /* STOS_[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
   const unsigned char
   Parser::yystos_[] =
   {
-         0,    10,    11,    12,    13,    26,     3,     9,    14,    18,
-      19,    20,    21,    23,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    27,    27,    27,     0,    27,    28,
-      14,    31,    14,    29,    16,    17,     4,     5,     6,     7,
-       8,    22,    23,    37,    24,    15,    15,    28,    27,    27,
-      29,    29,    28,    30
-  };
-
-#if YYDEBUG
-  /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding
-     to YYLEX-NUM.  */
-  const unsigned short int
-  Parser::yytoken_number_[] =
-  {
-         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279
-  };
-#endif
-
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+       0,    10,    11,    12,    13,    14,    28,     3,     9,    15,
+      20,    21,    22,    23,    25,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    29,    29,    29,    17,     0,
+      29,    30,    15,    33,    15,    31,    18,    19,     4,     5,
+       6,     7,     8,    24,    25,    39,    26,    11,    12,    16,
+      16,    30,    29,    29,    31,    31,    30,    32,    29,    29
+  };
+
   const unsigned char
   Parser::yyr1_[] =
   {
-         0,    25,    26,    26,    26,    26,    27,    27,    27,    27,
-      27,    27,    28,    28,    28,    28,    29,    29,    30,    30,
-      30,    31,    32,    33,    34,    35,    35,    36,    36,    37,
-      37,    37,    37,    37
+       0,    27,    28,    28,    28,    28,    28,    28,    29,    29,
+      29,    29,    29,    29,    30,    30,    30,    30,    31,    31,
+      32,    32,    32,    33,    34,    35,    36,    37,    37,    38,
+      38,    39,    39,    39,    39,    39
   };
 
-  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
   const unsigned char
   Parser::yyr2_[] =
   {
-         0,     2,     2,     2,     2,     2,     1,     1,     1,     1,
-       1,     1,     3,     3,     2,     1,     3,     1,     3,     1,
-       1,     3,     2,     3,     3,     1,     1,     3,     1,     1,
-       1,     1,     1,     1
+       0,     2,     2,     2,     2,     2,     4,     4,     1,     1,
+       1,     1,     1,     1,     3,     3,     2,     1,     3,     1,
+       3,     1,     1,     3,     2,     3,     3,     1,     1,     3,
+       1,     1,     1,     1,     1,     1
   };
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-  /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-     First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
+
+
+  // YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+  // First, the terminals, then, starting at \a yyntokens_, nonterminals.
   const char*
   const Parser::yytname_[] =
   {
-    "END", "error", "$undefined", "IDENTIFIER", "LESS", "LESSEQUAL",
+  "END", "error", "$undefined", "IDENTIFIER", "LESS", "LESSEQUAL",
   "EQUAL", "GREATEREQUAL", "GREATER", "NUMBER", "EF", "AG", "AF", "EG",
-  "LPARAN", "RPARAN", "OR", "AND", "NOT", "BOOL_TRUE", "BOOL_FALSE",
-  "DEADLOCK", "PLUS", "MINUS", "MULTIPLY", "$accept", "query",
-  "expression", "arithmeticExpression", "multiplyExpression",
+  "CONTROL", "LPARAN", "RPARAN", "COLON", "OR", "AND", "NOT", "BOOL_TRUE",
+  "BOOL_FALSE", "DEADLOCK", "PLUS", "MINUS", "MULTIPLY", "$accept",
+  "query", "expression", "arithmeticExpression", "multiplyExpression",
   "arithmeticParantheses", "parExpression", "notExpression",
   "orExpression", "andExpression", "boolExpression", "atomicProposition",
-  "compareOp", 0
+  "compareOp", YY_NULLPTR
   };
-#endif
 
 #if YYDEBUG
-  /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-  const Parser::rhs_number_type
-  Parser::yyrhs_[] =
-  {
-        26,     0,    -1,    10,    27,    -1,    11,    27,    -1,    13,
-      27,    -1,    12,    27,    -1,    31,    -1,    32,    -1,    33,
-      -1,    34,    -1,    36,    -1,    35,    -1,    28,    22,    29,
-      -1,    28,    23,    29,    -1,    23,    29,    -1,    29,    -1,
-      29,    24,    30,    -1,    30,    -1,    14,    28,    15,    -1,
-       9,    -1,     3,    -1,    14,    27,    15,    -1,    18,    31,
-      -1,    27,    16,    27,    -1,    27,    17,    27,    -1,    19,
-      -1,    20,    -1,    28,    37,    28,    -1,    21,    -1,     4,
-      -1,     5,    -1,     6,    -1,     7,    -1,     8,    -1
-  };
-
-  /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-     YYRHS.  */
-  const unsigned char
-  Parser::yyprhs_[] =
-  {
-         0,     0,     3,     6,     9,    12,    15,    17,    19,    21,
-      23,    25,    27,    31,    35,    38,    40,    44,    46,    50,
-      52,    54,    58,    61,    65,    69,    71,    73,    77,    79,
-      81,    83,    85,    87
-  };
-
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
   const unsigned char
   Parser::yyrline_[] =
   {
-         0,    62,    62,    63,    64,    65,    68,    69,    70,    71,
-      72,    73,    79,    80,    81,    82,    85,    86,    89,    90,
-      91,    99,   100,   101,   102,   103,   104,   106,   107,   109,
-     109,   109,   109,   109
+       0,    62,    62,    63,    64,    65,    66,    67,    70,    71,
+      72,    73,    74,    75,    81,    82,    83,    84,    87,    88,
+      91,    92,    93,   101,   102,   103,   104,   105,   106,   108,
+     109,   111,   111,   111,   111,   111
   };
 
   // Print the state stack on the debug stream.
@@ -1164,9 +1287,11 @@
   Parser::yystack_print_ ()
   {
     *yycdebug_ << "Stack now";
-    for (state_stack_type::const_iterator i = yystate_stack_.begin ();
-	 i != yystate_stack_.end (); ++i)
-      *yycdebug_ << ' ' << *i;
+    for (stack_type::const_iterator
+           i = yystack_.begin (),
+           i_end = yystack_.end ();
+         i != i_end; ++i)
+      *yycdebug_ << ' ' << i->state;
     *yycdebug_ << std::endl;
   }
 
@@ -1176,19 +1301,18 @@
   {
     unsigned int yylno = yyrline_[yyrule];
     int yynrhs = yyr2_[yyrule];
-    /* Print the symbols being reduced, and their result.  */
+    // Print the symbols being reduced, and their result.
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1
-	       << " (line " << yylno << "):" << std::endl;
-    /* The symbols being reduced.  */
+               << " (line " << yylno << "):" << std::endl;
+    // The symbols being reduced.
     for (int yyi = 0; yyi < yynrhs; yyi++)
       YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
-		       yyrhs_[yyprhs_[yyrule] + yyi],
-		       &(yysemantic_stack_[(yynrhs) - (yyi + 1)]),
-		       &(yylocation_stack_[(yynrhs) - (yyi + 1)]));
+                       yystack_[(yynrhs) - (yyi + 1)]);
   }
 #endif // YYDEBUG
 
-  /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+  // Symbol number corresponding to token number t.
+  inline
   Parser::token_number_type
   Parser::yytranslate_ (int t)
   {
@@ -1196,7 +1320,7 @@
     const token_number_type
     translate_table[] =
     {
-           0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1223,37 +1347,24 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26
     };
-    if ((unsigned int) t <= yyuser_token_number_max_)
+    const unsigned int user_token_number_max_ = 281;
+    const token_number_type undef_token_ = 2;
+
+    if (static_cast<int>(t) <= yyeof_)
+      return yyeof_;
+    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
       return translate_table[t];
     else
-      return yyundef_token_;
+      return undef_token_;
   }
 
-  const int Parser::yyeof_ = 0;
-  const int Parser::yylast_ = 66;
-  const int Parser::yynnts_ = 13;
-  const int Parser::yyempty_ = -2;
-  const int Parser::yyfinal_ = 27;
-  const int Parser::yyterror_ = 1;
-  const int Parser::yyerrcode_ = 256;
-  const int Parser::yyntokens_ = 25;
-
-  const unsigned int Parser::yyuser_token_number_max_ = 279;
-  const Parser::token_number_type Parser::yyundef_token_ = 2;
-
-
-/* Line 1054 of lalr1.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+#line 5 "src/Core/QueryParser/grammar.yy" // lalr1.cc:1155
 } // VerifyTAPN
-
-/* Line 1054 of lalr1.cc  */
-#line 1253 "src/Core/QueryParser/Generated/parser.cpp"
-
-
-/* Line 1056 of lalr1.cc  */
-#line 111 "src/Core/QueryParser/grammar.yy"
+#line 1367 "src/Core/QueryParser/Generated/parser.cpp" // lalr1.cc:1155
+#line 113 "src/Core/QueryParser/grammar.yy" // lalr1.cc:1156
 
 
 void 
@@ -1263,4 +1374,3 @@
 	driver.error (l, m);
 	exit(1);
 }
-

=== modified file 'src/Core/QueryParser/Generated/parser.hpp'
--- src/Core/QueryParser/Generated/parser.hpp	2014-08-07 20:48:41 +0000
+++ src/Core/QueryParser/Generated/parser.hpp	2018-01-07 20:09:44 +0000
@@ -1,46 +1,46 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison LALR(1) parsers in C++
-   
-      Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C++ LALR(1) parser skeleton written by Akim Demaille.  */
-
-#ifndef PARSER_HEADER_H
-# define PARSER_HEADER_H
-
-/* "%code requires" blocks.  */
-
-/* Line 300 of lalr1.cc  */
-#line 7 "src/Core/QueryParser/grammar.yy"
+// A Bison parser, made by GNU Bison 3.0.2.
+
+// Skeleton interface for Bison LALR(1) parsers in C++
+
+// Copyright (C) 2002-2013 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
+
+/**
+ ** \file src/Core/QueryParser/Generated/parser.hpp
+ ** Define the VerifyTAPN::parser class.
+ */
+
+// C++ LALR(1) parser skeleton written by Akim Demaille.
+
+#ifndef YY_YY_SRC_CORE_QUERYPARSER_GENERATED_PARSER_HPP_INCLUDED
+# define YY_YY_SRC_CORE_QUERYPARSER_GENERATED_PARSER_HPP_INCLUDED
+// //                    "%code requires" blocks.
+#line 7 "src/Core/QueryParser/grammar.yy" // lalr1.cc:372
 
 # include <string>
 #include "../AST.hpp"
@@ -48,91 +48,92 @@
 	class TAPNQueryParser;
 }
 
-
-
-/* Line 300 of lalr1.cc  */
-#line 55 "src/Core/QueryParser/Generated/parser.hpp"
-
-
-#include <string>
-#include <iostream>
-#include "stack.hh"
-
-
-/* Line 300 of lalr1.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
-namespace VerifyTAPN {
-
-/* Line 300 of lalr1.cc  */
-#line 68 "src/Core/QueryParser/Generated/parser.hpp"
-  class position;
-  class location;
-
-/* Line 300 of lalr1.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
-} // VerifyTAPN
-
-/* Line 300 of lalr1.cc  */
-#line 77 "src/Core/QueryParser/Generated/parser.hpp"
-
-#include "location.hh"
-
-/* Enabling traces.  */
+#line 52 "src/Core/QueryParser/Generated/parser.hpp" // lalr1.cc:372
+
+
+# include <vector>
+# include <iostream>
+# include <stdexcept>
+# include <string>
+# include "stack.hh"
+# include "location.hh"
+
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
 
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-do {							\
-  if (N)						\
-    {							\
-      (Current).begin = (Rhs)[1].begin;			\
-      (Current).end   = (Rhs)[N].end;			\
-    }							\
-  else							\
-    {							\
-      (Current).begin = (Current).end = (Rhs)[0].end;	\
-    }							\
-} while (false)
-#endif
-
-
-/* Line 300 of lalr1.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+#line 5 "src/Core/QueryParser/grammar.yy" // lalr1.cc:372
 namespace VerifyTAPN {
-
-/* Line 300 of lalr1.cc  */
-#line 124 "src/Core/QueryParser/Generated/parser.hpp"
+#line 123 "src/Core/QueryParser/Generated/parser.hpp" // lalr1.cc:372
+
+
+
+
 
   /// A Bison parser.
   class Parser
   {
   public:
+#ifndef YYSTYPE
     /// Symbol semantic values.
-#ifndef YYSTYPE
     union semantic_type
     {
-
-/* Line 300 of lalr1.cc  */
-#line 30 "src/Core/QueryParser/grammar.yy"
+    #line 30 "src/Core/QueryParser/grammar.yy" // lalr1.cc:372
 
 	int          					number;
 	std::string* 					string;
@@ -140,50 +141,142 @@
         VerifyTAPN::AST::ArithmeticExpression*           arexpr;
 	VerifyTAPN::AST::Query*                         query;
 
-
-
-/* Line 300 of lalr1.cc  */
-#line 147 "src/Core/QueryParser/Generated/parser.hpp"
+#line 145 "src/Core/QueryParser/Generated/parser.hpp" // lalr1.cc:372
     };
 #else
     typedef YYSTYPE semantic_type;
 #endif
     /// Symbol locations.
     typedef location location_type;
+
+    /// Syntax errors thrown from user actions.
+    struct syntax_error : std::runtime_error
+    {
+      syntax_error (const location_type& l, const std::string& m);
+      location_type location;
+    };
+
     /// Tokens.
     struct token
     {
-      /* Tokens.  */
-   enum yytokentype {
-     END = 0,
-     IDENTIFIER = 258,
-     LESS = 259,
-     LESSEQUAL = 260,
-     EQUAL = 261,
-     GREATEREQUAL = 262,
-     GREATER = 263,
-     NUMBER = 264,
-     EF = 265,
-     AG = 266,
-     AF = 267,
-     EG = 268,
-     LPARAN = 269,
-     RPARAN = 270,
-     OR = 271,
-     AND = 272,
-     NOT = 273,
-     BOOL_TRUE = 274,
-     BOOL_FALSE = 275,
-     DEADLOCK = 276,
-     PLUS = 277,
-     MINUS = 278,
-     MULTIPLY = 279
-   };
+      enum yytokentype
+      {
+        END = 0,
+        IDENTIFIER = 258,
+        LESS = 259,
+        LESSEQUAL = 260,
+        EQUAL = 261,
+        GREATEREQUAL = 262,
+        GREATER = 263,
+        NUMBER = 264,
+        EF = 265,
+        AG = 266,
+        AF = 267,
+        EG = 268,
+        CONTROL = 269,
+        LPARAN = 270,
+        RPARAN = 271,
+        COLON = 272,
+        OR = 273,
+        AND = 274,
+        NOT = 275,
+        BOOL_TRUE = 276,
+        BOOL_FALSE = 277,
+        DEADLOCK = 278,
+        PLUS = 279,
+        MINUS = 280,
+        MULTIPLY = 281
+      };
+    };
 
-    };
-    /// Token type.
+    /// (External) token type, as returned by yylex.
     typedef token::yytokentype token_type;
 
+    /// Internal symbol number.
+    typedef int symbol_number_type;
+
+    /// Internal symbol number for tokens (subsumed by symbol_number_type).
+    typedef unsigned char token_number_type;
+
+    /// A complete symbol.
+    ///
+    /// Expects its Base type to provide access to the symbol type
+    /// via type_get().
+    ///
+    /// Provide access to semantic value and location.
+    template <typename Base>
+    struct basic_symbol : Base
+    {
+      /// Alias to Base.
+      typedef Base super_type;
+
+      /// Default constructor.
+      basic_symbol ();
+
+      /// Copy constructor.
+      basic_symbol (const basic_symbol& other);
+
+      /// Constructor for valueless symbols.
+      basic_symbol (typename Base::kind_type t,
+                    const location_type& l);
+
+      /// Constructor for symbols with semantic value.
+      basic_symbol (typename Base::kind_type t,
+                    const semantic_type& v,
+                    const location_type& l);
+
+      ~basic_symbol ();
+
+      /// Destructive move, \a s is emptied into this.
+      void move (basic_symbol& s);
+
+      /// The semantic value.
+      semantic_type value;
+
+      /// The location.
+      location_type location;
+
+    private:
+      /// Assignment operator.
+      basic_symbol& operator= (const basic_symbol& other);
+    };
+
+    /// Type access provider for token (enum) based symbols.
+    struct by_type
+    {
+      /// Default constructor.
+      by_type ();
+
+      /// Copy constructor.
+      by_type (const by_type& other);
+
+      /// The symbol type as needed by the constructor.
+      typedef token_type kind_type;
+
+      /// Constructor from (external) token numbers.
+      by_type (kind_type t);
+
+      /// Steal the symbol type from \a that.
+      void move (by_type& that);
+
+      /// The (internal) type number (corresponding to \a type).
+      /// -1 when this symbol is empty.
+      symbol_number_type type_get () const;
+
+      /// The token.
+      token_type token () const;
+
+      enum { empty = 0 };
+
+      /// The symbol type.
+      /// -1 when this symbol is empty.
+      token_number_type type;
+    };
+
+    /// "External" symbols: returned by the scanner.
+    typedef basic_symbol<by_type> symbol_type;
+
+
     /// Build a parser object.
     Parser (VerifyTAPN::TAPNQueryParser& driver_yyarg);
     virtual ~Parser ();
@@ -194,167 +287,215 @@
 
 #if YYDEBUG
     /// The current debugging stream.
-    std::ostream& debug_stream () const;
+    std::ostream& debug_stream () const YY_ATTRIBUTE_PURE;
     /// Set the current debugging stream.
     void set_debug_stream (std::ostream &);
 
     /// Type for debugging levels.
     typedef int debug_level_type;
     /// The current debugging level.
-    debug_level_type debug_level () const;
+    debug_level_type debug_level () const YY_ATTRIBUTE_PURE;
     /// Set the current debugging level.
     void set_debug_level (debug_level_type l);
 #endif
 
-  private:
     /// Report a syntax error.
     /// \param loc    where the syntax error is found.
     /// \param msg    a description of the syntax error.
     virtual void error (const location_type& loc, const std::string& msg);
 
-    /// Generate an error message.
-    /// \param state   the state where the error occurred.
-    /// \param tok     the lookahead token.
-    virtual std::string yysyntax_error_ (int yystate, int tok);
-
-#if YYDEBUG
-    /// \brief Report a symbol value on the debug stream.
-    /// \param yytype       The token type.
-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
-    virtual void yy_symbol_value_print_ (int yytype,
-					 const semantic_type* yyvaluep,
-					 const location_type* yylocationp);
-    /// \brief Report a symbol on the debug stream.
-    /// \param yytype       The token type.
-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
-    virtual void yy_symbol_print_ (int yytype,
-				   const semantic_type* yyvaluep,
-				   const location_type* yylocationp);
-#endif
-
+    /// Report a syntax error.
+    void error (const syntax_error& err);
+
+  private:
+    /// This class is not copyable.
+    Parser (const Parser&);
+    Parser& operator= (const Parser&);
 
     /// State numbers.
     typedef int state_type;
-    /// State stack type.
-    typedef stack<state_type>    state_stack_type;
-    /// Semantic value stack type.
-    typedef stack<semantic_type> semantic_stack_type;
-    /// location stack type.
-    typedef stack<location_type> location_stack_type;
-
-    /// The state stack.
-    state_stack_type yystate_stack_;
-    /// The semantic value stack.
-    semantic_stack_type yysemantic_stack_;
-    /// The location stack.
-    location_stack_type yylocation_stack_;
-
-    /// Internal symbol numbers.
-    typedef unsigned char token_number_type;
-    /* Tables.  */
-    /// For a state, the index in \a yytable_ of its portion.
-    static const signed char yypact_[];
+
+    /// Generate an error message.
+    /// \param yystate   the state where the error occurred.
+    /// \param yytoken   the lookahead token type, or yyempty_.
+    virtual std::string yysyntax_error_ (state_type yystate,
+                                         symbol_number_type yytoken) const;
+
+    /// Compute post-reduction state.
+    /// \param yystate   the current state
+    /// \param yysym     the nonterminal to push on the stack
+    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
+
+    /// Whether the given \c yypact_ value indicates a defaulted state.
+    /// \param yyvalue   the value to check
+    static bool yy_pact_value_is_default_ (int yyvalue);
+
+    /// Whether the given \c yytable_ value indicates a syntax error.
+    /// \param yyvalue   the value to check
+    static bool yy_table_value_is_error_ (int yyvalue);
+
     static const signed char yypact_ninf_;
-
-    /// For a state, default rule to reduce.
-    /// Unless\a  yytable_ specifies something else to do.
-    /// Zero means the default is an error.
-    static const unsigned char yydefact_[];
-
-    static const signed char yypgoto_[];
-    static const signed char yydefgoto_[];
-
-    /// What to do in a state.
-    /// \a yytable_[yypact_[s]]: what to do in state \a s.
-    /// - if positive, shift that token.
-    /// - if negative, reduce the rule which number is the opposite.
-    /// - if zero, do what YYDEFACT says.
-    static const unsigned char yytable_[];
     static const signed char yytable_ninf_;
 
-    static const signed char yycheck_[];
-
-    /// For a state, its accessing symbol.
-    static const unsigned char yystos_[];
-
-    /// For a rule, its LHS.
-    static const unsigned char yyr1_[];
-    /// For a rule, its RHS length.
-    static const unsigned char yyr2_[];
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+    /// Convert a scanner token number \a t to a symbol number.
+    static token_number_type yytranslate_ (int t);
+
+    // Tables.
+  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+  // STATE-NUM.
+  static const signed char yypact_[];
+
+  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+  // Performed when YYTABLE does not specify something else to do.  Zero
+  // means the default is an error.
+  static const unsigned char yydefact_[];
+
+  // YYPGOTO[NTERM-NUM].
+  static const signed char yypgoto_[];
+
+  // YYDEFGOTO[NTERM-NUM].
+  static const signed char yydefgoto_[];
+
+  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+  // positive, shift that token.  If negative, reduce the rule whose
+  // number is the opposite.  If YYTABLE_NINF, syntax error.
+  static const unsigned char yytable_[];
+
+  static const signed char yycheck_[];
+
+  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+  // symbol of state STATE-NUM.
+  static const unsigned char yystos_[];
+
+  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
+  static const unsigned char yyr1_[];
+
+  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
+  static const unsigned char yyr2_[];
+
+
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
+
+
     /// For a symbol, its name in clear.
     static const char* const yytname_[];
-#endif
-
-#if YYERROR_VERBOSE
-    /// Convert the symbol name \a n to a form suitable for a diagnostic.
-    virtual std::string yytnamerr_ (const char *n);
-#endif
-
 #if YYDEBUG
-    /// A type to store symbol numbers and -1.
-    typedef signed char rhs_number_type;
-    /// A `-1'-separated list of the rules' RHS.
-    static const rhs_number_type yyrhs_[];
-    /// For each rule, the index of the first RHS symbol in \a yyrhs_.
-    static const unsigned char yyprhs_[];
-    /// For each rule, its source line number.
-    static const unsigned char yyrline_[];
-    /// For each scanner token number, its symbol number.
-    static const unsigned short int yytoken_number_[];
+  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
+  static const unsigned char yyrline_[];
     /// Report on the debug stream that the rule \a r is going to be reduced.
     virtual void yy_reduce_print_ (int r);
     /// Print the state stack on the debug stream.
     virtual void yystack_print_ ();
 
-    /* Debugging.  */
+    // Debugging.
     int yydebug_;
     std::ostream* yycdebug_;
+
+    /// \brief Display a symbol type, value and location.
+    /// \param yyo    The output stream.
+    /// \param yysym  The symbol.
+    template <typename Base>
+    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
 #endif
 
-    /// Convert a scanner token number \a t to a symbol number.
-    token_number_type yytranslate_ (int t);
-
     /// \brief Reclaim the memory associated to a symbol.
-    /// \param yymsg        Why this token is reclaimed.
-    /// \param yytype       The symbol type.
-    /// \param yyvaluep     Its semantic value.
-    /// \param yylocationp  Its location.
-    inline void yydestruct_ (const char* yymsg,
-			     int yytype,
-			     semantic_type* yyvaluep,
-			     location_type* yylocationp);
+    /// \param yymsg     Why this token is reclaimed.
+    ///                  If null, print nothing.
+    /// \param yysym     The symbol.
+    template <typename Base>
+    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
+
+  private:
+    /// Type access provider for state based symbols.
+    struct by_state
+    {
+      /// Default constructor.
+      by_state ();
+
+      /// The symbol type as needed by the constructor.
+      typedef state_type kind_type;
+
+      /// Constructor.
+      by_state (kind_type s);
+
+      /// Copy constructor.
+      by_state (const by_state& other);
+
+      /// Steal the symbol type from \a that.
+      void move (by_state& that);
+
+      /// The (internal) type number (corresponding to \a state).
+      /// "empty" when empty.
+      symbol_number_type type_get () const;
+
+      enum { empty = 0 };
+
+      /// The state.
+      state_type state;
+    };
+
+    /// "Internal" symbol: element of the stack.
+    struct stack_symbol_type : basic_symbol<by_state>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_state> super_type;
+      /// Construct an empty symbol.
+      stack_symbol_type ();
+      /// Steal the contents from \a sym to build this.
+      stack_symbol_type (state_type s, symbol_type& sym);
+      /// Assignment, needed by push_back.
+      stack_symbol_type& operator= (const stack_symbol_type& that);
+    };
+
+    /// Stack type.
+    typedef stack<stack_symbol_type> stack_type;
+
+    /// The stack.
+    stack_type yystack_;
+
+    /// Push a new state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the symbol
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, stack_symbol_type& s);
+
+    /// Push a new look ahead token on the state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the state
+    /// \param sym  the symbol (for its value and location).
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, state_type s, symbol_type& sym);
 
     /// Pop \a n symbols the three stacks.
-    inline void yypop_ (unsigned int n = 1);
-
-    /* Constants.  */
-    static const int yyeof_;
-    /* LAST_ -- Last index in TABLE_.  */
-    static const int yylast_;
-    static const int yynnts_;
-    static const int yyempty_;
-    static const int yyfinal_;
-    static const int yyterror_;
-    static const int yyerrcode_;
-    static const int yyntokens_;
-    static const unsigned int yyuser_token_number_max_;
-    static const token_number_type yyundef_token_;
-
-    /* User arguments.  */
+    void yypop_ (unsigned int n = 1);
+
+    // Constants.
+    enum
+    {
+      yyeof_ = 0,
+      yylast_ = 73,     ///< Last index in yytable_.
+      yynnts_ = 13,  ///< Number of nonterminal symbols.
+      yyempty_ = -2,
+      yyfinal_ = 29, ///< Termination state number.
+      yyterror_ = 1,
+      yyerrcode_ = 256,
+      yyntokens_ = 27  ///< Number of tokens.
+    };
+
+
+    // User arguments.
     VerifyTAPN::TAPNQueryParser& driver;
   };
 
-/* Line 300 of lalr1.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+
+#line 5 "src/Core/QueryParser/grammar.yy" // lalr1.cc:372
 } // VerifyTAPN
-
-/* Line 300 of lalr1.cc  */
-#line 357 "src/Core/QueryParser/Generated/parser.hpp"
-
-
-
-#endif /* ! defined PARSER_HEADER_H */
+#line 497 "src/Core/QueryParser/Generated/parser.hpp" // lalr1.cc:372
+
+
+
+
+#endif // !YY_YY_SRC_CORE_QUERYPARSER_GENERATED_PARSER_HPP_INCLUDED

=== modified file 'src/Core/QueryParser/Generated/position.hh'
--- src/Core/QueryParser/Generated/position.hh	2014-08-07 20:48:41 +0000
+++ src/Core/QueryParser/Generated/position.hh	2018-01-07 20:09:44 +0000
@@ -1,139 +1,157 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Positions for Bison parsers in C++
-   
-      Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
+// A Bison parser, made by GNU Bison 3.0.2.
+
+// Positions for Bison parsers in C++
+
+// Copyright (C) 2002-2013 Free Software Foundation, Inc.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// As a special exception, you may create a larger work that contains
+// part or all of the Bison parser skeleton and distribute that work
+// under terms of your choice, so long as that work isn't itself a
+// parser generator using the skeleton or a modified version thereof
+// as a parser skeleton.  Alternatively, if you modify or redistribute
+// the parser skeleton itself, you may (at your option) remove this
+// special exception, which will cause the skeleton and the resulting
+// Bison output files to be licensed under the GNU General Public
+// License without this special exception.
+
+// This special exception was added by the Free Software Foundation in
+// version 2.2 of Bison.
 
 /**
- ** \file position.hh
+ ** \file src/Core/QueryParser/Generated/position.hh
  ** Define the VerifyTAPN::position class.
  */
 
-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+#ifndef YY_YY_SRC_CORE_QUERYPARSER_GENERATED_POSITION_HH_INCLUDED
+# define YY_YY_SRC_CORE_QUERYPARSER_GENERATED_POSITION_HH_INCLUDED
 
+# include <algorithm> // std::max
 # include <iostream>
 # include <string>
-# include <algorithm>
-
-
-/* Line 38 of location.cc  */
-#line 5 "src/Core/QueryParser/grammar.yy"
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+#line 5 "src/Core/QueryParser/grammar.yy" // location.cc:291
 namespace VerifyTAPN {
-
-/* Line 38 of location.cc  */
-#line 53 "src/Core/QueryParser/Generated/position.hh"
+#line 56 "src/Core/QueryParser/Generated/position.hh" // location.cc:291
   /// Abstract a position.
   class position
   {
   public:
-
     /// Construct a position.
-    position ()
-      : filename (0), line (1), column (1)
+    explicit position (std::string* f = YY_NULLPTR,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : filename (f)
+      , line (l)
+      , column (c)
     {
     }
 
 
     /// Initialization.
-    inline void initialize (std::string* fn)
+    void initialize (std::string* fn = YY_NULLPTR,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
     {
       filename = fn;
-      line = 1;
-      column = 1;
+      line = l;
+      column = c;
     }
 
     /** \name Line and Column related manipulators
      ** \{ */
-  public:
     /// (line related) Advance to the COUNT next lines.
-    inline void lines (int count = 1)
+    void lines (int count = 1)
     {
-      column = 1;
-      line += count;
+      if (count)
+        {
+          column = 1u;
+          line = add_ (line, count, 1);
+        }
     }
 
     /// (column related) Advance to the COUNT next columns.
-    inline void columns (int count = 1)
+    void columns (int count = 1)
     {
-      column = std::max (1u, column + count);
+      column = add_ (column, count, 1);
     }
     /** \} */
 
-  public:
     /// File name to which this position refers.
     std::string* filename;
     /// Current line number.
     unsigned int line;
     /// Current column number.
     unsigned int column;
+
+  private:
+    /// Compute max(min, lhs+rhs) (provided min <= lhs).
+    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
+    {
+      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
+              ? rhs + lhs
+              : min);
+    }
   };
 
   /// Add and assign a position.
-  inline const position&
-  operator+= (position& res, const int width)
+  inline position&
+  operator+= (position& res, int width)
   {
     res.columns (width);
     return res;
   }
 
   /// Add two position objects.
-  inline const position
-  operator+ (const position& begin, const int width)
+  inline position
+  operator+ (position res, int width)
   {
-    position res = begin;
     return res += width;
   }
 
   /// Add and assign a position.
-  inline const position&
-  operator-= (position& res, const int width)
+  inline position&
+  operator-= (position& res, int width)
   {
     return res += -width;
   }
 
   /// Add two position objects.
-  inline const position
-  operator- (const position& begin, const int width)
+  inline position
+  operator- (position res, int width)
   {
-    return begin + -width;
+    return res -= width;
   }
 
   /// Compare two position objects.
   inline bool
   operator== (const position& pos1, const position& pos2)
   {
-    return
-      (pos1.filename == pos2.filename
-       || pos1.filename && pos2.filename && *pos1.filename == *pos2.filename)
-      && pos1.line == pos2.line && pos1.column == pos2.column;
+    return (pos1.line == pos2.line
+            && pos1.column == pos2.column
+            && (pos1.filename == pos2.filename
+                || (pos1.filename && pos2.filename
+                    && *pos1.filename == *pos2.filename)));
   }
 
   /// Compare two position objects.
@@ -147,19 +165,16 @@
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect
    */
-  inline std::ostream&
-  operator<< (std::ostream& ostr, const position& pos)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
       ostr << *pos.filename << ':';
     return ostr << pos.line << '.' << pos.column;
   }
 
-