Revision: 10832
Author: [email protected]
Date: Fri Feb 24 07:53:09 2012
Log: Make 'module' a context-sensitive keyword.
Baseline: http://codereview.chromium.org/9401008/
[email protected],[email protected]
BUG=v8:1957
TEST=mjsunit/harmony/module-parsing
Review URL: https://chromiumcodereview.appspot.com/9422001
http://code.google.com/p/v8/source/detail?r=10832
Modified:
/branches/bleeding_edge/src/heap.h
/branches/bleeding_edge/src/parser.cc
/branches/bleeding_edge/src/scanner.cc
/branches/bleeding_edge/src/token.h
/branches/bleeding_edge/test/mjsunit/harmony/module-parsing.js
=======================================
--- /branches/bleeding_edge/src/heap.h Fri Feb 24 06:34:01 2012
+++ /branches/bleeding_edge/src/heap.h Fri Feb 24 07:53:09 2012
@@ -177,6 +177,7 @@
V(eval_symbol, "eval") \
V(function_symbol, "function") \
V(length_symbol, "length") \
+ V(module_symbol, "module") \
V(name_symbol, "name") \
V(native_symbol, "native") \
V(null_symbol, "null") \
=======================================
--- /branches/bleeding_edge/src/parser.cc Mon Feb 20 06:02:59 2012
+++ /branches/bleeding_edge/src/parser.cc Fri Feb 24 07:53:09 2012
@@ -1188,14 +1188,28 @@
case Token::LET:
case Token::CONST:
return ParseVariableStatement(kModuleElement, ok);
- case Token::MODULE:
- return ParseModuleDeclaration(ok);
case Token::IMPORT:
return ParseImportDeclaration(ok);
case Token::EXPORT:
return ParseExportDeclaration(ok);
- default:
- return ParseStatement(labels, ok);
+ default: {
+ Statement* stmt = ParseStatement(labels, CHECK_OK);
+ // Handle 'module' as a context-sensitive keyword.
+ if (FLAG_harmony_modules &&
+ peek() == Token::IDENTIFIER &&
+ !scanner().HasAnyLineTerminatorBeforeNext() &&
+ stmt != NULL) {
+ ExpressionStatement* estmt = stmt->AsExpressionStatement();
+ if (estmt != NULL &&
+ estmt->expression()->AsVariableProxy() != NULL &&
+ estmt->expression()->AsVariableProxy()->name()->Equals(
+ isolate()->heap()->module_symbol()) &&
+ !scanner().literal_contains_escapes()) {
+ return ParseModuleDeclaration(ok);
+ }
+ }
+ return stmt;
+ }
}
}
@@ -1206,7 +1220,6 @@
// Create new block with one expected declaration.
Block* block = factory()->NewBlock(NULL, 1, true);
- Expect(Token::MODULE, CHECK_OK);
Handle<String> name = ParseIdentifier(CHECK_OK);
// top_scope_->AddDeclaration(
// factory()->NewModuleDeclaration(proxy, module, top_scope_));
@@ -2172,8 +2185,17 @@
return ParseNativeDeclaration(ok);
}
- // Parsed expression statement.
- ExpectSemicolon(CHECK_OK);
+ // Parsed expression statement, or the context-sensitive 'module'
keyword.
+ // Only expect semicolon in the former case.
+ if (!FLAG_harmony_modules ||
+ peek() != Token::IDENTIFIER ||
+ scanner().HasAnyLineTerminatorBeforeNext() ||
+ expr->AsVariableProxy() == NULL ||
+ !expr->AsVariableProxy()->name()->Equals(
+ isolate()->heap()->module_symbol()) ||
+ scanner().literal_contains_escapes()) {
+ ExpectSemicolon(CHECK_OK);
+ }
return factory()->NewExpressionStatement(expr);
}
=======================================
--- /branches/bleeding_edge/src/scanner.cc Wed Feb 8 02:53:58 2012
+++ /branches/bleeding_edge/src/scanner.cc Fri Feb 24 07:53:09 2012
@@ -850,9 +850,6 @@
KEYWORD_GROUP('l') \
KEYWORD("let", harmony_scoping \
? Token::LET : Token::FUTURE_STRICT_RESERVED_WORD) \
- KEYWORD_GROUP('m') \
- KEYWORD("module", harmony_modules \
- ? Token::MODULE : Token::IDENTIFIER) \
KEYWORD_GROUP('n') \
KEYWORD("new", Token::NEW) \
KEYWORD("null", Token::NULL_LITERAL) \
=======================================
--- /branches/bleeding_edge/src/token.h Wed Feb 8 02:53:58 2012
+++ /branches/bleeding_edge/src/token.h Fri Feb 24 07:53:09 2012
@@ -173,7 +173,6 @@
K(EXPORT, "export", 0) \
K(IMPORT, "import", 0) \
K(LET, "let", 0) \
- K(MODULE, "module", 0) \
\
/* Illegal token - not able to scan. */ \
T(ILLEGAL, "ILLEGAL", 0) \
=======================================
--- /branches/bleeding_edge/test/mjsunit/harmony/module-parsing.js Mon Feb
20 06:02:59 2012
+++ /branches/bleeding_edge/test/mjsunit/harmony/module-parsing.js Fri Feb
24 07:53:09 2012
@@ -63,18 +63,28 @@
// Check that ASI does not interfere.
-module
-X
+module X
{
let x
}
-module
-Y
+module Y
=
X
-module
-Z
+module Z
at
"file://local"
+
+
+// Check that 'module' still works as an identifier.
+
+var module
+module = {}
+module["a"] = 6
+function module() {}
+function f(module) { return module }
+try {} catch (module) {}
+
+module
+v = 20
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
