Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
d866848a
Commit
d866848a
authored
Feb 21, 2011
by
Erik Verbruggen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-imported and re-generated the QML parser from Qt.
parent
d6217a07
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
13 deletions
+15
-13
src/libs/qmljs/parser/qmljs.g
src/libs/qmljs/parser/qmljs.g
+1
-1
src/libs/qmljs/parser/qmljsengine_p.cpp
src/libs/qmljs/parser/qmljsengine_p.cpp
+2
-2
src/libs/qmljs/parser/qmljsengine_p.h
src/libs/qmljs/parser/qmljsengine_p.h
+3
-3
src/libs/qmljs/parser/qmljslexer.cpp
src/libs/qmljs/parser/qmljslexer.cpp
+1
-1
src/libs/qmljs/parser/qmljsparser.cpp
src/libs/qmljs/parser/qmljsparser.cpp
+7
-5
src/libs/qmljs/parser/qmljsparser_p.h
src/libs/qmljs/parser/qmljsparser_p.h
+1
-1
No files found.
src/libs/qmljs/parser/qmljs.g
View file @
d866848a
...
...
@@ -367,7 +367,7 @@ protected:
QList<DiagnosticMessage> diagnostic_messages;
};
} // namespace QmlJS
} //
end of
namespace QmlJS
:/
...
...
src/libs/qmljs/parser/qmljsengine_p.cpp
View file @
d866848a
...
...
@@ -45,7 +45,7 @@
#include "qmljsnodepool_p.h"
#include <qnumeric.h>
#include <
QtCore/
QHash>
#include <QHash>
QT_QML_BEGIN_NAMESPACE
...
...
@@ -207,6 +207,6 @@ void Engine::setNodePool(NodePool *nodePool)
}
// namespace QmlJS
}
//
end of
namespace QmlJS
QT_QML_END_NAMESPACE
src/libs/qmljs/parser/qmljsengine_p.h
View file @
d866848a
...
...
@@ -86,7 +86,7 @@ public:
uint
qHash
(
const
QmlJS
::
NameId
&
id
);
}
// namespace QmlJS
}
//
end of
namespace QmlJS
#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
//this ensures that code outside QmlJS can use the hash function
...
...
@@ -115,7 +115,7 @@ public:
static
QString
flagsToString
(
int
flags
);
};
}
// namespace Ecma
}
//
end of
namespace Ecma
class
QML_PARSER_EXPORT
DiagnosticMessage
{
...
...
@@ -166,7 +166,7 @@ public:
void
setNodePool
(
NodePool
*
nodePool
);
};
}
// namespace QmlJS
}
//
end of
namespace QmlJS
QT_QML_END_NAMESPACE
...
...
src/libs/qmljs/parser/qmljslexer.cpp
View file @
d866848a
...
...
@@ -619,7 +619,7 @@ int Lexer::lex()
}
else
{
setDone
(
Bad
);
err
=
IllegalEscapeSequence
;
errmsg
=
QCoreApplication
::
translate
(
"QmlParser"
,
"Illegal escape squence"
);
errmsg
=
QCoreApplication
::
translate
(
"QmlParser"
,
"Illegal escape s
e
quence"
);
}
}
else
if
(
current
==
'x'
)
state
=
InHexEscape
;
...
...
src/libs/qmljs/parser/qmljsparser.cpp
View file @
d866848a
...
...
@@ -39,18 +39,20 @@
**
****************************************************************************/
#include "qmljsparser_p.h"
#include <QtCore/QtDebug>
#include <QtGui/QApplication>
#include <string.h>
#include "qmljsengine_p.h"
#include "qmljslexer_p.h"
#include "qmljsast_p.h"
#include "qmljsnodepool_p.h"
#include <QtCore/QtDebug>
#include <QtCore/QVarLengthArray>
#include <QtGui/QApplication>
#include <string.h>
#include "qmljsparser_p.h"
#include <QVarLengthArray>
//
// This file is automatically generated from qmljs.g.
...
...
src/libs/qmljs/parser/qmljsparser_p.h
View file @
d866848a
...
...
@@ -231,7 +231,7 @@ protected:
QList
<
DiagnosticMessage
>
diagnostic_messages
;
};
}
// namespace QmlJS
}
//
end of
namespace QmlJS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment