Added a parser for the qtivi query language based on QLALR

The query parser uses flex for the symbol scanning and QLALR
for the syntax checking.
The query parser will be used in the upcoming browsing and search
model interface for providing a powerful and flexible way to filter
a model or search for specific content.

Change-Id: Ic1b03f36ba8d12fac612ea27d1cb45c6079583ba
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

15 files changed, 4861 insertions, 0 deletions

diff --git a/src/ivicore/ivicore.pro b/src/ivicore/ivicore.pro
index ff2ef80..9238e95 100644
--- a/src/ivicore/ivicore.pro
+++ b/src/ivicore/ivicore.pro
@@ -41,4 +41,6 @@ SOURCES += \
     qtiviproperty.cpp \
     qtivipropertyfactory.cpp
 
+include(queryparser/queryparser.pri)
+
 load(qt_module)
diff --git a/src/ivicore/queryparser/README b/src/ivicore/queryparser/README
new file mode 100644
index 0000000..88331ef
--- /dev/null
+++ b/src/ivicore/queryparser/README
@@ -0,0 +1,14 @@
+This Directory contains all the files needed to generate
+a Parser for the QtIVI Query Language.
+
+The Grammer is defined by using flex (*.l) and QLALR (*.g)
+
+To change the grammer you need to edit the *.l or *.g files
+and generate the corresponding header files
+
+All header files (besides the qtiviqueryterm.*) are autogenerated.
+
+You can automatically generate the header files on every change
+by setting the enable-qlalr CONFIG option
+
+$ qmake CONFIG+=enable-qlalr
diff --git a/src/ivicore/queryparser/qtiviqueryparser.g b/src/ivicore/queryparser/qtiviqueryparser.g
new file mode 100644
index 0000000..f7547e8
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryparser.g
@@ -0,0 +1,669 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2016 Pelagicore AG
+-- Contact: https://www.qt.io/licensing/
+--
+-- This file is part of the QtIVI module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL-QTAS$
+-- Commercial License Usage
+-- Licensees holding valid commercial Qt Automotive Suite licenses may use
+-- this file in accordance with the commercial license agreement provided
+-- with the Software or, alternatively, in accordance with the terms
+-- contained in a written agreement between you and The Qt Company.  For
+-- licensing terms and conditions see https://www.qt.io/terms-conditions.
+-- For further information use the contact form at https://www.qt.io/contact-us.
+--
+-- GNU Lesser General Public License Usage
+-- Alternatively, this file may be used under the terms of the GNU Lesser
+-- General Public License version 3 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL3 included in the
+-- packaging of this file. Please review the following information to
+-- ensure the GNU Lesser General Public License version 3 requirements
+-- will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+--
+-- GNU General Public License Usage
+-- Alternatively, this file may be used under the terms of the GNU
+-- General Public License version 2.0 or (at your option) the GNU General
+-- Public license version 3 or any later version approved by the KDE Free
+-- Qt Foundation. The licenses are as published by the Free Software
+-- Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+-- included in the packaging of this file. Please review the following
+-- information to ensure the GNU General Public License requirements will
+-- be met: https://www.gnu.org/licenses/gpl-2.0.html and
+-- https://www.gnu.org/licenses/gpl-3.0.html.
+--
+-- $QT_END_LICENSE$
+--
+-- SPDX-License-Identifier: LGPL-3.0
+--
+----------------------------------------------------------------------------
+
+--
+--  W A R N I N G
+--  -------------
+--
+-- This file is not part of the Qt API.  It exists purely as an
+-- implementation detail. This header file may change from version to
+-- version without notice, or even be removed.
+--
+-- We mean it.
+--
+
+%parser QtIVIQueryParserTable
+%merged_output qtiviqueryparser_p.h
+
+%token AND_OP2 "&"
+%token AND_OP "&&"
+%token OR_OP2 "|"
+%token OR_OP "||"
+%token BANG "!"
+%token EQ_OP "=="
+%token EQ_OP2 "="
+%token IC_EQ_OP "~="
+%token GE_OP ">="
+%token GT_OP ">"
+%token LE_OP "<="
+%token LT_OP "<"
+%token NE_OP "!="
+%token LEFT_PAREN "("
+%token RIGHT_PAREN ")"
+%token ASCENDING "/"
+%token DESCENDING "\\"
+%token LEFT_BRACKET "["
+%token RIGHT_BRACKET "]"
+%token INTCONSTANT "integer"
+%token FLOATCONSTANT "float"
+%token IDENTIFIER "identifier"
+%token STRING "string"
+%token SPACE
+%token ERROR
+
+
+%start translation_unit
+
+/:
+
+#include <QtCore>
+#include <QtIVICore/QtIVIAbstractQueryTerm>
+#include <QtIVICore/private/qtiviqueryterm_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//TODO Find a better way of doing it, this is not reentrant
+QString* currentQuery = 0;
+unsigned int *currentOffset = 0;
+void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead)
+{
+    if (!currentQuery) {
+        numBytesRead=0;
+        return;
+    }
+
+    int numBytesToRead = maxBytesToRead;
+    int bytesRemaining = currentQuery->count()-(*currentOffset);
+    int i;
+    if ( numBytesToRead > bytesRemaining )
+        numBytesToRead = bytesRemaining;
+
+
+    for (i = 0; i < numBytesToRead; i++) {
+        buffer[i] = currentQuery->toLatin1().at(*currentOffset+i);
+    }
+
+    numBytesRead = numBytesToRead;
+    *currentOffset += numBytesToRead;
+}
+
+class QtIVIQueryParser: protected $table
+{
+public:
+    union Value {
+      int i;
+      float f;
+      const QString *s;
+    };
+
+public:
+    QtIVIQueryParser();
+    virtual ~QtIVIQueryParser();
+
+    QtIVIAbstractQueryTerm *parse();
+
+    void setQuery(const QString& query)
+    {
+        m_query = query;
+    }
+
+    QString lastError() {
+        return m_error;
+    }
+
+    void setAllowedIdentifiers(const QSet<QString> &list)
+    {
+        m_identifierList = list;
+    }
+
+    QList<QtIVIOrderTerm> orderTerms() const
+    {
+        return m_orderList;
+    }
+
+protected:
+    inline void reallocateStack();
+
+    inline QVariant &sym(int index)
+    {
+        return sym_stack [tos + index - 1];
+    }
+
+    void initBuffer()
+    {
+        currentQuery = &m_query;
+        currentOffset = &m_offset;
+    }
+
+    void setErrorString(const QString &error);
+
+    void calcCurrentColumn();
+
+    int nextToken();
+
+    void handleConjunction(bool bangOperator);
+    void handleScope(bool bang);
+
+    void negateLeftMostTerm(QtIVIAbstractQueryTerm *term);
+
+    bool checkIdentifier(const QString &identifer);
+
+protected:
+    QString m_query;
+    unsigned int m_offset;
+    QString m_error;
+    QSet<QString> m_identifierList;
+
+    int column;
+    int tos;
+    QVector<QVariant> sym_stack;
+    QVector<int> state_stack;
+    QVariant yylval;
+
+    QStack<QtIVIAbstractQueryTerm*> m_termStack;
+    QStack<QtIVIFilterTerm::Operator> m_operatorStack;
+    QStack<QtIVIConjunctionTerm::Conjunction> m_conjunctionStack;
+    QList<QtIVIOrderTerm> m_orderList;
+};
+
+inline void QtIVIQueryParser::reallocateStack()
+{
+    int size = state_stack.size();
+    if (size == 0)
+        size = 128;
+    else
+        size <<= 1;
+
+    sym_stack.resize(size);
+    state_stack.resize(size);
+}
+
+:/
+
+
+/.
+
+QtIVIQueryParser::QtIVIQueryParser():
+    m_offset(0),
+    column(0),
+    tos(0)
+{
+      reallocateStack();
+}
+
+#include "qtiviqueryparser_flex_p.h"
+
+QtIVIQueryParser::~QtIVIQueryParser()
+{
+    currentOffset = 0;
+    currentQuery = 0;
+
+    //We need to reset the lexer to reinitialize it when needed
+    yy_init = 0;
+
+    //Get rid of the unused warning
+    if (0)
+        yyunput(0, 0);}
+
+void QtIVIQueryParser::calcCurrentColumn()
+{
+    column += yyleng;
+}
+
+void QtIVIQueryParser::negateLeftMostTerm(QtIVIAbstractQueryTerm *term)
+{
+    if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
+        QtIVIConjunctionTerm* conjunction = static_cast<QtIVIConjunctionTerm*>(term);
+        negateLeftMostTerm(conjunction->terms().at(0));
+    } else if (term->type() == QtIVIAbstractQueryTerm::ScopeTerm) {
+        QtIVIScopeTerm* scopeTerm = static_cast<QtIVIScopeTerm*>(term);
+        scopeTerm->d_func()->m_negated = true;
+    } else if (term->type() == QtIVIAbstractQueryTerm::FilterTerm) {
+        QtIVIFilterTerm* filterTerm = static_cast<QtIVIFilterTerm*>(term);
+        filterTerm->d_func()->m_negated = true;
+    } else {
+        qCritical() << "New Term type added but not handled in" << Q_FUNC_INFO;
+    }
+
+    return;
+}
+
+void QtIVIQueryParser::handleConjunction(bool bangOperator)
+{
+    QList<QtIVIAbstractQueryTerm*> list;
+    list.prepend(m_termStack.pop());
+    list.prepend(m_termStack.pop());
+
+    QtIVIConjunctionTerm *conjunction1 = 0;
+    QtIVIConjunctionTerm *conjunction2 = 0;
+    int i = 0;
+    for (QtIVIAbstractQueryTerm *term : list) {
+        if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
+            QtIVIConjunctionTerm *conj = static_cast<QtIVIConjunctionTerm*>(term);
+            if (conj->conjunction() == m_conjunctionStack.top()) {
+                if (i == 0)
+                    conjunction1 = conj;
+                else
+                    conjunction2 = conj;
+            }
+        }
+        i++;
+    }
+
+    //Handle the bang Operator
+    if (bangOperator)
+        negateLeftMostTerm(list.at(1));
+
+    QtIVIConjunctionTerm::Conjunction conjunction = m_conjunctionStack.pop();
+    //Both are conjunctions, we can sum it together into one.
+    if (conjunction1 && conjunction2) {
+        conjunction1->d_func()->m_terms += conjunction2->d_func()->m_terms;
+        conjunction2->d_func()->m_terms.clear();
+        delete conjunction2;
+        m_termStack.push(conjunction1);
+    } else if (conjunction1) {
+        conjunction1->d_func()->m_terms.prepend(list.at(1));
+        m_termStack.push(conjunction1);
+    } else if (conjunction2) {
+        conjunction2->d_func()->m_terms.prepend(list.at(0));
+        m_termStack.push(conjunction2);
+    } else {
+        QtIVIConjunctionTerm *term = new QtIVIConjunctionTerm();
+        term->d_func()->m_conjunction = conjunction;
+        term->d_func()->m_terms = list;
+        m_termStack.push(term);
+    }
+}
+
+void QtIVIQueryParser::handleScope(bool bangOperator)
+{
+    QtIVIAbstractQueryTerm *term = m_termStack.pop();
+
+    if (bangOperator)
+        negateLeftMostTerm(term);
+
+    QtIVIScopeTerm *scopeTerm = new QtIVIScopeTerm();
+    scopeTerm->d_func()->m_term = term;
+    m_termStack.push(scopeTerm);
+}
+
+bool QtIVIQueryParser::checkIdentifier(const QString &identifer)
+{
+    if (!m_identifierList.isEmpty() && !m_identifierList.contains(identifer)) {
+        QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following identifiers:\n")).arg(identifer);
+        for (QString ident : m_identifierList)
+            errorMessage.append(QString(QLatin1String("     %1\n")).arg(ident));
+
+        setErrorString(errorMessage);
+
+        qDeleteAll(m_termStack);
+
+        return false;
+    }
+
+    return true;
+}
+
+QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
+{
+    const int INITIAL_STATE = 0;
+
+    int yytoken = -1;
+
+    tos = 0;
+    m_offset = 0;
+    column = 0;
+    state_stack[++tos] = INITIAL_STATE;
+    m_termStack.clear();
+    m_orderList.clear();
+
+    yyrestart(yyin);
+
+    while (true)
+    {
+        const int state = state_stack.at(tos);
+        if (yytoken == -1 && - TERMINAL_COUNT != action_index [state])
+            yytoken = nextToken();
+
+        if (yytoken == ERROR) {
+            setErrorString(QString(QLatin1String("Unrecognized token '%1'\n")).arg(QLatin1String(yytext)));
+            qDeleteAll(m_termStack);
+            return 0;
+        }
+
+        if (yytoken == SPACE)
+            yytoken = nextToken();
+
+        int act = t_action (state, yytoken);
+
+        if (act == ACCEPT_STATE) {
+#ifdef PARSER_DEBUG
+            qDebug() << "Representation finished. ToString" << m_termStack.top()->toString();
+#endif
+            return m_termStack.pop();
+        } else if (act > 0) {
+            if (++tos == state_stack.size())
+                reallocateStack();
+
+            sym_stack [tos] = yylval;
+            state_stack [tos] = act;
+            yytoken = -1;
+        } else if (act < 0) {
+            int r = - act - 1;
+
+#ifdef PARSER_DEBUG
+            int ridx = rule_index [r];
+            qDebug ("*** reduce using rule %d %s :::=", r + 1, spell[rule_info [ridx]]);
+            ++ridx;
+            for (int i = ridx; i < ridx + rhs [r]; ++i)
+            {
+                int symbol = rule_info [i];
+                if (const char *name = spell [symbol])
+                    qDebug (" %s", name);
+                else
+                    qDebug (" #%d", symbol);
+            }
+#endif
+
+            tos -= rhs [r];
+            act = state_stack.at(tos++);
+
+            switch (r) {
+./
+
+
+translation_unit ::= bang_clause order_term;
+translation_unit ::= bang_clause;
+
+order_term ::= LEFT_BRACKET order_clauses RIGHT_BRACKET;
+
+order_clauses ::= order_clause;
+order_clauses ::= order_clause order_clauses;
+
+order_clause ::= ASCENDING IDENTIFIER;
+/.
+              case $rule_number: {
+                    QtIVIOrderTerm order;
+                    order.d_func()->m_ascending = true;
+                    order.d_func()->m_propertyName = sym(2).toString();
+                    m_orderList.append(order);
+              } break;
+./
+order_clause ::= DESCENDING IDENTIFIER;
+/.
+              case $rule_number: {
+                    QtIVIOrderTerm order;
+                    order.d_func()->m_ascending = false;
+                    order.d_func()->m_propertyName = sym(2).toString();
+                    m_orderList.append(order);
+              } break;
+./
+
+bang_clause ::= BANG complex_clause ;
+/.
+              case $rule_number: {
+                QtIVIAbstractQueryTerm *term = m_termStack.top();
+
+                negateLeftMostTerm(term);
+              } break;
+./
+bang_clause ::= complex_clause ;
+
+complex_clause ::= parenthesed_clause complex_operator complex_clause ;
+/.
+              case $rule_number: {
+                    handleConjunction(false);
+              } break;
+./
+complex_clause ::= parenthesed_clause complex_operator BANG complex_clause ;
+/.
+              case $rule_number: {
+                  handleConjunction(true);
+              } break;
+./
+complex_clause ::= parenthesed_clause ;
+
+parenthesed_clause ::= LEFT_PAREN BANG complex_clause RIGHT_PAREN;
+/.
+              case $rule_number: {
+                  handleScope(true);
+              } break;
+./
+parenthesed_clause ::= LEFT_PAREN complex_clause RIGHT_PAREN;
+/.
+              case $rule_number: {
+                  handleScope(false);
+              } break;
+./
+parenthesed_clause ::= clause ;
+
+complex_operator ::= OR_OP ;
+/.
+              case $rule_number: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+              } break;
+./
+complex_operator ::= OR_OP2 ;
+/.
+              case $rule_number: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+              } break;
+./
+complex_operator ::= AND_OP ;
+/.
+              case $rule_number: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+              } break;
+./
+complex_operator ::= AND_OP2 ;
+/.
+              case $rule_number: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+              } break;
+./
+
+clause ::= IDENTIFIER number_operator literal ;
+/.
+              case $rule_number: {
+                    if (!checkIdentifier(sym(1).toString()))
+                        return 0;
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(1).toString();
+                    term->d_func()->m_operator = m_operatorStack.pop();
+                    term->d_func()->m_value = sym(3);
+                    m_termStack.push(term);
+              } break;
+./
+clause ::= IDENTIFIER string_operator STRING ;
+/.
+              case $rule_number: {
+                    if (!checkIdentifier(sym(1).toString()))
+                        return 0;
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(1).toString();
+                    term->d_func()->m_operator = m_operatorStack.pop();
+                    term->d_func()->m_value = sym(3);
+                    m_termStack.push(term);
+              } break;
+./
+clause ::= STRING string_operator IDENTIFIER ;
+/.
+              case $rule_number: {
+                    if (!checkIdentifier(sym(3).toString()))
+                        return 0;
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(3).toString();
+                    term->d_func()->m_operator = m_operatorStack.pop();
+                    term->d_func()->m_value = sym(1);
+                    m_termStack.push(term);
+              } break;
+./
+clause ::= literal number_operator IDENTIFIER ;
+/.
+              case $rule_number: {
+                    if (!checkIdentifier(sym(3).toString()))
+                        return 0;
+
+                    QtIVIFilterTerm::Operator op = m_operatorStack.pop();
+
+                    switch (op) {
+                        case QtIVIFilterTerm::GreaterEquals: op = QtIVIFilterTerm::LowerEquals; break;
+                        case QtIVIFilterTerm::GreaterThan: op = QtIVIFilterTerm::LowerThan; break;
+                        case QtIVIFilterTerm::LowerEquals: op = QtIVIFilterTerm::GreaterEquals; break;
+                        case QtIVIFilterTerm::LowerThan: op = QtIVIFilterTerm::GreaterThan; break;
+                        default: qFatal("The Grammer was changed but not all logic was ported properly");
+                    }
+
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(3).toString();
+                    term->d_func()->m_operator = op;
+                    term->d_func()->m_value = sym(1);
+                    m_termStack.push(term);
+              } break;
+./
+
+literal ::= INTCONSTANT ;
+literal ::= FLOATCONSTANT ;
+
+number_operator ::= GE_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::GreaterEquals);
+              } break;
+./
+number_operator ::= GT_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::GreaterThan);
+              } break;
+./
+number_operator ::= LE_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::LowerEquals);
+              } break;
+./
+number_operator ::= LT_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::LowerThan);
+              } break;
+./
+number_operator ::= multi_operator ;
+
+string_operator ::= multi_operator ;
+string_operator ::= IC_EQ_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::EqualsCaseInsensitive);
+              } break;
+./
+
+multi_operator ::= EQ_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+              } break;
+./
+multi_operator ::= EQ_OP2 ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+              } break;
+./
+multi_operator ::= NE_OP ;
+/.
+              case $rule_number: {
+                  m_operatorStack.push(QtIVIFilterTerm::Unequals);
+              } break;
+./
+
+/.
+            } // switch
+
+            state_stack [tos] = nt_action (act, lhs [r] - TERMINAL_COUNT);
+        } else {
+            int ers = state;
+            int shifts = 0;
+            int reduces = 0;
+            QList<int> expectedTokens;
+            for (int tk = 0; tk < TERMINAL_COUNT; ++tk) {
+
+                int k = t_action(ers, tk);
+
+
+                if (! k)
+                    continue;
+                else if (k < 0)
+                    ++reduces;
+                else if (spell[tk]) {
+                    if (shifts < 7)
+                        expectedTokens.append(tk);
+                    ++shifts;
+                }
+            }
+
+            QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following types:\n")).arg(QLatin1String(spell[yytoken]));
+            for (int token : expectedTokens)
+                errorMessage.append(QString(QLatin1String("     %1\n")).arg(QLatin1String(spell[token])));
+
+            setErrorString(errorMessage);
+
+            qDeleteAll(m_termStack);
+
+            return 0;
+        }
+    }
+
+    return 0;
+}
+
+void QtIVIQueryParser::setErrorString(const QString &error)
+{
+    int err_col = column - yyleng;
+
+    m_error = QString(QLatin1String(":%1 ERROR: %2")).arg(err_col).arg(error);
+
+    m_error.append(m_query).append(QLatin1String("\n"));
+    QString marker(QLatin1String("^"));
+
+    for (int i=0; i<err_col; i++)
+        marker.prepend(QLatin1String(" "));
+
+    for (unsigned long i=0; i<yyleng - 1; i++)
+        marker.append(QLatin1String("-"));
+
+    m_error.append(marker);
+}
+
+QT_END_NAMESPACE
+
+./
diff --git a/src/ivicore/queryparser/qtiviqueryparser.l b/src/ivicore/queryparser/qtiviqueryparser.l
new file mode 100644
index 0000000..b5faa65
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryparser.l
@@ -0,0 +1,181 @@
+
+%option noyywrap
+%option yylineno
+
+/* New lines needed to workaround the sanitize script to not handle this as a autogenerated file */
+
+
+
+
+%top{
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+// This file was generated by flex - DO NOT EDIT!
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <cassert>
+#include <QString>
+#include <QVariant>
+#include <QByteArray>
+
+#if __cplusplus > 199711L
+#define register      // Deprecated in C++11.
+#endif  // #if __cplusplus > 199711L
+
+#define YY_NO_INPUT
+#define YY_DECL int QtIVIQueryParser::nextToken()
+#define YY_USER_INIT initBuffer()
+#define YY_USER_ACTION calcCurrentColumn();
+extern void readQueryBuffer(char* buffer,unsigned int& numBytesRead,int maxBytesToRead);
+int isatty (int ) {
+    return 0;
+}
+#define YY_INPUT(buf,result,max_size) \
+    unsigned int res = result; \
+    readQueryBuffer(buf, res, max_size); \
+    result = res;
+}
+
+hex [0-9a-fA-F]
+dec [1-9][0-9]*
+oct [0-7]
+digit [0-9]
+
+fract [+-]?{digit}*\.{digit}+|{digit}+\.
+exp [eE][+-]?{digit}+
+
+hexfract {hex}*\.{hex}+|{hex}+\.
+binexp [pP][+-]?{digit}+
+
+icst [+-]?({dec}|0{oct}*|0[xX]{hex}+)
+
+%%
+
+"!" { return BANG; }
+"!=" { return NE_OP; }
+"(" { return LEFT_PAREN; }
+")" { return RIGHT_PAREN; }
+">" { return GT_OP; }
+">=" { return GE_OP; }
+"<" { return LT_OP; }
+"<=" { return LE_OP; }
+"||" { return OR_OP; }
+"|" { return OR_OP2; }
+"&&" { return AND_OP; }
+"&" { return AND_OP2; }
+"~=" { return IC_EQ_OP; }
+"==" { return EQ_OP; }
+"=" { return EQ_OP2; }
+
+"/" { return ASCENDING; }
+"\\" { return DESCENDING; }
+"[" { return LEFT_BRACKET; }
+"]" { return RIGHT_BRACKET; }
+
+[_a-zA-Z][_a-zA-Z0-9]* {
+  yylval = QVariant(QLatin1String(yytext));
+
+  return IDENTIFIER;
+}
+
+\"(\\.|[^"])*\" {
+  QString text = QLatin1String(yytext);
+  text.truncate(text.count() - 1);
+  yylval = text.mid(1);
+
+  return STRING;
+}
+
+\'(\\.|[^'])*\' {
+  QString text = QLatin1String(yytext);
+  text.truncate(text.count() - 1);
+  yylval = text.mid(1);
+
+  return STRING;
+}
+
+{icst} {
+  yylval = (int) strtol (yytext, 0, 0);
+  return INTCONSTANT;
+}
+
+{fract}{exp}? {
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+
+{digit}+{exp} {
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+
+0[xX]{hexfract}{binexp} {
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+
+0[xX]{hex}+{binexp} {
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+
+[[:space:]]* {
+    return SPACE;
+}
+
+. {
+  return ERROR;
+}
+
+
+%%
+
diff --git a/src/ivicore/queryparser/qtiviqueryparser_flex_p.h b/src/ivicore/queryparser/qtiviqueryparser_flex_p.h
new file mode 100644
index 0000000..8a4690d
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryparser_flex_p.h
@@ -0,0 +1,2471 @@
+#line 11 "/home/gagi/work/qtas/tqtc-qtivi/src/ivicore/queryparser/qtiviqueryparser.l"
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+// This file was generated by flex - DO NOT EDIT!
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <cassert>
+#include <QString>
+#include <QVariant>
+#include <QByteArray>
+
+#if __cplusplus > 199711L
+#define register      // Deprecated in C++11.
+#endif  // #if __cplusplus > 199711L
+
+#define YY_NO_INPUT
+#define YY_DECL int QtIVIQueryParser::nextToken()
+#define YY_USER_INIT initBuffer()
+#define YY_USER_ACTION calcCurrentColumn();
+extern void readQueryBuffer(char* buffer,unsigned int& numBytesRead,int maxBytesToRead);
+int isatty (int ) {
+    return 0;
+}
+#define YY_INPUT(buf,result,max_size) \
+    unsigned int res = result; \
+    readQueryBuffer(buf, res, max_size); \
+    result = res;
+
+
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+
+
+
+
+
+
+
+
+
+
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+
+
+
+
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+
+
+
+
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+
+    
+
+
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+
+
+
+
+
+
+
+
+
+    
+    
+    
+    
+
+
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin  )
+
+
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyleng;
+
+extern FILE *yyin, *yyout;
+
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+
+
+    
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE yylex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < yyleng; ++yyl )\
+                    if ( yytext[yyl] == '\n' )\
+                        --yylineno;\
+            }while(0)
+    #define YY_LINENO_REWIND_TO(dst) \
+            do {\
+                const char *p;\
+                for ( p = yy_cp-1; p >= (dst); --p)\
+                    if ( *p == '\n' )\
+                        --yylineno;\
+            }while(0)
+    
+
+
+
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+
+
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
+
+
+#define yy_new_buffer yy_create_buffer
+
+
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+
+/* Begin user sect3 */
+
+#define yywrap() (/*CONSTCOND*/1)
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+
+typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
+extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
+#define yytext_ptr yytext
+
+
+
+
+
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
+static void yy_fatal_error (yyconst char msg[]  );
+
+
+
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = 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 30
+#define YY_END_OF_BUFFER 31
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[79] =
+    {   0,
+       28,   28,   31,   29,   28,   28,    1,   29,   12,   29,
+        3,    4,   29,   29,   16,   23,   23,    7,   15,    5,
+       20,   18,   17,   19,   10,   29,   28,    2,    0,   21,
+        0,   11,    0,   22,    0,    0,   23,   23,   24,   24,
+       23,    0,    0,    0,   23,    8,   14,    6,   20,    9,
+       13,    0,   21,    0,    0,   22,    0,   23,    0,    0,
+       23,    0,    0,   25,    0,   23,   23,    0,   24,    0,
+        0,    0,    0,    0,   27,    0,   26,    0
+    } ;
+
+static yyconst YY_CHAR yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        2,    2,    2,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    1,    1,    1,    6,    7,    8,
+        9,    1,   10,    1,   10,   11,   12,   13,   14,   14,
+       14,   14,   14,   14,   14,   15,   15,    1,    1,   16,
+       17,   18,    1,    1,   19,   19,   19,   19,   20,   19,
+       21,   21,   21,   21,   21,   21,   21,   21,   21,   22,
+       21,   21,   21,   21,   21,   21,   21,   23,   21,   21,
+       24,   25,   26,    1,   21,    1,   19,   19,   19,   19,
+
+       20,   19,   21,   21,   21,   21,   21,   21,   21,   21,
+       21,   22,   21,   21,   21,   21,   21,   21,   21,   23,
+       21,   21,    1,   27,    1,   28,    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,    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,    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,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst YY_CHAR yy_meta[29] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        2,    1,    3,    3,    3,    1,    1,    1,    4,    3,
+        5,    5,    5,    1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_uint16_t yy_base[88] =
+    {   0,
+        0,    0,  152,  200,   27,   29,  134,   28,  140,   27,
+      200,  200,   24,   27,  200,   43,   25,  128,  111,  101,
+        0,  200,  200,  200,   87,   90,   41,  200,   42,  200,
+       43,  200,   44,  200,   52,   47,   67,   59,   71,   74,
+       83,   36,   82,   65,   82,  200,  200,  200,    0,  200,
+      200,   74,   78,   95,   94,   97,  102,   97,  102,    0,
+      110,  116,  119,  122,    0,   53,    0,  125,  128,   49,
+       43,  134,  140,  143,  146,  149,  152,  200,  167,  172,
+      176,  177,  182,  187,  191,  193,  195
+    } ;
+
+static yyconst flex_int16_t yy_def[88] =
+    {   0,
+       78,    1,   78,   78,   78,   78,   78,   79,   78,   80,
+       78,   78,   78,   78,   78,   78,   81,   78,   78,   78,
+       82,   78,   78,   78,   78,   78,   78,   78,   79,   78,
+       83,   78,   80,   78,   84,   78,   78,   78,   78,   78,
+       16,   41,   78,   85,   81,   78,   78,   78,   82,   78,
+       78,   79,   79,   83,   80,   80,   84,   78,   78,   86,
+       78,   78,   78,   78,   87,   85,   86,   78,   78,   87,
+       87,   78,   78,   78,   78,   78,   78,    0,   78,   78,
+       78,   78,   78,   78,   78,   78,   78
+    } ;
+
+static yyconst flex_uint16_t yy_nxt[229] =
+    {   0,
+        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
+       14,   15,   16,   17,   17,   18,   19,   20,   21,   21,
+       21,   21,   21,   22,   23,   24,   25,   26,   27,   27,
+       27,   27,   30,   34,   36,   40,   37,   38,   38,   39,
+       39,   39,   27,   27,   43,   29,   30,   53,   42,   42,
+       34,   35,   31,   40,   33,   41,   41,   42,   56,   39,
+       39,   39,   43,   71,   73,   44,   31,   54,   35,   36,
+       73,   61,   61,   61,   72,   65,   57,   36,   30,   58,
+       58,   59,   30,   39,   39,   39,   39,   39,   39,   60,
+       62,   63,   40,   62,   64,   64,   64,   29,   31,   53,
+
+       34,   43,   31,   34,   33,   78,   51,   36,   56,   58,
+       58,   59,   36,   50,   59,   59,   59,   48,   35,   54,
+       36,   35,   61,   61,   61,   68,   57,   47,   69,   69,
+       69,   64,   64,   64,   64,   64,   64,   69,   69,   69,
+       69,   69,   69,   74,   46,   32,   75,   75,   75,   76,
+       28,   78,   77,   77,   77,   75,   75,   75,   75,   75,
+       75,   77,   77,   77,   77,   77,   77,   29,   29,   29,
+       29,   29,   33,   33,   33,   33,   33,   45,   45,   49,
+       49,   49,   52,   52,   52,   52,   52,   55,   55,   55,
+       55,   55,   66,   66,   66,   67,   67,   70,   70,    3,
+
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78
+    } ;
+
+static yyconst flex_int16_t yy_chk[229] =
+    {   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,    5,    5,
+        6,    6,    8,   10,   13,   17,   13,   13,   13,   14,
+       14,   14,   27,   27,   17,   31,   29,   31,   42,   42,
+       33,   10,    8,   16,   35,   16,   16,   16,   35,   36,
+       36,   36,   16,   66,   71,   16,   29,   31,   33,   38,
+       70,   38,   38,   38,   66,   44,   35,   37,   52,   37,
+       37,   37,   53,   39,   39,   39,   40,   40,   40,   37,
+       39,   43,   45,   40,   43,   43,   43,   54,   52,   54,
+
+       55,   45,   53,   56,   57,   41,   26,   58,   57,   58,
+       58,   58,   59,   25,   59,   59,   59,   20,   55,   54,
+       61,   56,   61,   61,   61,   62,   57,   19,   62,   62,
+       62,   63,   63,   63,   64,   64,   64,   68,   68,   68,
+       69,   69,   69,   72,   18,    9,   72,   72,   72,   73,
+        7,    3,   73,   73,   73,   74,   74,   74,   75,   75,
+       75,   76,   76,   76,   77,   77,   77,   79,   79,   79,
+       79,   79,   80,   80,   80,   80,   80,   81,   81,   82,
+       82,   82,   83,   83,   83,   83,   83,   84,   84,   84,
+       84,   84,   85,   85,   85,   86,   86,   87,   87,   78,
+
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78
+    } ;
+
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[31] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+/* New lines needed to workaround the sanitize script to not handle this as a autogenerated file */
+
+
+
+
+#define INITIAL 0
+
+
+
+
+
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+
+
+
+static int yy_init_globals (void );
+
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+
+int yylex_destroy (void );
+
+
+
+int yyget_debug (void );
+
+
+
+void yyset_debug (int debug_flag  );
+
+
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+
+
+FILE *yyget_in (void );
+
+
+
+void yyset_in  (FILE * _in_str  );
+
+
+
+FILE *yyget_out (void );
+
+
+
+void yyset_out  (FILE * _out_str  );
+
+
+
+yy_size_t yyget_leng (void );
+
+
+
+char *yyget_text (void );
+
+
+
+int yyget_lineno (void );
+
+
+
+void yyset_lineno (int _line_number  );
+
+
+
+
+
+
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (void );
+#else
+extern int yywrap (void );
+#endif
+#endif
+
+
+#ifndef YY_NO_UNPUT
+    
+    static void yyunput (int c,char *buf_ptr  );
+    
+#endif
+
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+
+
+
+
+
+
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#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,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
+#endif
+
+
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+
+
+
+
+/* end tables serialization structures and prototypes */
+
+
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+
+
+
+
+
+
+
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK /*LINTED*/break;
+#endif
+
+
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
+    
+
+    
+    
+
+
+
+
+
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
+
+		yy_load_buffer_state( );
+		}
+
+	{
+
+
+
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			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 >= 79 )
+					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_base[yy_current_state] != 200 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+			{
+			yy_size_t yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
+				if ( yytext[yyl] == '\n' )
+					   
+    yylineno++;
+;
+			}
+
+
+do_action:	/* This label is used only to access EOF actions. */
+
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+{ return BANG; }
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+{ return NE_OP; }
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+{ return LEFT_PAREN; }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+{ return RIGHT_PAREN; }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+{ return GT_OP; }
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+{ return GE_OP; }
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+{ return LT_OP; }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+{ return LE_OP; }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+{ return OR_OP; }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+{ return OR_OP2; }
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+{ return AND_OP; }
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+{ return AND_OP2; }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+{ return IC_EQ_OP; }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+{ return EQ_OP; }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+{ return EQ_OP2; }
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+{ return ASCENDING; }
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+{ return DESCENDING; }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+{ return LEFT_BRACKET; }
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+{ return RIGHT_BRACKET; }
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+{
+  yylval = QVariant(QLatin1String(yytext));
+
+  return IDENTIFIER;
+}
+	YY_BREAK
+case 21:
+/* rule 21 can match eol */
+YY_RULE_SETUP
+{
+  QString text = QLatin1String(yytext);
+  text.truncate(text.count() - 1);
+  yylval = text.mid(1);
+
+  return STRING;
+}
+	YY_BREAK
+case 22:
+/* rule 22 can match eol */
+YY_RULE_SETUP
+{
+  QString text = QLatin1String(yytext);
+  text.truncate(text.count() - 1);
+  yylval = text.mid(1);
+
+  return STRING;
+}
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+{
+  yylval = (int) strtol (yytext, 0, 0);
+  return INTCONSTANT;
+}
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+{
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+{
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+{
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+{
+  yylval = QByteArray::fromRawData(yytext, yyleng).toDouble();
+  return FLOATCONSTANT;
+}
+	YY_BREAK
+case 28:
+/* rule 28 can match eol */
+YY_RULE_SETUP
+{
+    return SPACE;
+}
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+{
+  return ERROR;
+}
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+ECHO;
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( yywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+	} /* end of user's declarations */
+} /* end of yylex */
+
+
+
+
+
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	yy_size_t number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the 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);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyrestart(yyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	yy_state_type yy_current_state;
+	char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		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 >= 79 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
+
+	YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	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 >= 79 )
+			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 == 78);
+
+		return yy_is_jam ? 0 : yy_current_state;
+}
+
+
+#ifndef YY_NO_UNPUT
+
+    static void yyunput (int c, char * yy_bp )
+{
+	char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up yytext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		yy_size_t number_to_move = (yy_n_chars) + 2;
+		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+
+    if ( c == '\n' ){
+        --yylineno;
+    }
+
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#endif
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					yyrestart(yyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( yywrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	if ( c == '\n' )
+		   
+    yylineno++;
+;
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
+	}
+
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
+
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_buf_size = (yy_size_t)size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	yy_init_buffer(b,file );
+
+	return b;
+}
+
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		yyfree((void *) b->yy_ch_buf  );
+
+	yyfree((void *) b  );
+}
+
+
+/* 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.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+
+    
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+
+
+
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yy_switch_to_buffer(b  );
+
+	return b;
+}
+
+
+
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+	return yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+
+
+
+/** 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 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.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	yy_size_t i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+
+
+
+
+
+
+
+
+
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+			(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    
+    return yylineno;
+}
+
+
+
+
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t yyget_leng  (void)
+{
+        return yyleng;
+}
+
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+
+
+
+/** Set the current line number.
+ * @param _line_number line number
+ * 
+ */
+void yyset_lineno (int  _line_number )
+{
+    
+    
+    yylineno = _line_number;
+}
+
+
+
+
+
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param _in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  _in_str )
+{
+        yyin = _in_str ;
+}
+
+
+
+void yyset_out (FILE *  _out_str )
+{
+        yyout = _out_str ;
+}
+
+
+
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+
+
+void yyset_debug (int  _bdebug )
+{
+        yy_flex_debug = _bdebug ;
+}
+
+
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+
+    
+    /* We do not touch yylineno unless the option is enabled. */
+    yylineno =  1;
+    
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+
+
+
+
+
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+
+
+
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+
+
+/*
+ * Internal utility routines.
+ */
+
+
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+		
+	int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+
+
+void *yyalloc (yy_size_t  size )
+{
+			return (void *) malloc( size );
+}
+
+
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+		
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+
+
+void yyfree (void * ptr )
+{
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+
+#define YYTABLES_NAME "yytables"
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ivicore/queryparser/qtiviqueryparser_p.h b/src/ivicore/queryparser/qtiviqueryparser_p.h
new file mode 100644
index 0000000..f9691e2
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryparser_p.h
@@ -0,0 +1,721 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+// This file was generated by qlalr - DO NOT EDIT!
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QTIVIQUERYPARSER_P_H
+#define QTIVIQUERYPARSER_P_H
+
+#if defined(ERROR)
+#  undef ERROR
+#endif
+
+class QtIVIQueryParserTable
+{
+public:
+  enum VariousConstants {
+    EOF_SYMBOL = 0,
+    AND_OP = 2,
+    AND_OP2 = 1,
+    ASCENDING = 16,
+    BANG = 5,
+    DESCENDING = 17,
+    EQ_OP = 6,
+    EQ_OP2 = 7,
+    ERROR = 25,
+    FLOATCONSTANT = 21,
+    GE_OP = 9,
+    GT_OP = 10,
+    IC_EQ_OP = 8,
+    IDENTIFIER = 22,
+    INTCONSTANT = 20,
+    LEFT_BRACKET = 18,
+    LEFT_PAREN = 14,
+    LE_OP = 11,
+    LT_OP = 12,
+    NE_OP = 13,
+    OR_OP = 4,
+    OR_OP2 = 3,
+    RIGHT_BRACKET = 19,
+    RIGHT_PAREN = 15,
+    SPACE = 24,
+    STRING = 23,
+
+    ACCEPT_STATE = 56,
+    RULE_COUNT = 36,
+    STATE_COUNT = 57,
+    TERMINAL_COUNT = 26,
+    NON_TERMINAL_COUNT = 14,
+
+    GOTO_INDEX_OFFSET = 57,
+    GOTO_INFO_OFFSET = 114,
+    GOTO_CHECK_OFFSET = 114
+  };
+
+  static const char  *const    spell [];
+  static const short             lhs [];
+  static const short             rhs [];
+  static const short    goto_default [];
+  static const short  action_default [];
+  static const short    action_index [];
+  static const short     action_info [];
+  static const short    action_check [];
+
+  static inline int nt_action (int state, int nt)
+  {
+    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
+      return goto_default [nt];
+
+    return action_info [GOTO_INFO_OFFSET + yyn];
+  }
+
+  static inline int t_action (int state, int token)
+  {
+    const int yyn = action_index [state] + token;
+
+    if (yyn < 0 || action_check [yyn] != token)
+      return - action_default [state];
+
+    return action_info [yyn];
+  }
+};
+
+
+const char *const QtIVIQueryParserTable::spell [] = {
+  "end of file", "&", "&&", "|", "||", "!", "==", "=", "~=", ">=", 
+  ">", "<=", "<", "!=", "(", ")", "/", "\\", "[", "]", 
+  "integer", "float", "identifier", "string", 0, 0};
+
+const short QtIVIQueryParserTable::lhs [] = {
+  26, 26, 28, 29, 29, 30, 30, 27, 27, 31, 
+  31, 31, 32, 32, 32, 33, 33, 33, 33, 34, 
+  34, 34, 34, 36, 36, 35, 35, 35, 35, 35, 
+  37, 37, 38, 38, 38, 39};
+
+const short QtIVIQueryParserTable::rhs [] = {
+  2, 1, 3, 1, 2, 2, 2, 2, 1, 3, 
+  4, 1, 4, 3, 1, 1, 1, 1, 1, 3, 
+  3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 2};
+
+const short QtIVIQueryParserTable::action_default [] = {
+  0, 0, 25, 0, 24, 0, 0, 2, 15, 9, 
+  0, 12, 0, 8, 33, 34, 26, 27, 32, 28, 
+  29, 35, 30, 0, 0, 20, 21, 0, 0, 0, 
+  13, 14, 31, 0, 22, 0, 1, 0, 0, 4, 
+  0, 6, 7, 5, 3, 30, 0, 23, 18, 19, 
+  16, 17, 0, 0, 10, 11, 36};
+
+const short QtIVIQueryParserTable::goto_default [] = {
+  12, 7, 36, 40, 39, 9, 11, 52, 8, 23, 
+  10, 24, 22, 0};
+
+const short QtIVIQueryParserTable::action_index [] = {
+  33, 19, -26, 88, -26, 68, 13, -13, -26, -26, 
+  56, 47, 22, -26, -26, -26, -26, -26, -26, -26, 
+  -26, -26, -16, -5, -14, -26, -26, 9, -4, -9, 
+  -26, -26, -26, -19, -26, -3, -26, -20, -21, 1, 
+  -15, -26, -26, -26, -26, -26, -22, -26, -26, -26, 
+  -26, -26, 38, 14, -26, -26, -26, 
+
+  -14, -5, -14, -14, -14, -1, -6, -14, -14, -14, 
+  2, -14, -14, -14, -14, -14, -14, -14, -14, -14, 
+  -14, -14, -14, 0, -14, -14, -14, -4, -14, -14, 
+  -14, -14, -14, -14, -14, -14, -14, -14, -14, 6, 
+  -14, -14, -14, -14, -14, -14, -14, -14, -14, -14, 
+  -14, -14, -2, -3, -14, -14, -14};
+
+const short QtIVIQueryParserTable::action_info [] = {
+  47, 42, 41, 34, 44, 35, 30, -31, 0, 26, 
+  0, 31, 0, 37, 38, 4, 2, 37, 38, 14, 
+  15, 18, 56, 5, 0, 0, 21, 0, 5, 4, 
+  2, 3, 6, 5, 4, 2, 3, 6, 1, 4, 
+  2, 3, 6, 53, 0, 0, 0, 5, 49, 48, 
+  51, 50, 5, 4, 2, 3, 6, 0, 4, 2, 
+  3, 6, 14, 15, 0, 16, 17, 19, 20, 21, 
+  0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 
+  0, 0, 5, 0, 0, 0, 0, 0, 4, 2, 
+  3, 6, 0, 0, 14, 15, 18, 16, 17, 19, 
+  20, 21, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 
+
+  13, 29, 55, 54, 28, 33, 32, 0, 0, 43, 
+  25, 46, 0, 0, 45, 0, 0, 0, 0, 0};
+
+const short QtIVIQueryParserTable::action_check [] = {
+  22, 22, 22, 22, 19, 18, 15, 23, -1, 23, 
+  -1, 15, -1, 16, 17, 20, 21, 16, 17, 6, 
+  7, 8, 0, 14, -1, -1, 13, -1, 14, 20, 
+  21, 22, 23, 14, 20, 21, 22, 23, 5, 20, 
+  21, 22, 23, 5, -1, -1, -1, 14, 1, 2, 
+  3, 4, 14, 20, 21, 22, 23, -1, 20, 21, 
+  22, 23, 6, 7, -1, 9, 10, 11, 12, 13, 
+  -1, -1, -1, 5, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 14, -1, -1, -1, -1, -1, 20, 21, 
+  22, 23, -1, -1, 6, 7, 8, 9, 10, 11, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 
+
+  5, 5, 5, 5, 5, 11, 12, -1, -1, 3, 
+  10, 9, -1, -1, 12, -1, -1, -1, -1, -1};
+
+
+
+#include <QtCore>
+#include <QtIVICore/QtIVIAbstractQueryTerm>
+#include <QtIVICore/private/qtiviqueryterm_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//TODO Find a better way of doing it, this is not reentrant
+QString* currentQuery = 0;
+unsigned int *currentOffset = 0;
+void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead)
+{
+    if (!currentQuery) {
+        numBytesRead=0;
+        return;
+    }
+
+    int numBytesToRead = maxBytesToRead;
+    int bytesRemaining = currentQuery->count()-(*currentOffset);
+    int i;
+    if ( numBytesToRead > bytesRemaining )
+        numBytesToRead = bytesRemaining;
+
+
+    for (i = 0; i < numBytesToRead; i++) {
+        buffer[i] = currentQuery->toLatin1().at(*currentOffset+i);
+    }
+
+    numBytesRead = numBytesToRead;
+    *currentOffset += numBytesToRead;
+}
+
+class QtIVIQueryParser: protected QtIVIQueryParserTable
+{
+public:
+    union Value {
+      int i;
+      float f;
+      const QString *s;
+    };
+
+public:
+    QtIVIQueryParser();
+    virtual ~QtIVIQueryParser();
+
+    QtIVIAbstractQueryTerm *parse();
+
+    void setQuery(const QString& query)
+    {
+        m_query = query;
+    }
+
+    QString lastError() {
+        return m_error;
+    }
+
+    void setAllowedIdentifiers(const QSet<QString> &list)
+    {
+        m_identifierList = list;
+    }
+
+    QList<QtIVIOrderTerm> orderTerms() const
+    {
+        return m_orderList;
+    }
+
+protected:
+    inline void reallocateStack();
+
+    inline QVariant &sym(int index)
+    {
+        return sym_stack [tos + index - 1];
+    }
+
+    void initBuffer()
+    {
+        currentQuery = &m_query;
+        currentOffset = &m_offset;
+    }
+
+    void setErrorString(const QString &error);
+
+    void calcCurrentColumn();
+
+    int nextToken();
+
+    void handleConjunction(bool bangOperator);
+    void handleScope(bool bang);
+
+    void negateLeftMostTerm(QtIVIAbstractQueryTerm *term);
+
+    bool checkIdentifier(const QString &identifer);
+
+protected:
+    QString m_query;
+    unsigned int m_offset;
+    QString m_error;
+    QSet<QString> m_identifierList;
+
+    int column;
+    int tos;
+    QVector<QVariant> sym_stack;
+    QVector<int> state_stack;
+    QVariant yylval;
+
+    QStack<QtIVIAbstractQueryTerm*> m_termStack;
+    QStack<QtIVIFilterTerm::Operator> m_operatorStack;
+    QStack<QtIVIConjunctionTerm::Conjunction> m_conjunctionStack;
+    QList<QtIVIOrderTerm> m_orderList;
+};
+
+inline void QtIVIQueryParser::reallocateStack()
+{
+    int size = state_stack.size();
+    if (size == 0)
+        size = 128;
+    else
+        size <<= 1;
+
+    sym_stack.resize(size);
+    state_stack.resize(size);
+}
+
+
+
+QtIVIQueryParser::QtIVIQueryParser():
+    m_offset(0),
+    column(0),
+    tos(0)
+{
+      reallocateStack();
+}
+
+#include "qtiviqueryparser_flex_p.h"
+
+QtIVIQueryParser::~QtIVIQueryParser()
+{
+    currentOffset = 0;
+    currentQuery = 0;
+
+    //We need to reset the lexer to reinitialize it when needed
+    yy_init = 0;
+
+    //Get rid of the unused warning
+    if (0)
+        yyunput(0, 0);}
+
+void QtIVIQueryParser::calcCurrentColumn()
+{
+    column += yyleng;
+}
+
+void QtIVIQueryParser::negateLeftMostTerm(QtIVIAbstractQueryTerm *term)
+{
+    if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
+        QtIVIConjunctionTerm* conjunction = static_cast<QtIVIConjunctionTerm*>(term);
+        negateLeftMostTerm(conjunction->terms().at(0));
+    } else if (term->type() == QtIVIAbstractQueryTerm::ScopeTerm) {
+        QtIVIScopeTerm* scopeTerm = static_cast<QtIVIScopeTerm*>(term);
+        scopeTerm->d_func()->m_negated = true;
+    } else if (term->type() == QtIVIAbstractQueryTerm::FilterTerm) {
+        QtIVIFilterTerm* filterTerm = static_cast<QtIVIFilterTerm*>(term);
+        filterTerm->d_func()->m_negated = true;
+    } else {
+        qCritical() << "New Term type added but not handled in" << Q_FUNC_INFO;
+    }
+
+    return;
+}
+
+void QtIVIQueryParser::handleConjunction(bool bangOperator)
+{
+    QList<QtIVIAbstractQueryTerm*> list;
+    list.prepend(m_termStack.pop());
+    list.prepend(m_termStack.pop());
+
+    QtIVIConjunctionTerm *conjunction1 = 0;
+    QtIVIConjunctionTerm *conjunction2 = 0;
+    int i = 0;
+    for (QtIVIAbstractQueryTerm *term : list) {
+        if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
+            QtIVIConjunctionTerm *conj = static_cast<QtIVIConjunctionTerm*>(term);
+            if (conj->conjunction() == m_conjunctionStack.top()) {
+                if (i == 0)
+                    conjunction1 = conj;
+                else
+                    conjunction2 = conj;
+            }
+        }
+        i++;
+    }
+
+    //Handle the bang Operator
+    if (bangOperator)
+        negateLeftMostTerm(list.at(1));
+
+    QtIVIConjunctionTerm::Conjunction conjunction = m_conjunctionStack.pop();
+    //Both are conjunctions, we can sum it together into one.
+    if (conjunction1 && conjunction2) {
+        conjunction1->d_func()->m_terms += conjunction2->d_func()->m_terms;
+        conjunction2->d_func()->m_terms.clear();
+        delete conjunction2;
+        m_termStack.push(conjunction1);
+    } else if (conjunction1) {
+        conjunction1->d_func()->m_terms.prepend(list.at(1));
+        m_termStack.push(conjunction1);
+    } else if (conjunction2) {
+        conjunction2->d_func()->m_terms.prepend(list.at(0));
+        m_termStack.push(conjunction2);
+    } else {
+        QtIVIConjunctionTerm *term = new QtIVIConjunctionTerm();
+        term->d_func()->m_conjunction = conjunction;
+        term->d_func()->m_terms = list;
+        m_termStack.push(term);
+    }
+}
+
+void QtIVIQueryParser::handleScope(bool bangOperator)
+{
+    QtIVIAbstractQueryTerm *term = m_termStack.pop();
+
+    if (bangOperator)
+        negateLeftMostTerm(term);
+
+    QtIVIScopeTerm *scopeTerm = new QtIVIScopeTerm();
+    scopeTerm->d_func()->m_term = term;
+    m_termStack.push(scopeTerm);
+}
+
+bool QtIVIQueryParser::checkIdentifier(const QString &identifer)
+{
+    if (!m_identifierList.isEmpty() && !m_identifierList.contains(identifer)) {
+        QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following identifiers:\n")).arg(identifer);
+        for (QString ident : m_identifierList)
+            errorMessage.append(QString(QLatin1String("     %1\n")).arg(ident));
+
+        setErrorString(errorMessage);
+
+        qDeleteAll(m_termStack);
+
+        return false;
+    }
+
+    return true;
+}
+
+QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
+{
+    const int INITIAL_STATE = 0;
+
+    int yytoken = -1;
+
+    tos = 0;
+    m_offset = 0;
+    column = 0;
+    state_stack[++tos] = INITIAL_STATE;
+    m_termStack.clear();
+    m_orderList.clear();
+
+    yyrestart(yyin);
+
+    while (true)
+    {
+        const int state = state_stack.at(tos);
+        if (yytoken == -1 && - TERMINAL_COUNT != action_index [state])
+            yytoken = nextToken();
+
+        if (yytoken == ERROR) {
+            setErrorString(QString(QLatin1String("Unrecognized token '%1'\n")).arg(QLatin1String(yytext)));
+            qDeleteAll(m_termStack);
+            return 0;
+        }
+
+        if (yytoken == SPACE)
+            yytoken = nextToken();
+
+        int act = t_action (state, yytoken);
+
+        if (act == ACCEPT_STATE) {
+#ifdef PARSER_DEBUG
+            qDebug() << "Representation finished. ToString" << m_termStack.top()->toString();
+#endif
+            return m_termStack.pop();
+        } else if (act > 0) {
+            if (++tos == state_stack.size())
+                reallocateStack();
+
+            sym_stack [tos] = yylval;
+            state_stack [tos] = act;
+            yytoken = -1;
+        } else if (act < 0) {
+            int r = - act - 1;
+
+#ifdef PARSER_DEBUG
+            int ridx = rule_index [r];
+            qDebug ("*** reduce using rule %d %s :::=", r + 1, spell[rule_info [ridx]]);
+            ++ridx;
+            for (int i = ridx; i < ridx + rhs [r]; ++i)
+            {
+                int symbol = rule_info [i];
+                if (const char *name = spell [symbol])
+                    qDebug (" %s", name);
+                else
+                    qDebug (" #%d", symbol);
+            }
+#endif
+
+            tos -= rhs [r];
+            act = state_stack.at(tos++);
+
+            switch (r) {
+
+              case 5: {
+                    QtIVIOrderTerm order;
+                    order.d_func()->m_ascending = true;
+                    order.d_func()->m_propertyName = sym(2).toString();
+                    m_orderList.append(order);
+              } break;
+
+              case 6: {
+                    QtIVIOrderTerm order;
+                    order.d_func()->m_ascending = false;
+                    order.d_func()->m_propertyName = sym(2).toString();
+                    m_orderList.append(order);
+              } break;
+
+              case 7: {
+                QtIVIAbstractQueryTerm *term = m_termStack.top();
+
+                negateLeftMostTerm(term);
+              } break;
+
+              case 9: {
+                    handleConjunction(false);
+              } break;
+
+              case 10: {
+                  handleConjunction(true);
+              } break;
+
+              case 12: {
+                  handleScope(true);
+              } break;
+
+              case 13: {
+                  handleScope(false);
+              } break;
+
+              case 15: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+              } break;
+
+              case 16: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+              } break;
+
+              case 17: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+              } break;
+
+              case 18: {
+                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+              } break;
+
+              case 19: {
+                    if (!checkIdentifier(sym(1).toString()))
+                        return 0;
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(1).toString();
+                    term->d_func()->m_operator = m_operatorStack.pop();
+                    term->d_func()->m_value = sym(3);
+                    m_termStack.push(term);
+              } break;
+
+              case 20: {
+                    if (!checkIdentifier(sym(1).toString()))
+                        return 0;
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(1).toString();
+                    term->d_func()->m_operator = m_operatorStack.pop();
+                    term->d_func()->m_value = sym(3);
+                    m_termStack.push(term);
+              } break;
+
+              case 21: {
+                    if (!checkIdentifier(sym(3).toString()))
+                        return 0;
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(3).toString();
+                    term->d_func()->m_operator = m_operatorStack.pop();
+                    term->d_func()->m_value = sym(1);
+                    m_termStack.push(term);
+              } break;
+
+              case 22: {
+                    if (!checkIdentifier(sym(3).toString()))
+                        return 0;
+
+                    QtIVIFilterTerm::Operator op = m_operatorStack.pop();
+
+                    switch (op) {
+                        case QtIVIFilterTerm::GreaterEquals: op = QtIVIFilterTerm::LowerEquals; break;
+                        case QtIVIFilterTerm::GreaterThan: op = QtIVIFilterTerm::LowerThan; break;
+                        case QtIVIFilterTerm::LowerEquals: op = QtIVIFilterTerm::GreaterEquals; break;
+                        case QtIVIFilterTerm::LowerThan: op = QtIVIFilterTerm::GreaterThan; break;
+                        default: qFatal("The Grammer was changed but not all logic was ported properly");
+                    }
+
+                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    term->d_func()->m_property = sym(3).toString();
+                    term->d_func()->m_operator = op;
+                    term->d_func()->m_value = sym(1);
+                    m_termStack.push(term);
+              } break;
+
+              case 25: {
+                  m_operatorStack.push(QtIVIFilterTerm::GreaterEquals);
+              } break;
+
+              case 26: {
+                  m_operatorStack.push(QtIVIFilterTerm::GreaterThan);
+              } break;
+
+              case 27: {
+                  m_operatorStack.push(QtIVIFilterTerm::LowerEquals);
+              } break;
+
+              case 28: {
+                  m_operatorStack.push(QtIVIFilterTerm::LowerThan);
+              } break;
+
+              case 31: {
+                  m_operatorStack.push(QtIVIFilterTerm::EqualsCaseInsensitive);
+              } break;
+
+              case 32: {
+                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+              } break;
+
+              case 33: {
+                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+              } break;
+
+              case 34: {
+                  m_operatorStack.push(QtIVIFilterTerm::Unequals);
+              } break;
+
+            } // switch
+
+            state_stack [tos] = nt_action (act, lhs [r] - TERMINAL_COUNT);
+        } else {
+            int ers = state;
+            int shifts = 0;
+            int reduces = 0;
+            QList<int> expectedTokens;
+            for (int tk = 0; tk < TERMINAL_COUNT; ++tk) {
+
+                int k = t_action(ers, tk);
+
+
+                if (! k)
+                    continue;
+                else if (k < 0)
+                    ++reduces;
+                else if (spell[tk]) {
+                    if (shifts < 7)
+                        expectedTokens.append(tk);
+                    ++shifts;
+                }
+            }
+
+            QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following types:\n")).arg(QLatin1String(spell[yytoken]));
+            for (int token : expectedTokens)
+                errorMessage.append(QString(QLatin1String("     %1\n")).arg(QLatin1String(spell[token])));
+
+            setErrorString(errorMessage);
+
+            qDeleteAll(m_termStack);
+
+            return 0;
+        }
+    }
+
+    return 0;
+}
+
+void QtIVIQueryParser::setErrorString(const QString &error)
+{
+    int err_col = column - yyleng;
+
+    m_error = QString(QLatin1String(":%1 ERROR: %2")).arg(err_col).arg(error);
+
+    m_error.append(m_query).append(QLatin1String("\n"));
+    QString marker(QLatin1String("^"));
+
+    for (int i=0; i<err_col; i++)
+        marker.prepend(QLatin1String(" "));
+
+    for (unsigned long i=0; i<yyleng - 1; i++)
+        marker.append(QLatin1String("-"));
+
+    m_error.append(marker);
+}
+
+QT_END_NAMESPACE
+
+
+#endif // QTIVIQUERYPARSER_P_H
+
diff --git a/src/ivicore/queryparser/qtiviqueryterm.cpp b/src/ivicore/queryparser/qtiviqueryterm.cpp
new file mode 100644
index 0000000..2022ae1
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryterm.cpp
@@ -0,0 +1,243 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#include "qtiviqueryterm.h"
+#include "qtiviqueryterm_p.h"
+
+QtIVIConjunctionTermPrivate::QtIVIConjunctionTermPrivate()
+    : m_conjunction(QtIVIConjunctionTerm::And)
+{
+}
+
+QtIVIScopeTermPrivate::QtIVIScopeTermPrivate()
+    : m_term(nullptr)
+    , m_negated(false)
+{
+}
+
+QtIVIFilterTermPrivate::QtIVIFilterTermPrivate()
+    : m_negated(false)
+{
+}
+
+QString QtIVIFilterTermPrivate::operatorToString() const
+{
+    switch (m_operator){
+    case QtIVIFilterTerm::Equals: return QLatin1String("=");
+    case QtIVIFilterTerm::EqualsCaseInsensitive: return QLatin1String("~=");
+    case QtIVIFilterTerm::Unequals: return QLatin1String("!=");
+    case QtIVIFilterTerm::GreaterThan: return QLatin1String(">");
+    case QtIVIFilterTerm::GreaterEquals: return QLatin1String(">=");
+    case QtIVIFilterTerm::LowerThan: return QLatin1String("<");
+    case QtIVIFilterTerm::LowerEquals: return QLatin1String("<=");
+    }
+
+    return QLatin1String("unknown type");
+}
+
+QtIVIOrderTermPrivate::QtIVIOrderTermPrivate()
+    : m_ascending(false)
+{
+}
+
+QtIVIAbstractQueryTerm::~QtIVIAbstractQueryTerm()
+{
+}
+
+QtIVIConjunctionTerm::QtIVIConjunctionTerm()
+    : d_ptr(new QtIVIConjunctionTermPrivate)
+{
+}
+
+QtIVIConjunctionTerm::~QtIVIConjunctionTerm()
+{
+    Q_D(QtIVIConjunctionTerm);
+    qDeleteAll(d->m_terms);
+    delete d_ptr;
+}
+
+QtIVIAbstractQueryTerm::Type QtIVIConjunctionTerm::type() const
+{
+    return QtIVIAbstractQueryTerm::ConjunctionTerm;
+}
+
+QString QtIVIConjunctionTerm::toString() const
+{
+    Q_D(const QtIVIConjunctionTerm);
+    QString conjunction = QLatin1String("&");
+    if (d->m_conjunction == Or)
+        conjunction = QLatin1String("|");
+
+    QString string;
+    QListIterator<QtIVIAbstractQueryTerm*> it(d->m_terms);
+    while (it.hasNext()) {
+        string += it.next()->toString();
+        if (it.hasNext())
+            string += QLatin1Literal(" ") + conjunction + QLatin1Literal(" ");
+    }
+
+    return string;
+}
+
+QtIVIConjunctionTerm::Conjunction QtIVIConjunctionTerm::conjunction() const
+{
+    Q_D(const QtIVIConjunctionTerm);
+    return d->m_conjunction;
+}
+
+QList<QtIVIAbstractQueryTerm *> QtIVIConjunctionTerm::terms() const
+{
+    Q_D(const QtIVIConjunctionTerm);
+    return d->m_terms;
+}
+
+QtIVIScopeTerm::QtIVIScopeTerm()
+    : d_ptr(new QtIVIScopeTermPrivate)
+{
+}
+
+QtIVIScopeTerm::~QtIVIScopeTerm()
+{
+    Q_D(QtIVIScopeTerm);
+    delete d->m_term;
+    delete d_ptr;
+}
+
+QtIVIAbstractQueryTerm::Type QtIVIScopeTerm::type() const
+{
+    return QtIVIAbstractQueryTerm::ScopeTerm;
+}
+
+QString QtIVIScopeTerm::toString() const
+{
+    Q_D(const QtIVIScopeTerm);
+    QString string = QLatin1Literal("(") + d->m_term->toString() + QLatin1Literal(")");
+    if (d->m_negated)
+        string.prepend(QLatin1String("!"));
+
+    return string;
+}
+
+bool QtIVIScopeTerm::isNegated() const
+{
+    Q_D(const QtIVIScopeTerm);
+    return d->m_negated;
+}
+
+QtIVIAbstractQueryTerm *QtIVIScopeTerm::term() const
+{
+    Q_D(const QtIVIScopeTerm);
+    return d->m_term;
+}
+
+QtIVIFilterTerm::QtIVIFilterTerm()
+    : d_ptr(new QtIVIFilterTermPrivate)
+{
+}
+
+QtIVIFilterTerm::~QtIVIFilterTerm()
+{
+    delete d_ptr;
+}
+
+QtIVIAbstractQueryTerm::Type QtIVIFilterTerm::type() const
+{
+    return QtIVIAbstractQueryTerm::FilterTerm;
+}
+
+QString QtIVIFilterTerm::toString() const
+{
+    Q_D(const QtIVIFilterTerm);
+    QString string;
+
+    string = d->m_property + d->operatorToString() + d->m_value.toString();
+
+    if (d->m_negated)
+        string.prepend(QLatin1String("!"));
+
+    return string;
+}
+
+QtIVIFilterTerm::Operator QtIVIFilterTerm::operatorType() const
+{
+    Q_D(const QtIVIFilterTerm);
+    return d->m_operator;
+}
+
+QVariant QtIVIFilterTerm::value() const
+{
+    Q_D(const QtIVIFilterTerm);
+    return d->m_value;
+}
+
+QString QtIVIFilterTerm::propertyName() const
+{
+    Q_D(const QtIVIFilterTerm);
+    return d->m_property;
+}
+
+bool QtIVIFilterTerm::isNegated() const
+{
+    Q_D(const QtIVIFilterTerm);
+    return d->m_negated;
+}
+
+QtIVIOrderTerm::QtIVIOrderTerm()
+    : d_ptr(new QtIVIOrderTermPrivate)
+{
+}
+
+QtIVIOrderTerm::~QtIVIOrderTerm()
+{
+    delete d_ptr;
+}
+
+bool QtIVIOrderTerm::isAscending() const
+{
+    Q_D(const QtIVIOrderTerm);
+    return d->m_ascending;
+}
+
+QString QtIVIOrderTerm::propertyName() const
+{
+    Q_D(const QtIVIOrderTerm);
+    return d->m_propertyName;
+}
diff --git a/src/ivicore/queryparser/qtiviqueryterm.h b/src/ivicore/queryparser/qtiviqueryterm.h
new file mode 100644
index 0000000..49e67f4
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryterm.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#ifndef QUERYTERM_H
+#define QUERYTERM_H
+
+#include <QObject>
+#include <QVariant>
+
+#include <QtIVICore/qtiviglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QTIVICORE_EXPORT QtIVIAbstractQueryTerm
+{
+public:
+    enum Type {
+        FilterTerm,
+        ConjunctionTerm,
+        ScopeTerm
+    };
+
+    virtual ~QtIVIAbstractQueryTerm();
+
+    virtual QString toString() const = 0;
+    virtual QtIVIAbstractQueryTerm::Type type() const = 0;
+};
+
+class QtIVIConjunctionTermPrivate;
+class Q_QTIVICORE_EXPORT QtIVIConjunctionTerm : public QtIVIAbstractQueryTerm
+{
+public:
+    enum Conjunction {
+        And,
+        Or
+    };
+
+    QtIVIConjunctionTerm();
+    virtual ~QtIVIConjunctionTerm();
+
+    QtIVIAbstractQueryTerm::Type type() const;
+    QString toString() const;
+    Conjunction conjunction() const;
+    QList<QtIVIAbstractQueryTerm*> terms() const;
+
+private:
+    QtIVIConjunctionTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QtIVIConjunctionTerm)
+    friend class QtIVIQueryParser;
+};
+
+class QtIVIScopeTermPrivate;
+class Q_QTIVICORE_EXPORT QtIVIScopeTerm : public QtIVIAbstractQueryTerm
+{
+public:
+
+    explicit QtIVIScopeTerm();
+    virtual ~QtIVIScopeTerm();
+
+    QtIVIAbstractQueryTerm::Type type() const;
+    QString toString() const;
+    bool isNegated() const;
+    QtIVIAbstractQueryTerm* term() const;
+
+private:
+    QtIVIScopeTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QtIVIScopeTerm)
+    friend class QtIVIQueryParser;
+};
+
+class QtIVIFilterTermPrivate;
+class Q_QTIVICORE_EXPORT QtIVIFilterTerm : public QtIVIAbstractQueryTerm
+{
+public:
+    enum Operator {
+        Equals,
+        EqualsCaseInsensitive,
+        Unequals,
+        GreaterThan,
+        GreaterEquals,
+        LowerThan,
+        LowerEquals
+    };
+
+    explicit QtIVIFilterTerm();
+    virtual ~QtIVIFilterTerm();
+
+    QtIVIAbstractQueryTerm::Type type() const;
+    QString toString() const;
+    Operator operatorType() const;
+    QVariant value() const;
+    QString propertyName() const;
+    bool isNegated() const;
+
+private:
+    QtIVIFilterTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QtIVIFilterTerm)
+    friend class QtIVIQueryParser;
+};
+
+class QtIVIOrderTermPrivate;
+class Q_QTIVICORE_EXPORT QtIVIOrderTerm
+{
+public:
+    QtIVIOrderTerm();
+    virtual ~QtIVIOrderTerm();
+
+    bool isAscending() const;
+    QString propertyName() const;
+
+private:
+    QtIVIOrderTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QtIVIOrderTerm)
+    friend class QtIVIQueryParser;
+};
+
+QT_END_NAMESPACE
+
+#endif // QUERYTERM_H
diff --git a/src/ivicore/queryparser/qtiviqueryterm_p.h b/src/ivicore/queryparser/qtiviqueryterm_p.h
new file mode 100644
index 0000000..ab3e4f8
--- /dev/null
+++ b/src/ivicore/queryparser/qtiviqueryterm_p.h
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#ifndef QTIVIQUERYTERM_P_H
+#define QTIVIQUERYTERM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qtiviqueryterm.h"
+
+QT_BEGIN_NAMESPACE
+
+class Q_QTIVICORE_EXPORT QtIVIConjunctionTermPrivate
+{
+public:
+    QtIVIConjunctionTermPrivate();
+
+    QList<QtIVIAbstractQueryTerm*> m_terms;
+    QtIVIConjunctionTerm::Conjunction m_conjunction;
+};
+
+class Q_QTIVICORE_EXPORT QtIVIScopeTermPrivate
+{
+public:
+    QtIVIScopeTermPrivate();
+
+    QtIVIAbstractQueryTerm* m_term;
+    bool m_negated;
+};
+
+class Q_QTIVICORE_EXPORT QtIVIFilterTermPrivate
+{
+public:
+    QtIVIFilterTermPrivate();
+
+    QString operatorToString() const;
+
+    QString m_property;
+    QtIVIFilterTerm::Operator m_operator;
+    QVariant m_value;
+    bool m_negated;
+};
+
+class Q_QTIVICORE_EXPORT QtIVIOrderTermPrivate
+{
+public:
+    QtIVIOrderTermPrivate();
+
+    bool m_ascending;
+    QString m_propertyName;
+};
+
+QT_END_NAMESPACE
+
+#endif // QTIVIQUERYTERM_P_H
diff --git a/src/ivicore/queryparser/queryparser.pri b/src/ivicore/queryparser/queryparser.pri
new file mode 100644
index 0000000..35feba1
--- /dev/null
+++ b/src/ivicore/queryparser/queryparser.pri
@@ -0,0 +1,35 @@
+QT += core
+
+
+FLEX += $$PWD/qtiviqueryparser.l
+QLALR += $$PWD/qtiviqueryparser.g
+
+enable-qlalr {
+    build-pass: message("Using flex and qlalr to generate code")
+
+    flex.output  = $$PWD/${QMAKE_FILE_BASE}_flex_p.h
+    flex.commands = flex -L --nounistd -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
+    flex.dependency_type = TYPE_C
+    flex.input = FLEX
+    flex.CONFIG += no_link
+    QMAKE_EXTRA_COMPILERS += flex
+
+    qlalr.output  = $$PWD/${QMAKE_FILE_BASE}_p.h
+    qlalr.commands = cd $$PWD; $$[QT_INSTALL_BINS]/qlalr --qt --no-debug --no-lines --verbose ${QMAKE_FILE_NAME}
+    qlalr.dependency_type = TYPE_C
+    qlalr.input = QLALR
+    qlalr.CONFIG += no_link
+    QMAKE_EXTRA_COMPILERS += qlalr
+} else {
+    HEADERS += $$PWD/qtiviqueryparser_p.h \
+               $$PWD/qtiviqueryparser_flex_p.h
+    OTHER_FILES += $$FLEX
+    OTHER_FILES += $$QLALR
+}
+
+HEADERS += \
+    $$PWD/qtiviqueryterm.h \
+    $$PWD/qtiviqueryterm_p.h
+
+SOURCES += \
+    $$PWD/qtiviqueryterm.cpp
diff --git a/src/ivicore/queryparser/queryparser.pro b/src/ivicore/queryparser/queryparser.pro
new file mode 100644
index 0000000..5b996ff
--- /dev/null
+++ b/src/ivicore/queryparser/queryparser.pro
@@ -0,0 +1,6 @@
+TARGET = queryparser
+
+include(queryparser.pri)
+
+SOURCES += \
+    main.cpp
diff --git a/sync.profile b/sync.profile
index d67a099..9f2f56a 100644
--- a/sync.profile
+++ b/sync.profile
@@ -7,6 +7,7 @@
 );
 %classnames = (
      "qdlt.h" => "QtDlt",
+     "qtiviqueryterm.h" => "QtIVIAbstractQueryTerm", "QtIVIConjunctionTerm", "QtIVIScopeTerm", "QtIVIFilterTerm", "QtIVIOrderTerm",
 );
 %deprecatedheaders = (
 );
diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro
index 302a94b..f703abd 100644
--- a/tests/auto/core/core.pro
+++ b/tests/auto/core/core.pro
@@ -4,3 +4,4 @@ SUBDIRS = servicemanagertest \
           qtivipropertyattribute \
           qtiviproperty \
           qtiviabstractfeature \
+          queryparser \
diff --git a/tests/auto/core/queryparser/queryparser.pro b/tests/auto/core/queryparser/queryparser.pro
new file mode 100644
index 0000000..b5f9210
--- /dev/null
+++ b/tests/auto/core/queryparser/queryparser.pro
@@ -0,0 +1,12 @@
+QT       += testlib ivicore ivicore-private qml
+
+TARGET = tst_queryparser
+CONFIG   += testcase
+
+TEMPLATE = app
+
+SOURCES += \
+    tst_queryparser.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+TESTDATA = testdata/*
diff --git a/tests/auto/core/queryparser/tst_queryparser.cpp b/tests/auto/core/queryparser/tst_queryparser.cpp
new file mode 100644
index 0000000..565a359
--- /dev/null
+++ b/tests/auto/core/queryparser/tst_queryparser.cpp
@@ -0,0 +1,246 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtCore/QString>
+
+#include "QtIVICore/private/qtiviqueryparser_p.h"
+
+// sadly this has to be a define for QVERIFY2() to work
+#define CHECK_ERRORSTRING(_actual_errstr, _expected_errstr) do { \
+    if (_expected_errstr.startsWith(QLatin1String("~"))) { \
+        QRegularExpression re(QStringLiteral("\\A") + _expected_errstr.mid(1) + QStringLiteral("\\z")); \
+        QVERIFY2(re.match(_actual_errstr).hasMatch(), \
+                 qPrintable("\n    Got     : " + _actual_errstr.toLocal8Bit() + \
+                            "\n    Expected: " + _expected_errstr.toLocal8Bit())); \
+    } else { \
+        QCOMPARE(_actual_errstr, _expected_errstr); \
+    } \
+} while (false)
+
+class TestQueryParser: public QObject
+{
+    Q_OBJECT
+private slots:
+    void validQueries_data();
+    void validQueries();
+    void invalidQueries_data();
+    void invalidQueries();
+    void identifierList_data();
+    void identifierList();
+    void invalidIdentifierList_data();
+    void invalidIdentifierList();
+};
+
+void TestQueryParser::validQueries_data()
+{
+    QTest::addColumn<QString>("query");
+    QTest::addColumn<QString>("representationQuery");
+
+    const QLatin1String floatRegExp("[0-9]*([eE][-+]?[0-9]+)?");
+
+    QTest::newRow("= string \" ") << "blubb='foo'" << "blubb=foo";
+    QTest::newRow("= string \" escaped") << "blubb=\"foo\"" << "blubb=foo";
+    QTest::newRow("= string '") << "blubb='foo'" << "blubb=foo";
+    QTest::newRow("= string ' escaped") << "blubb=\'foo\'" << "blubb=foo";
+    QTest::newRow("== string \" ") << "blubb=='foo'" << "blubb=foo";
+    QTest::newRow("== string \" escaped") << "blubb==\"foo\"" << "blubb=foo";
+    QTest::newRow("== string '") << "blubb=='foo'" << "blubb=foo";
+    QTest::newRow("== string ' escaped") << "blubb==\'foo\'" << "blubb=foo";
+    QTest::newRow("!= string \" ") << "blubb!='foo'" << "blubb!=foo";
+    QTest::newRow("!= string \" escaped") << "blubb!=\"foo\"" << "blubb!=foo";
+    QTest::newRow("!= string '") << "blubb!='foo'" << "blubb!=foo";
+    QTest::newRow("!= string ' escaped") << "blubb!=\'foo\'" << "blubb!=foo";
+    QTest::newRow("~= string \" ") << "blubb~='foo'" << "blubb~=foo";
+    QTest::newRow("~= string \" escaped") << "blubb~=\"foo\"" << "blubb~=foo";
+    QTest::newRow("~= string '") << "blubb~='foo'" << "blubb~=foo";
+    QTest::newRow("~= string ' escaped") << "blubb~=\'foo\'" << "blubb~=foo";
+    QTest::newRow("> int") << "foo>5" << "";
+    QTest::newRow(">= int") << "foo>=5" << "";
+    QTest::newRow("= int") << "foo=5" << "";
+    QTest::newRow("== int") << "foo==5" << "foo=5";
+    QTest::newRow("< int") << "foo<5" << "";
+    QTest::newRow("<= int") << "foo<=5" << "";
+    QTest::newRow("!= int") << "foo!=5" << "";
+    QTest::newRow("> -int") << "foo>-5" << "";
+    QTest::newRow(">= -int") << "foo>=-5" << "";
+    QTest::newRow("= -int") << "foo=-5" << "";
+    QTest::newRow("== -int") << "foo==-5" << "foo=-5";
+    QTest::newRow("< -int") << "foo<-5" << "";
+    QTest::newRow("<= -int") << "foo<=-5" << "";
+    QTest::newRow("!= -int") << "foo!=-5" << "";
+    QTest::newRow("> float") << "foo>5.1" << "~foo>5." + floatRegExp;
+    QTest::newRow(">= float") << "foo>=5.1" << "~foo>=5." + floatRegExp;
+    QTest::newRow("= float") << "foo=5.1" << "~foo=5." + floatRegExp;
+    QTest::newRow("== float") << "foo==5.1" << "~foo=5." + floatRegExp;
+    QTest::newRow("< float") << "foo<5.1" << "~foo<5." + floatRegExp;
+    QTest::newRow("<= float") << "foo<=5.1" << "~foo<=5." + floatRegExp;
+    QTest::newRow("!= float") << "foo!=5.1" << "~foo!=5." + floatRegExp;
+    QTest::newRow("> -float") << "foo>-5.1" << "~foo>-5." + floatRegExp;
+    QTest::newRow(">= -float") << "foo>=-5.1" << "~foo>=-5." + floatRegExp;
+    QTest::newRow("= -float") << "foo=-5.1" << "~foo=-5." + floatRegExp;
+    QTest::newRow("== -float") << "foo==-5.1" << "~foo=-5." + floatRegExp;
+    QTest::newRow("< -float") << "foo<-5.1" << "~foo<-5." + floatRegExp;
+    QTest::newRow("<= -float") << "foo<=-5.1" << "~foo<=-5." + floatRegExp;
+    QTest::newRow("!= -float") << "foo!=-5.1" << "~foo!=-5." + floatRegExp;
+    QTest::newRow("!= -5.0e15") << "foo!=-5.0e15" << "~foo!=-5" + floatRegExp;
+    QTest::newRow("!= -5.0E15") << "foo!=-5.0E15" << "~foo!=-5" + floatRegExp;
+    QTest::newRow("!= -5.0e-15") << "foo!=-5.0e-15" << "~foo!=-5" + floatRegExp;
+    QTest::newRow("!= -5.0e+15") << "foo!=-5.0e+15" << "~foo!=-5" + floatRegExp;
+    QTest::newRow("!= oct") << "foo!=050" << "foo!=40";
+    QTest::newRow("!= 0x15") << "foo!=0x15" << "foo!=21";
+    QTest::newRow("!= 0X15") << "foo!=0X15" << "foo!=21";
+    QTest::newRow("> int reversed") << "5>foo" << "foo<5";
+    QTest::newRow(">= int reversed") << "5>=foo" << "foo<=5";
+    QTest::newRow("< int reversed") << "5<foo" << "foo>5";
+    QTest::newRow("<= int reversed") << "5<=foo" << "foo>=5";
+    QTest::newRow("parenthese") << "(foo!=5)" << "";
+    QTest::newRow("(query) & query") << "(foo!=5 || bar>3) & testVal!='test'" << "(foo!=5 | bar>3) & testVal!=test";
+    QTest::newRow("(query) & (query)") << "(foo!=5 | bar>3) & (testVal!='test')" << "(foo!=5 | bar>3) & (testVal!=test)";
+    QTest::newRow("negation") << "foo!=5 | bar>3 & (testVal!='test')" << "foo!=5 | bar>3 & (testVal!=test)";
+    QTest::newRow("negation 2") << "!(!foo!=5 | !bar>3) & !(!testVal!='test')" << "!(!foo!=5 | !bar>3) & !(!testVal!=test)";
+    QTest::newRow("negation 3") << "!(foo!=5 | !bar>3) & !(!testVal!='test')" << "!(foo!=5 | !bar>3) & !(!testVal!=test)";
+    QTest::newRow("negation 4") << "!(!foo!=5 | !bar>3) & (!testVal!='test')" << "!(!foo!=5 | !bar>3) & (!testVal!=test)";
+    QTest::newRow("negation 5") << "!(!foo!=5 | !bar>3) & !(testVal!='test')" << "!(!foo!=5 | !bar>3) & !(testVal!=test)";
+    QTest::newRow("negation 6") << "!(!foo!=5 | bar>3) & !(!testVal!='test' | property == 3)" << "!(!foo!=5 | bar>3) & !(!testVal!=test | property=3)";
+    QTest::newRow("very complex") << "!(((!foo!=5)) | (bar>3 && foo=\"bar\") & (prop ~= 'foobar') ) & !(!testVal!='test' | property == 3) & test >= 5"
+                                  << "!(((!foo!=5)) | (bar>3 & foo=bar) & (prop~=foobar)) & !(!testVal!=test | property=3) & test>=5";
+}
+
+void TestQueryParser::validQueries()
+{
+    QFETCH(QString, query);
+    QFETCH(QString, representationQuery);
+
+    if (representationQuery.isEmpty())
+        representationQuery = query;
+
+    QtIVIQueryParser parser;
+    parser.setQuery(query);
+
+    QtIVIAbstractQueryTerm* term = parser.parse();
+    QVERIFY2(term, qPrintable(parser.lastError()));
+
+//    if ()
+//    QRegularExpression regexp(representationQuery);
+//    QRegularExpressionMatch match = regexp.match(term->toString());
+
+//    QVERIFY2(match.hasMatch(), QString(QLatin1String("\nParse result: %1 \nExpected:     %2\n")).arg(term->toString(), representationQuery).toUtf8());
+
+    CHECK_ERRORSTRING(term->toString(), representationQuery);
+
+    delete term;
+}
+
+void TestQueryParser::invalidQueries_data()
+{
+    QTest::addColumn<QString>("query");
+
+    QTest::newRow("string characters mismatch") << "blubb=\"foo'";
+    QTest::newRow("~= int") << "blubb~=5";
+    QTest::newRow(">= string") << "blubb>='foo'";
+    QTest::newRow(">= string") << "blubb>=foo";
+    QTest::newRow("== prototype") << "blubb==foo";
+    QTest::newRow("wrong separator (locale)") << "blubb=5,1";
+    QTest::newRow("wrong formated float") << "blubb==5.0ee1";
+    QTest::newRow("parenthese mismatch") << "((blubb=5)";
+    QTest::newRow("wrong hex number") << "blubb=0xG";
+    QTest::newRow("&& following ||") << "(blubb=5) || && (foo=\"barl\")";
+    QTest::newRow("Two parenthesed clauses without conjunction") << "!(!foo!=5 | bar>3) (!'test'!=testVal | property == 3)";
+}
+
+void TestQueryParser::invalidQueries()
+{
+    QFETCH(QString, query);
+
+    QtIVIQueryParser parser;
+    parser.setQuery(query);
+
+    QVERIFY(!parser.parse());
+    QVERIFY(!parser.lastError().isEmpty());
+}
+
+void TestQueryParser::identifierList_data()
+{
+    QTest::addColumn<QString>("query");
+    QTest::addColumn<QString>("identifier");
+
+    QTest::newRow("< int") << "foo<5" << "foo";
+    QTest::newRow("> int reversed") << "5>foo" << "foo";
+    QTest::newRow("= string \" ") << "blubb='foo'" << "blubb";
+    QTest::newRow("= string \" reversed ") << "'foo'=blubb" << "blubb";
+}
+
+void TestQueryParser::identifierList()
+{
+    QFETCH(QString, query);
+    QFETCH(QString, identifier);
+
+    QtIVIQueryParser parser;
+    parser.setQuery(query);
+
+    QSet<QString> set;
+    set.insert(identifier);
+    parser.setAllowedIdentifiers(set);
+    QtIVIAbstractQueryTerm* term = parser.parse();
+    QVERIFY2(term, qPrintable(parser.lastError()));
+    delete term;
+}
+
+void TestQueryParser::invalidIdentifierList_data()
+{
+    QTest::addColumn<QString>("query");
+    QTest::addColumn<QString>("identifier");
+
+    QTest::newRow("< int") << "foo<5" << "foobar";
+    QTest::newRow("> int reversed") << "5>foo" << "foobar";
+    QTest::newRow("= string \" ") << "blubb='foo'" << "blubber";
+    QTest::newRow("= string \" reversed ") << "'foo'=blubb" << "blubber";
+}
+
+void TestQueryParser::invalidIdentifierList()
+{
+    QFETCH(QString, query);
+    QFETCH(QString, identifier);
+
+    QtIVIQueryParser parser;
+    parser.setQuery(query);
+
+    QSet<QString> set;
+    set.insert(identifier);
+    parser.setAllowedIdentifiers(set);
+
+    QVERIFY(!parser.parse());
+    QVERIFY(!parser.lastError().isEmpty());
+}
+
+//TODO add autotests for the orderTerms
+
+QTEST_MAIN(TestQueryParser)
+
+#include "tst_queryparser.moc"