diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:29:21 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:22 +0100 |
| commit | da2396478f04aa66d521e53ff24488e72c87d895 (patch) | |
| tree | 5bce39b395e4b14b7c3e2672c5b01c2060392652 /src/qml/jsruntime/qv4regexp_p.h | |
| parent | 84aae25c0b3003fb846568cf26a2c7150db14d9d (diff) | |
Cleanup RegExp
Move it's Data into the Heap namespace.
Change-Id: I4ed6ea481376ae1d0c1fb08b56feee4764083231
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4regexp_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4regexp_p.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h index 2ce39e812c..1ac85b4ef3 100644 --- a/src/qml/jsruntime/qv4regexp_p.h +++ b/src/qml/jsruntime/qv4regexp_p.h @@ -56,24 +56,28 @@ namespace QV4 { struct ExecutionEngine; struct RegExpCacheKey; -struct RegExp : public Managed -{ - struct Data : Heap::Base { - Data(ExecutionEngine* engine, const QString& pattern, bool ignoreCase, bool multiline); - ~Data(); - QString pattern; - OwnPtr<JSC::Yarr::BytecodePattern> byteCode; +namespace Heap { + +struct RegExp : Base { + RegExp(ExecutionEngine* engine, const QString& pattern, bool ignoreCase, bool multiline); + ~RegExp(); + QString pattern; + OwnPtr<JSC::Yarr::BytecodePattern> byteCode; #if ENABLE(YARR_JIT) - JSC::Yarr::YarrCodeBlock jitCode; + JSC::Yarr::YarrCodeBlock jitCode; #endif - RegExpCache *cache; - int subPatternCount; - bool ignoreCase; - bool multiLine; - }; - V4_MANAGED(Managed) - Q_MANAGED_TYPE(RegExp) + RegExpCache *cache; + int subPatternCount; + bool ignoreCase; + bool multiLine; +}; +} + +struct RegExp : public Managed +{ + V4_MANAGED(RegExp, Managed) + Q_MANAGED_TYPE(RegExp) QString pattern() const { return d()->pattern; } OwnPtr<JSC::Yarr::BytecodePattern> &byteCode() { return d()->byteCode; } |