Changeset View
Changeset View
Standalone View
Standalone View
src/qmljsc/ir/module.cpp
Show All 32 Lines | |||||
33 | #include <private/qqmljsengine_p.h> | 33 | #include <private/qqmljsengine_p.h> | ||
34 | #include <private/qqmljslexer_p.h> | 34 | #include <private/qqmljslexer_p.h> | ||
35 | #include <private/qqmljsparser_p.h> | 35 | #include <private/qqmljsparser_p.h> | ||
36 | 36 | | |||
37 | using namespace QmlJSc; | 37 | using namespace QmlJSc; | ||
38 | using namespace QmlJSc::IR; | 38 | using namespace QmlJSc::IR; | ||
39 | using namespace QQmlJS::AST; | 39 | using namespace QQmlJS::AST; | ||
40 | 40 | | |||
41 | Module::Module(ImportDescription import, QObject *parent) | 41 | Module::Module(QString name, int versionMajor, int versionMinor, QObject *parent) | ||
42 | : m_importDescription(import) | 42 | : m_name(name) | ||
43 | , m_versionMajor(versionMajor) | ||||
44 | , m_versionMinor(versionMinor) | ||||
43 | , m_loadingState(Loading) | 45 | , m_loadingState(Loading) | ||
44 | { | 46 | { | ||
45 | } | 47 | } | ||
46 | 48 | | |||
47 | Module::~Module() | 49 | Module::~Module() | ||
48 | { | 50 | { | ||
49 | foreach (Type *type, m_types) { | 51 | foreach (Type *type, m_types) { | ||
50 | delete type; | 52 | delete type; | ||
Show All 12 Lines | 62 | { | |||
63 | 65 | | |||
64 | m_loadingState = status; | 66 | m_loadingState = status; | ||
65 | if (m_loadingState == Successful || m_loadingState == ErrorState) { | 67 | if (m_loadingState == Successful || m_loadingState == ErrorState) { | ||
66 | m_loadFinishedCondition.wakeAll(); | 68 | m_loadFinishedCondition.wakeAll(); | ||
67 | } | 69 | } | ||
68 | } | 70 | } | ||
69 | 71 | | |||
70 | 72 | | |||
71 | const QString &Module::name() | 73 | const QString &Module::name() const | ||
72 | { | 74 | { | ||
73 | return m_importDescription.name; | 75 | return m_name; | ||
76 | } | ||||
77 | | ||||
78 | int QmlJSc::IR::Module::versionMajor() const | ||||
79 | { | ||||
80 | return m_versionMajor; | ||||
81 | } | ||||
82 | | ||||
83 | int QmlJSc::IR::Module::versionMinor() const | ||||
84 | { | ||||
85 | return m_versionMinor; | ||||
74 | } | 86 | } | ||
75 | 87 | | |||
76 | Type *Module::type(QString name) | 88 | Type *Module::type(QString name) | ||
77 | { | 89 | { | ||
78 | waitForLoaded(); | 90 | waitForLoaded(); | ||
79 | return m_types.value(name); | 91 | return m_types.value(name); | ||
80 | } | 92 | } | ||
81 | 93 | | |||
Show All 15 Lines | |||||
97 | { | 109 | { | ||
98 | if (m_loadingState != Loading) | 110 | if (m_loadingState != Loading) | ||
99 | return; | 111 | return; | ||
100 | 112 | | |||
101 | m_loadMutex.lock(); | 113 | m_loadMutex.lock(); | ||
102 | m_loadFinishedCondition.wait(&m_loadMutex); | 114 | m_loadFinishedCondition.wait(&m_loadMutex); | ||
103 | m_loadMutex.unlock(); | 115 | m_loadMutex.unlock(); | ||
104 | } | 116 | } | ||
105 | | ||||
106 | ImportDescription Module::importDescription() | | |||
107 | { | | |||
108 | return m_importDescription; | | |||
109 | } | |