aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4compileddata_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <[email protected]>2014-01-24 16:49:03 +0100
committerThe Qt Project <[email protected]>2014-01-28 10:41:46 +0100
commitcad0f7e5b9915b1f4579f25121f7b9231405bfa2 (patch)
tree63b0a6347408587f9d495dde83448cc674203e9b /src/qml/compiler/qv4compileddata_p.h
parent118c2d30b9d031175dfff3085264be5612e4a419 (diff)
[new compiler] Improved error handling
* When reporting errors with literal bindings, use the correct location for the report, the place where the literal value is declared. * Create property caches for group properties, so that later in the property validator we can do extra checks * Report an error when trying to declare an object to the default property of a group property * Similarlyl report an error when trying to use sub-objects with value type properties * Temporarily change tst_qqmllanguage::errors() to also try to instantiate the component, because for the moment some errors are only reported at instantiating time instead of compile time. That'll be fixed later when move checks get moved into the property validator. Change-Id: Icaa8d2edc7918c03001c40fba7880ee5cac10e69 Reviewed-by: Lars Knoll <[email protected]>
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
-rw-r--r--src/qml/compiler/qv4compileddata_p.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 4208ec9441..8fa3f83ea4 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -70,8 +70,8 @@ struct RegExp;
struct Location
{
- int line;
- int column;
+ qint32 line;
+ qint32 column;
};
// map from name index to location of first use
@@ -296,6 +296,7 @@ struct Q_QML_EXPORT Binding
quint32 stringIndex; // Set for Type_String and Type_Script (the latter because of script strings)
Location location;
+ Location valueLocation;
QString valueAsString(const Unit *unit) const;
QString valueAsScriptString(const Unit *unit) const;