diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-06 13:59:47 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 04:24:10 +0200 |
commit | e8cb9ac132dbac4c7373a47469a097e572b818d2 (patch) | |
tree | d2874528fd391ce6fb0ac979df6019f2ba8e11ee /src/qml/compiler/qv4codegen_p.h | |
parent | e04cadca4a6c0b43d29c83d23ac74393694a5ea5 (diff) |
Cleanup: Separate JS environment scanner class declaration from definition
This will allow the use of it from outside.
Change-Id: Ia05a17b4b4f3e772554979e215a6252a75a63273
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
-rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 72 |
1 files changed, 71 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index 85c38d8d8c..2aa4b42c6a 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -46,8 +46,10 @@ #include <private/qqmljsastvisitor_p.h> #include <private/qqmljsast_p.h> #include <QtCore/QStringList> +#include <QStack> #include <qqmlerror.h> #include <assert.h> +#include <private/qv4util_p.h> QT_BEGIN_NAMESPACE @@ -433,7 +435,75 @@ protected: QList<QQmlError> _errors; - class ScanFunctions; + class ScanFunctions: Visitor + { + typedef QV4::TemporaryAssignment<bool> TemporaryBoolAssignment; + public: + ScanFunctions(Codegen *cg, const QString &sourceCode); + void operator()(AST::Node *node); + + void enterEnvironment(AST::Node *node); + void leaveEnvironment(); + + protected: + using Visitor::visit; + using Visitor::endVisit; + + void checkDirectivePrologue(AST::SourceElements *ast); + + void checkName(const QStringRef &name, const AST::SourceLocation &loc); + void checkForArguments(AST::FormalParameterList *parameters); + + virtual bool visit(AST::Program *ast); + virtual void endVisit(AST::Program *); + + virtual bool visit(AST::CallExpression *ast); + virtual bool visit(AST::NewMemberExpression *ast); + virtual bool visit(AST::ArrayLiteral *ast); + virtual bool visit(AST::VariableDeclaration *ast); + virtual bool visit(AST::IdentifierExpression *ast); + virtual bool visit(AST::ExpressionStatement *ast); + virtual bool visit(AST::FunctionExpression *ast); + + void enterFunction(AST::FunctionExpression *ast, bool enterName, bool isExpression = true); + + virtual void endVisit(AST::FunctionExpression *); + + virtual bool visit(AST::ObjectLiteral *ast); + + virtual bool visit(AST::PropertyGetterSetter *ast); + virtual void endVisit(AST::PropertyGetterSetter *); + + virtual bool visit(AST::FunctionDeclaration *ast); + virtual void endVisit(AST::FunctionDeclaration *); + + virtual bool visit(AST::FunctionBody *ast); + + virtual bool visit(AST::WithStatement *ast); + + virtual bool visit(AST::IfStatement *ast); + virtual bool visit(AST::WhileStatement *ast); + virtual bool visit(AST::DoWhileStatement *ast); + virtual bool visit(AST::ForStatement *ast); + virtual bool visit(AST::LocalForStatement *ast); + virtual bool visit(AST::ForEachStatement *ast); + virtual bool visit(AST::LocalForEachStatement *ast); + + virtual bool visit(AST::Block *ast); + + protected: + void enterFunction(AST::Node *ast, const QString &name, AST::FormalParameterList *formals, AST::FunctionBody *body, AST::FunctionExpression *expr, bool isExpression); + + // fields: + Codegen *_cg; + const QString _sourceCode; + Environment *_env; + QStack<Environment *> _envStack; + + bool _inFuncBody; + bool _allowFuncDecls; + }; + }; class RuntimeCodegen : public Codegen |