diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-09 13:51:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 23:00:34 +0200 |
| commit | 1e17eb6cbd3c38e95c994ff00e529aecb6d530eb (patch) | |
| tree | ab0ba8c75db5992f803e738e538e71106fb761fa /src/qml/compiler/qv4compileddata_p.h | |
| parent | 346662cb011b7962a8cabf6d55742cd050a6ba6c (diff) | |
[new compiler] Improve error reporting
Re-enable COMPILE_EXCEPTION calls that were commented out due to missing
location information (that this patch also adds).
Change-Id: I0d584f474cc7e879350c8aae2869a9603ba415aa
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 1308469564..7833097325 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -67,6 +67,12 @@ struct Function; struct Lookup; struct RegExp; +struct Location +{ + int line; + int column; +}; + struct RegExp { enum Flags { @@ -207,6 +213,7 @@ struct Function quint32 lineNumberMappingOffset; // Array of uint pairs (offset and line number) quint32 nInnerFunctions; quint32 innerFunctionsOffset; + Location location; // quint32 formalsIndex[nFormals] // quint32 localsIndex[nLocals] // quint32 offsetForInnerFunctions[nInnerFunctions] @@ -223,12 +230,6 @@ struct Function // Qml data structures -struct Location -{ - int line; - int column; -}; - struct Value { enum ValueType { @@ -297,6 +298,7 @@ struct Property quint32 type; quint32 customTypeNameIndex; quint32 flags; // readonly + Location location; }; struct Object |