diff options
author | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
commit | 7e30c92186878beb300a13093c3668ae8a10f2be (patch) | |
tree | 313aa7f7a8345e65b7803bae1cb68ad866bdadbc /src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h | |
parent | b98042831f4f6f6c5844965731b2dd64f27c076e (diff) | |
parent | aeb4251c76560a070ce22320be00e860950b4668 (diff) | |
download | Qt-7e30c92186878beb300a13093c3668ae8a10f2be.zip Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.gz Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h index 84e8b95..185cede 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h @@ -36,6 +36,10 @@ #include <wtf/MathExtras.h> #include <wtf/OwnPtr.h> +#ifdef QT_BUILD_SCRIPT_LIB +#include "SourcePoolQt.h" +#endif + namespace JSC { class ArgumentListNode; @@ -191,9 +195,10 @@ namespace JSC { public: StatementNode(JSGlobalData*); - void setLoc(int line0, int line1); + void setLoc(int line0, int line1, int column); int firstLine() const { return lineNo(); } int lastLine() const { return m_lastLine; } + int column() const { return m_column; } virtual bool isEmptyStatement() const { return false; } virtual bool isReturnNode() const { return false; } @@ -203,6 +208,7 @@ namespace JSC { private: int m_lastLine; + int m_column; }; class NullNode : public ExpressionNode { @@ -1605,6 +1611,9 @@ namespace JSC { Identifier* m_parameters; size_t m_parameterCount; OwnPtr<CodeBlock> m_code; +#ifdef QT_BUILD_SCRIPT_LIB + SourcePool::SourcePoolToken* sourceToken; +#endif }; class FuncExprNode : public ExpressionNode, public ParserArenaRefCounted { |