Commit 82a8e9bb authored by Fawzi Mohamed's avatar Fawzi Mohamed

qmljs: added persistent trie

Add a presistent trie to store imports, and provide a better (IMHO)
completion algorithm.
The trie is quite generic and it might be worth while to move it to utils.

Change-Id: I4081346af6215b1ee8ff14bd063c2a021d7c8218
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 8c64a918
This diff is collapsed.
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef PERSISTENTTRIE_H
#define PERSISTENTTRIE_H
#include <qmljs/qmljs_global.h>
#include <QList>
#include <QSharedPointer>
#include <utility>
QT_FORWARD_DECLARE_CLASS(QString)
QT_FORWARD_DECLARE_CLASS(QStringList)
QT_FORWARD_DECLARE_CLASS(QDebug)
namespace QmlJS {
namespace PersistentTrie {
enum LookupFlags {
CaseInsensitive = 0x1,
Partial = 0x2,
SkipChars = 0x4,
SkipSpaces = 0x8
};
class QMLJS_EXPORT TrieNode
{
public:
typedef const TrieNode CTrie;
typedef QSharedPointer<CTrie> Ptr;
QString prefix;
QList<Ptr> postfixes;
TrieNode(const QString &pre = QString(), QList<Ptr> post = QList<Ptr>());
TrieNode(const TrieNode &o);
static Ptr create(const QString &pre = QString(), QList<Ptr> post = QList<Ptr>());
static void complete(QStringList &results, const Ptr &trie, const QString &root,
const QString &base = QString(), LookupFlags flags = LookupFlags(CaseInsensitive|Partial));
static bool contains(const Ptr &trie, const QString &value, LookupFlags flags = LookupFlags(0));
static QStringList stringList(const Ptr &trie);
static Ptr insertF(const Ptr &trie, const QString &value);
static std::pair<Ptr,int> intersectF(const Ptr &v1, const Ptr &v2, int index1=0);
static std::pair<Ptr,int> mergeF(const Ptr &v1, const Ptr &v2);
static QDebug &printStrings(QDebug &dbg, const Ptr &trie);
static QDebug &describe(QDebug &dbg, const Ptr &trie, int indent);
};
class QMLJS_EXPORT Trie
{
public:
Trie();
Trie(const TrieNode::Ptr &t);
Trie(const Trie &o);
QStringList complete(const QString &root, const QString &base = QString(),
LookupFlags flags = LookupFlags(CaseInsensitive|Partial)) const;
bool contains(const QString &value, LookupFlags flags = LookupFlags(0)) const;
QStringList stringList() const;
Trie insertF(const QString &value) const;
Trie intersectF(const Trie &v) const;
Trie mergeF(const Trie &v) const;
void insert(const QString &value);
void intersect(const Trie &v);
void merge(const Trie &v);
friend QDebug &operator<<(QDebug &dbg, const TrieNode::Ptr &trie);
friend QDebug &operator<<(QDebug &dbg, const Trie &trie);
TrieNode::Ptr trie;
};
template <typename T> void enumerateTrieNode(const TrieNode::Ptr &trie, T &t,
QString base = QString())
{
if (trie.isNull())
return;
base.append(trie->prefix);
foreach (const TrieNode::Ptr subT, trie->postfixes) {
enumerateTrieNode(subT,t,base);
}
if (trie->postfixes.isEmpty())
t(base);
}
QMLJS_EXPORT int matchStrength(const QString &searchStr, const QString &str);
QMLJS_EXPORT QStringList matchStrengthSort(const QString &searchString, QStringList &res);
QMLJS_EXPORT QDebug &operator<<(QDebug &dbg, const TrieNode::Ptr &trie);
QMLJS_EXPORT QDebug &operator<<(QDebug &dbg, const Trie &trie);
} // end namespace PersistentTrie
} // end namespace QmlJS
#endif // PERSISTENTTRIE_H
......@@ -37,7 +37,8 @@ HEADERS += \
$$PWD/consolemanagerinterface.h \
$$PWD/consoleitem.h \
$$PWD/iscriptevaluator.h \
$$PWD/qmljssimplereader.h
$$PWD/qmljssimplereader.h \
$$PWD/persistenttrie.h
SOURCES += \
$$PWD/qmljsbind.cpp \
......@@ -65,7 +66,8 @@ SOURCES += \
$$PWD/jsoncheck.cpp \
$$PWD/consolemanagerinterface.cpp \
$$PWD/consoleitem.cpp \
$$PWD/qmljssimplereader.cpp
$$PWD/qmljssimplereader.cpp \
$$PWD/persistenttrie.cpp
RESOURCES += \
$$PWD/qmljs.qrc
......
......@@ -97,6 +97,8 @@ QtcLibrary {
"parser/qmljsmemorypool_p.h",
"parser/qmljsparser.cpp",
"parser/qmljsparser_p.h",
"persistenttrie.cpp",
"persistenttrie.h",
"consolemanagerinterface.cpp",
"consolemanagerinterface.h",
"consoleitem.cpp",
......
com.bla.Pippo 0.1
com.bla.Pippo 2.0
com.bla.Pippo 2.1
com.bla.Pallino 0.1
QtQuick 1.0
pa
com.bla.Pallino 0.1
13
abbc
a
acc
tzk
ttk
mm
a
artz
tzj
tzg
art
tzg
abbc
a
acc
tzk
ttk
mm
abbc
ab
mmk
ab
abc
ab
abbc
a
acc
tzk
ttk
mm
com.bla.Pippo 0.1
com.bla.Pippo 2.0
com.bla.Pippo 2.1
com.bla.Pallino 0.1
QtQuick 1.0
a
artz
tzj
tzg
art
tzg
abbc
ab
mmk
ab
abc
ab
a
artz
tzj
tzg
art
tzg
com.bla.Pippo 0.1
com.bla.Pippo 2.0
com.bla.Pippo 2.1
com.bla.Pallino 0.1
QtQuick 1.0
abbc
ab
mmk
ab
abc
ab
a
artz
tzj
tzg
art
tzg
abbc
a
acc
tzk
ttk
mm
a
artz
tzj
tzg
art
tzg
abbc
ab
mmk
ab
abc
ab
com.bla.Pippo 0.1
com.bla.Pippo 2.0
com.bla.Pippo 2.1
com.bla.Pallino 0.1
QtQuick 1.0
abbc
a
acc
tzk
ttk
mm
a
artz
tzj
tzg
art
tzg
abbc
a
acc
tzk
ttk
mm
abbc
ab
mmk
ab
abc
ab
abbc
a
acc
tzk
ttk
mm
com.bla.Pippo 0.1
com.bla.Pippo 2.0
com.bla.Pippo 2.1
com.bla.Pallino 0.1
QtQuick 1.0
a
artz
tzj
tzg
art
tzg
abbc
ab
mmk
ab
abc
ab
a
artz
tzj
tzg
art
tzg
com.bla.Pippo 0.1
com.bla.Pippo 2.0
com.bla.Pippo 2.1
com.bla.Pallino 0.1
QtQuick 1.0
abbc
ab
mmk
ab
abc
ab
a
artz
tzj
tzg
art
tzg
include(../../qttest.pri)
DEFINES+=QTCREATORDIR=\\\"$$IDE_SOURCE_TREE\\\"
DEFINES+=TESTSRCDIR=\\\"$$PWD\\\"
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
TARGET = tst_trie_check
HEADERS += tst_testtrie.h
SOURCES += \
tst_testtrie.cpp
TEMPLATE = app
TARGET = tester
DEFINES += QMLJS_BUILD_DIR QT_CREATOR
OTHER_FILES += \
listAll.data \
intersect.data \
merge.data \
completion.data
This diff is collapsed.
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include <QtTest>
#include <QObject>
QT_FORWARD_DECLARE_CLASS(QStringList)
class tst_TestTrie : public QObject
{
Q_OBJECT
public:
tst_TestTrie();
private slots:
void initTestCase();
//void cleanupTestCase();
//void init();
//void cleanup();
void testListAll_data();
void testMerge_data();
void testIntersect_data();
void testCompletion_data();
void testListAll();
void testMerge();
void testIntersect();
void testCompletion();
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment