Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1175)

Unified Diff: src/parser.h

Issue 663683006: Implement ES6 Template Literals (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/parser.h
diff --git a/src/parser.h b/src/parser.h
index 74f3944718f54b254d7b8aeebbcd3d39f34dbce7..e2efa11a7bbaf808f2a89ed31daa5fcc365328d2 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -592,6 +592,21 @@ class ParserTraits {
V8_INLINE void CheckConflictingVarDeclarations(v8::internal::Scope* scope,
bool* ok);
+ struct TemplateLiteralState {
+ TemplateLiteralState() : spans_(NULL), expressions_(NULL) {}
+ ZoneList<const AstTemplateSpan*>* spans_;
+ ZoneList<Expression*>* expressions_;
+ };
+
+ V8_INLINE TemplateLiteralState OpenTemplateLiteral() {
+ return TemplateLiteralState();
+ }
+ V8_INLINE void AddTemplateSpan(TemplateLiteralState* state);
+ V8_INLINE void AddTemplateExpression(TemplateLiteralState* state,
+ Expression* expression);
+ V8_INLINE Expression* CloseTemplateLiteral(TemplateLiteralState* state,
+ int pos);
+
private:
Parser* parser_;
};
@@ -823,6 +838,11 @@ class Parser : public ParserBase<ParserTraits> {
void ThrowPendingError();
+ void AddTemplateSpan(TemplateLiteralState* state);
+ void AddTemplateExpression(TemplateLiteralState* state,
+ Expression* expression);
+ Expression* CloseTemplateLiteral(TemplateLiteralState* state, int pos);
+
Scanner scanner_;
PreParser* reusable_preparser_;
Scope* original_scope_; // for ES5 function declarations in sloppy eval
@@ -923,6 +943,17 @@ class CompileTimeValue: public AllStatic {
DISALLOW_IMPLICIT_CONSTRUCTORS(CompileTimeValue);
};
+void ParserTraits::AddTemplateSpan(TemplateLiteralState* state) {
+ parser_->AddTemplateSpan(state);
+}
+void ParserTraits::AddTemplateExpression(TemplateLiteralState* state,
+ Expression* expression) {
+ parser_->AddTemplateExpression(state, expression);
+}
+Expression* ParserTraits::CloseTemplateLiteral(TemplateLiteralState* state,
+ int pos) {
+ return parser_->CloseTemplateLiteral(state, pos);
+}
} } // namespace v8::internal
#endif // V8_PARSER_H_

Powered by Google App Engine
This is Rietveld 408576698