diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2019-01-16 17:22:12 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-01-17 16:14:35 +0000 |
commit | b466e3f0be7319065c014ddf2f2662ea2db96322 (patch) | |
tree | cf7345c73c18642af0c2147e4e507e9078ea6fe2 | |
parent | 0157e009bede679e0777d3af9ec7052223e949b4 (diff) |
QmlJS: remove not used DescribeValueVisitor
Change-Id: Ieedd134a3c197ac6bc3a2dd0a6b53032a4d861cc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | src/libs/qmljs/qmljs-lib.pri | 2 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsdescribevalue.cpp | 420 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsdescribevalue.h | 74 |
3 files changed, 0 insertions, 496 deletions
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri index a924922c72..2aa95a9f7a 100644 --- a/src/libs/qmljs/qmljs-lib.pri +++ b/src/libs/qmljs/qmljs-lib.pri @@ -40,7 +40,6 @@ HEADERS += \ $$PWD/qmljsconstants.h \ $$PWD/qmljsimportdependencies.h \ $$PWD/qmljsviewercontext.h \ - $$PWD/qmljsdescribevalue.h \ $$PWD/qmljsdialect.h SOURCES += \ @@ -74,7 +73,6 @@ SOURCES += \ $$PWD/qmljsqrcparser.cpp \ $$PWD/qmljsimportdependencies.cpp \ $$PWD/qmljsviewercontext.cpp \ - $$PWD/qmljsdescribevalue.cpp \ $$PWD/qmljsdialect.cpp contains(QT, gui) { diff --git a/src/libs/qmljs/qmljsdescribevalue.cpp b/src/libs/qmljs/qmljsdescribevalue.cpp deleted file mode 100644 index 0a9ff68abe..0000000000 --- a/src/libs/qmljs/qmljsdescribevalue.cpp +++ /dev/null @@ -1,420 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 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. -** -****************************************************************************/ - -#include "qmljsdescribevalue.h" - -#include "qmljsinterpreter.h" -#include "qmljscontext.h" -#include "parser/qmljsast_p.h" - -#include <QString> - -namespace QmlJS { - -QString DescribeValueVisitor::describe(const Value *value, int depth, ContextPtr context) -{ - DescribeValueVisitor describer(-depth, 0, 2, context); - return describer(value); -} - -DescribeValueVisitor::DescribeValueVisitor(int startDepth, int startIndent, int indentIncrement, - ContextPtr context) - : m_depth(startDepth), m_indent(startIndent), m_indentIncrement(indentIncrement), - m_context(context) -{ } - -DescribeValueVisitor::~DescribeValueVisitor() -{ -} - -QString DescribeValueVisitor::operator()(const Value *value) -{ - if (value) - value->accept(this); - else - dump("**NULL**"); - return description(); -} - -void DescribeValueVisitor::basicDump(const char *baseName, const Value *value, bool opensContext) -{ - dump(QLatin1String(baseName)); - dump(QString::fromLatin1("@%1").arg((quintptr)(void *)value, 0, 16)); - QString fileName; - int line, column; - if (value && value->getSourceLocation(&fileName, &line, &column)) - dump(QString::fromLatin1(" - %1:%2:%3").arg(fileName) - .arg(line).arg(column)); - if (opensContext) - openContext(); -} - -void DescribeValueVisitor::dump(const QString &toAdd) -{ - m_description += toAdd; - m_emptyContext = false; -} - -void DescribeValueVisitor::dump(const char *toAdd) -{ - m_description += QLatin1String(toAdd); - m_emptyContext = false; -} - -void DescribeValueVisitor::dumpNewline() -{ - dump("\n"); - int indent = m_indent; - QString indentStr = QLatin1String(" "); - while (indent > 10) { - dump(indentStr); - indent -= 10; - } - if (indent > 0) - dump(indentStr.left(indent)); -} - -void DescribeValueVisitor::openContext(const char *openStr) -{ - dump(openStr); - m_indent += m_indentIncrement; - m_emptyContext = true; -} - -void DescribeValueVisitor::closeContext(const char *closeStr) -{ - m_indent -= m_indentIncrement; - if (m_emptyContext) { - dump(" "); - } else if (strlen(closeStr)) { - dumpNewline(); - } - dump(closeStr); -} - -void DescribeValueVisitor::visit(const NullValue *value) -{ - basicDump("NullValue", value, false); -} - -void DescribeValueVisitor::visit(const UndefinedValue *value) -{ - basicDump("UndefinedValue", value, false); -} - -void DescribeValueVisitor::visit(const UnknownValue *value) -{ - basicDump("UnknownValue", value, false); -} - -void DescribeValueVisitor::visit(const NumberValue *value) -{ - if (const QmlEnumValue *v = value->asQmlEnumValue()) { - basicDump("QmlEnumValue", v, true); - dumpNewline(); - dump(QString::fromLatin1("%2, ").arg((quintptr)(void *)v) - .arg(v->name())); - openContext("["); - foreach (const QString &key, v->keys()) { - dumpNewline(); - dump(key); - } - closeContext("]"); - dumpNewline(); - m_indent -= m_indentIncrement; - closeContext(); - } else if (const IntValue *v = value->asIntValue()) { - basicDump("IntValue", v, false); - } else if (const RealValue *v = value->asRealValue()) { - basicDump("RealValue", v, false); - } else { - basicDump("NumberValue", value, false); - } -} - -void DescribeValueVisitor::visit(const BooleanValue *value) -{ - basicDump("BooleanValue", value, false); -} - -void DescribeValueVisitor::visit(const StringValue *value) -{ - if (const UrlValue *v = value->asUrlValue()) - basicDump("UrlValue", v, false); - else - basicDump("StringValue", value, false); -} - -class PrintMembers : public MemberProcessor { -public: - DescribeValueVisitor &d; - PrintMembers(DescribeValueVisitor &describer) - : d(describer) { } - - bool dump(const QString &name, const Value *value) - { - d.dumpNewline(); - d.dump(name); - d.openContext(":"); - value->accept(&d); - d.closeContext(""); - return true; - } - - bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) override - { - d.dumpNewline(); - d.dump(name); - d.openContext(":"); - d.dump("<"); - d.dump(pInfo.toString()); - d.dump(">"); - d.dumpNewline(); // avoid? - value->accept(&d); - d.closeContext(""); - return true; - } - bool processEnumerator(const QString &name, const Value *value) override - { - return dump(name, value); - } - bool processSignal(const QString &name, const Value *value) override - { - return dump(name, value); - } - bool processSlot(const QString &name, const Value *value) override - { - return dump(name, value); - } - bool processGeneratedSlot(const QString &name, const Value *value) override - { - return dump(name, value); - } -}; - -void DescribeValueVisitor::visit(const ObjectValue *value) -{ - bool printDetail = (++m_depth <= 0 && ! m_visited.contains(value)); - m_visited.insert(value); - if (const ASTObjectValue *v = value->asAstObjectValue()) { - basicDump("ASTObjectValue", value, printDetail); - if (printDetail) { - if (v->typeName()) { - dumpNewline(); - dump("typeName:"); - dump(v->typeName()->name.toString()); - } - dumpNewline(); - dump("defaultPropertyName:"); - dump(v->defaultPropertyName()); - } - } else if (const FunctionValue *f = value->asFunctionValue()) { - if (const ASTFunctionValue *v = f->asAstFunctionValue()) { - basicDump("ASTFunctionValue", v, printDetail); - if (printDetail && v->ast()) { - dumpNewline(); - dump("name:"); - dump(v->ast()->name.toString()); - } - } else if (const ASTSignal *v = f->asAstSignal()) { - basicDump("ASTSignal", v, printDetail); - if (printDetail) { - if (v->ast()) { - dumpNewline(); - dump("name:"); - dump(v->ast()->name.toString()); - } - dumpNewline(); - dump("slotName:"); - dump(v->slotName()); - } - } else if (f->asFunction()) { - basicDump("Function", f, printDetail); - } else if (f->asMetaFunction()) { - basicDump("MetaFunction", f, printDetail); - } else { - basicDump("FunctionValue", f, printDetail); - } - if (printDetail) { - dumpNewline(); - dump("returnValue:"); - (*this)(f->returnValue()); - dump("arguments:"); - openContext("["); - for (int i = 1; i < f->namedArgumentCount() - f->optionalNamedArgumentCount(); ++i) { - dumpNewline(); - (*this)(f->argument(i)); - dump(" "); - dump(f->argumentName(i)); - } - if (f->optionalNamedArgumentCount()) { - dumpNewline(); - dump("// optional arguments"); - dumpNewline(); - } - for (int i = f->namedArgumentCount() - f->optionalNamedArgumentCount(); - i < f->namedArgumentCount(); ++i) { - dumpNewline(); - (*this)(f->argument(i)); - dump(" "); - dump(f->argumentName(i)); - } - closeContext("]"); - dumpNewline(); - if (f->isVariadic()) - dump("isVariadic: true"); - } - } else if (const CppComponentValue *v = value->asCppComponentValue()) { - basicDump("CppComponentValue", value, printDetail); - if (printDetail) { - LanguageUtils::FakeMetaObject::ConstPtr metaObject = v->metaObject(); - dumpNewline(); - dump("metaObject:"); - if (metaObject.isNull()) - dump("**NULL**"); - else - metaObject->describe(true, m_indent + m_indentIncrement); - dumpNewline(); - dump("moduleName:"); - dump(v->moduleName()); - dumpNewline(); - dump("componentVersion:"); - dump(v->componentVersion().toString()); - dumpNewline(); - dump("importVersion:"); - dump(v->importVersion().toString()); - dumpNewline(); - dump("defaultPropertyName:"); - dump(v->defaultPropertyName()); - - /*QString propertyType(const QString &propertyName) const; - bool isListProperty(const QString &name) const; - bool isWritable(const QString &propertyName) const; - bool isPointer(const QString &propertyName) const; - bool hasLocalProperty(const QString &typeName) const; - bool hasProperty(const QString &typeName) const;*/ - - } - } else if (value->asJSImportScope()) { - basicDump("JSImportScope", value, printDetail); - } else if (value->asTypeScope()) { - basicDump("TypeScope", value, printDetail); - } else { - basicDump("ObjectValue", value, printDetail); - } - if (printDetail) { - dumpNewline(); - dump("className:"); - dump(value->className()); - dumpNewline(); - dump("members:"); - openContext("["); - PrintMembers printMembers(*this); - value->processMembers(&printMembers); - closeContext("]"); - dumpNewline(); - dump("prototype:"); - (*this)(value->prototype()); - closeContext(); - } - --m_depth; -} - -void DescribeValueVisitor::visit(const FunctionValue *f) -{ - const ObjectValue *o = f; - visit(o); -} - -void DescribeValueVisitor::visit(const Reference *value) -{ - bool printDetail = (++m_depth <= 0 && ! m_visited.contains(value)); - m_visited.insert(value); - if (const ASTPropertyReference *v = value->asAstPropertyReference()) { - basicDump("ASTPropertyReference", v, printDetail); - if (printDetail) { - if (AST::UiPublicMember *ast = v->ast()) { - dumpNewline(); - dump("property:"); - dump(ast->name.toString()); - } - dumpNewline(); - dump("onChangedSlotName:"); - dump(v->onChangedSlotName()); - } - } else if (const ASTVariableReference *v = value->asAstVariableReference()) { - basicDump("ASTVariableReference", v, printDetail); - const AST::PatternElement *var = v->ast(); - if (printDetail && var && var->isVariableDeclaration()) { - dumpNewline(); - dump("variable:"); - dump(var->bindingIdentifier.toString()); - } - } else if (const QmlPrototypeReference *v = value->asQmlPrototypeReference()) { - basicDump("QmlPrototypeReference", v, printDetail); - const AST::UiQualifiedId *qmlTypeName = v->qmlTypeName(); - if (printDetail && qmlTypeName) { - dumpNewline(); - dump("qmlTypeName:"); - dump(qmlTypeName->name.toString()); - } - } else if (value->asQtObjectPrototypeReference()) { - basicDump("QtObjectPrototypeReference", value, printDetail); - } else { - basicDump("Reference", value, printDetail); - } - if (printDetail) { - ValueOwner *vOwner = value->valueOwner(); - dumpNewline(); - dump(QString::fromLatin1("valueOwner@%1").arg((quintptr)(void *)vOwner, 0, 16)); - if (!m_context.isNull()) { - dumpNewline(); - dump("referencedObject:"); - const Value *refObj = m_context->lookupReference(value); - openContext(); - (*this)(refObj); - closeContext(); - } - closeContext(); - } - --m_depth; -} - -void DescribeValueVisitor::visit(const ColorValue *value) -{ - basicDump("ColorValue", value, false); -} - -void DescribeValueVisitor::visit(const AnchorLineValue *value) -{ - basicDump("AnchorLineValue", value, false); -} - -QString DescribeValueVisitor::description() const -{ - return m_description; -} - -} // namespace QmlJS diff --git a/src/libs/qmljs/qmljsdescribevalue.h b/src/libs/qmljs/qmljsdescribevalue.h deleted file mode 100644 index 3c5d23bcbd..0000000000 --- a/src/libs/qmljs/qmljsdescribevalue.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 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. -** -****************************************************************************/ - -#pragma once - -#include "qmljs_global.h" -#include "qmljsinterpreter.h" - -#include <QString> -#include <QSet> - -namespace QmlJS { - -class QMLJS_EXPORT DescribeValueVisitor : public ValueVisitor -{ -public: - static QString describe(const Value *value, int depth = 1, ContextPtr context = ContextPtr()); - - DescribeValueVisitor(int detailDepth = 1, int startIndent = 0, int indentIncrement = 2, - ContextPtr context = ContextPtr()); - virtual ~DescribeValueVisitor(); - - QString operator()(const Value *value); - void visit(const NullValue *) override; - void visit(const UndefinedValue *) override; - void visit(const UnknownValue *) override; - void visit(const NumberValue *) override; - void visit(const BooleanValue *) override; - void visit(const StringValue *) override; - void visit(const ObjectValue *) override; - void visit(const FunctionValue *) override; - void visit(const Reference *) override; - void visit(const ColorValue *) override; - void visit(const AnchorLineValue *) override; - QString description() const; - void basicDump(const char *baseName, const Value *value, bool opensContext); - void dumpNewline(); - void openContext(const char *openStr = "{"); - void closeContext(const char *closeStr = "}"); - void dump(const char *toAdd); - void dump(const QString &toAdd); -private: - int m_depth; - int m_indent; - int m_indentIncrement; - bool m_emptyContext = false; - ContextPtr m_context; - QSet<const Value *> m_visited; - QString m_description; -}; - -} // namespace QmlJS |