From 402cba7089fa63f0b8b5e08d33df28a8af976d45 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 12 Apr 2013 15:26:48 +0200 Subject: Rename file to reflect class name change Change-Id: Ib6d32ac61f54f2fb4325f67c54aeb01b99624ab9 Reviewed-by: Simon Hausmann --- src/v4/qv4engine.h | 2 +- src/v4/qv4functionobject.h | 2 +- src/v4/qv4object.h | 2 +- src/v4/qv4objectiterator.h | 2 +- src/v4/qv4property.h | 152 +++++++++++++++++++++++++++++++++++++++++ src/v4/qv4propertydescriptor.h | 152 ----------------------------------------- src/v4/qv4regexpobject.h | 2 +- src/v4/qv4sparsearray.h | 2 +- src/v4/v4.pro | 2 +- 9 files changed, 159 insertions(+), 159 deletions(-) create mode 100644 src/v4/qv4property.h delete mode 100644 src/v4/qv4propertydescriptor.h diff --git a/src/v4/qv4engine.h b/src/v4/qv4engine.h index 9cf36d40..538796ee 100644 --- a/src/v4/qv4engine.h +++ b/src/v4/qv4engine.h @@ -46,7 +46,7 @@ #include "qv4object.h" #include "qv4util.h" #include "qv4context.h" -#include "qv4propertydescriptor.h" +#include "qv4property.h" #include #include diff --git a/src/v4/qv4functionobject.h b/src/v4/qv4functionobject.h index 1be3dd5e..e1860573 100644 --- a/src/v4/qv4functionobject.h +++ b/src/v4/qv4functionobject.h @@ -50,7 +50,7 @@ #include "qv4codegen_p.h" #include "qv4isel_p.h" #include "qv4managed.h" -#include "qv4propertydescriptor.h" +#include "qv4property.h" #include "qv4objectiterator.h" #include "qv4regexp.h" diff --git a/src/v4/qv4object.h b/src/v4/qv4object.h index a5ef0969..226c0056 100644 --- a/src/v4/qv4object.h +++ b/src/v4/qv4object.h @@ -50,7 +50,7 @@ #include "qv4codegen_p.h" #include "qv4isel_p.h" #include "qv4managed.h" -#include "qv4propertydescriptor.h" +#include "qv4property.h" #include "qv4internalclass.h" #include "qv4objectiterator.h" diff --git a/src/v4/qv4objectiterator.h b/src/v4/qv4objectiterator.h index 06c6ee80..c7401326 100644 --- a/src/v4/qv4objectiterator.h +++ b/src/v4/qv4objectiterator.h @@ -43,7 +43,7 @@ #include "qv4value.h" #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/v4/qv4property.h b/src/v4/qv4property.h new file mode 100644 index 00000000..afb5ede2 --- /dev/null +++ b/src/v4/qv4property.h @@ -0,0 +1,152 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the V4VM module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QV4PROPERTYDESCRIPTOR_H +#define QV4PROPERTYDESCRIPTOR_H + +#include "qv4global.h" +#include "qv4value.h" +#include "qv4internalclass.h" + +QT_BEGIN_NAMESPACE + +namespace QQmlJS { +namespace VM { + +struct FunctionObject; + +struct Property { + union { + Value value; + struct { + FunctionObject *get; + FunctionObject *set; + }; + }; + + // Section 8.10 + inline void fullyPopulated(PropertyAttributes *attrs) { + if (!attrs->hasType()) { + value = Value::undefinedValue(); + } + if (attrs->type() == PropertyAttributes::Accessor) { + attrs->clearWritable(); + if (get == (FunctionObject *)0x1) + get = 0; + if (set == (FunctionObject *)0x1) + set = 0; + } + attrs->resolve(); + } + + static inline Property fromValue(Value v) { + Property pd; + pd.value = v; + return pd; + } + static inline Property fromAccessor(FunctionObject *getter, FunctionObject *setter) { + Property pd; + pd.get = getter; + pd.set = setter; + return pd; + } + + static Property genericDescriptor() { + Property pd; + pd.value = Value::deletedValue(); + return pd; + } + + inline bool isSubset(const PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs) const; + inline void merge(PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs); + + inline FunctionObject *getter() const { return get; } + inline FunctionObject *setter() const { return set; } + inline void setGetter(FunctionObject *g) { get = g; } + inline void setSetter(FunctionObject *s) { set = s; } +}; + +inline bool Property::isSubset(const PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs) const +{ + if (attrs.type() != PropertyAttributes::Generic && attrs.type() != otherAttrs.type()) + return false; + if (attrs.hasEnumerable() && attrs.isEnumerable() != otherAttrs.isEnumerable()) + return false; + if (attrs.hasConfigurable() && attrs.isConfigurable() != otherAttrs.isConfigurable()) + return false; + if (attrs.hasWritable() && attrs.isWritable() != otherAttrs.isWritable()) + return false; + if (attrs.type() == PropertyAttributes::Data && !value.sameValue(other.value)) + return false; + if (attrs.type() == PropertyAttributes::Accessor) { + if (get != other.get) + return false; + if (set != other.set) + return false; + } + return true; +} + +inline void Property::merge(PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs) +{ + if (otherAttrs.hasEnumerable()) + attrs.setEnumerable(otherAttrs.isEnumerable()); + if (otherAttrs.hasConfigurable()) + attrs.setConfigurable(otherAttrs.isConfigurable()); + if (otherAttrs.hasWritable()) + attrs.setWritable(otherAttrs.isWritable()); + if (otherAttrs.type() == PropertyAttributes::Accessor) { + attrs.setType(PropertyAttributes::Accessor); + if (other.get) + get = (other.get == (FunctionObject *)0x1) ? 0 : other.get; + if (other.set) + set = (other.set == (FunctionObject *)0x1) ? 0 : other.set; + } else if (otherAttrs.type() == PropertyAttributes::Data){ + attrs.setType(PropertyAttributes::Data); + value = other.value; + } +} + +} // namespace VM +} // namespace QQmlJS + +QT_END_NAMESPACE + +#endif diff --git a/src/v4/qv4propertydescriptor.h b/src/v4/qv4propertydescriptor.h deleted file mode 100644 index afb5ede2..00000000 --- a/src/v4/qv4propertydescriptor.h +++ /dev/null @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the V4VM module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QV4PROPERTYDESCRIPTOR_H -#define QV4PROPERTYDESCRIPTOR_H - -#include "qv4global.h" -#include "qv4value.h" -#include "qv4internalclass.h" - -QT_BEGIN_NAMESPACE - -namespace QQmlJS { -namespace VM { - -struct FunctionObject; - -struct Property { - union { - Value value; - struct { - FunctionObject *get; - FunctionObject *set; - }; - }; - - // Section 8.10 - inline void fullyPopulated(PropertyAttributes *attrs) { - if (!attrs->hasType()) { - value = Value::undefinedValue(); - } - if (attrs->type() == PropertyAttributes::Accessor) { - attrs->clearWritable(); - if (get == (FunctionObject *)0x1) - get = 0; - if (set == (FunctionObject *)0x1) - set = 0; - } - attrs->resolve(); - } - - static inline Property fromValue(Value v) { - Property pd; - pd.value = v; - return pd; - } - static inline Property fromAccessor(FunctionObject *getter, FunctionObject *setter) { - Property pd; - pd.get = getter; - pd.set = setter; - return pd; - } - - static Property genericDescriptor() { - Property pd; - pd.value = Value::deletedValue(); - return pd; - } - - inline bool isSubset(const PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs) const; - inline void merge(PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs); - - inline FunctionObject *getter() const { return get; } - inline FunctionObject *setter() const { return set; } - inline void setGetter(FunctionObject *g) { get = g; } - inline void setSetter(FunctionObject *s) { set = s; } -}; - -inline bool Property::isSubset(const PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs) const -{ - if (attrs.type() != PropertyAttributes::Generic && attrs.type() != otherAttrs.type()) - return false; - if (attrs.hasEnumerable() && attrs.isEnumerable() != otherAttrs.isEnumerable()) - return false; - if (attrs.hasConfigurable() && attrs.isConfigurable() != otherAttrs.isConfigurable()) - return false; - if (attrs.hasWritable() && attrs.isWritable() != otherAttrs.isWritable()) - return false; - if (attrs.type() == PropertyAttributes::Data && !value.sameValue(other.value)) - return false; - if (attrs.type() == PropertyAttributes::Accessor) { - if (get != other.get) - return false; - if (set != other.set) - return false; - } - return true; -} - -inline void Property::merge(PropertyAttributes &attrs, const Property &other, PropertyAttributes otherAttrs) -{ - if (otherAttrs.hasEnumerable()) - attrs.setEnumerable(otherAttrs.isEnumerable()); - if (otherAttrs.hasConfigurable()) - attrs.setConfigurable(otherAttrs.isConfigurable()); - if (otherAttrs.hasWritable()) - attrs.setWritable(otherAttrs.isWritable()); - if (otherAttrs.type() == PropertyAttributes::Accessor) { - attrs.setType(PropertyAttributes::Accessor); - if (other.get) - get = (other.get == (FunctionObject *)0x1) ? 0 : other.get; - if (other.set) - set = (other.set == (FunctionObject *)0x1) ? 0 : other.set; - } else if (otherAttrs.type() == PropertyAttributes::Data){ - attrs.setType(PropertyAttributes::Data); - value = other.value; - } -} - -} // namespace VM -} // namespace QQmlJS - -QT_END_NAMESPACE - -#endif diff --git a/src/v4/qv4regexpobject.h b/src/v4/qv4regexpobject.h index 9447c051..df4190ba 100644 --- a/src/v4/qv4regexpobject.h +++ b/src/v4/qv4regexpobject.h @@ -49,7 +49,7 @@ #include "qv4codegen_p.h" #include "qv4isel_p.h" #include "qv4managed.h" -#include "qv4propertydescriptor.h" +#include "qv4property.h" #include "qv4objectiterator.h" #include "qv4regexp.h" diff --git a/src/v4/qv4sparsearray.h b/src/v4/qv4sparsearray.h index c0a79b20..a6f7d40c 100644 --- a/src/v4/qv4sparsearray.h +++ b/src/v4/qv4sparsearray.h @@ -45,7 +45,7 @@ #include "qv4global.h" #include #include -#include +#include #include #ifdef Q_MAP_DEBUG diff --git a/src/v4/v4.pro b/src/v4/v4.pro index 62132687..7f5e3e50 100644 --- a/src/v4/v4.pro +++ b/src/v4/v4.pro @@ -86,7 +86,7 @@ HEADERS += \ qv4regexpobject.h \ qv4stringobject.h \ qv4string.h \ - qv4propertydescriptor.h \ + qv4property.h \ qv4objectiterator.h \ qv4regexp.h \ qv4unwindhelper.h \ -- cgit v1.2.3