r12665 committed - Reject local module declarations.... - v8-dev

The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Message from discussion r12665 committed - Reject local module declarations....
Received-SPF: pass (google.com: domain of 3_6RuUBAKBows4tu8y9u-347u51Ew44w1u.s42BO-tuBw44w1uw74A58....@codesite.bounces.google.com designates 209.85.216.75 as permitted sender) client-ip=209.85.216.75;
MIME-Version: 1.0
Message-ID: <bcaec51ba5932f360004cb4c4...@google.com>
Date: Fri, 05 Oct 2012 09:14:39 +0000
Subject: [v8] r12665 committed - Reject local module declarations....
From: codesite-nore...@google.com
To: v8-dev@googlegroups.com
Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes

Revision: 12665
Author:   rossb...@chromium.org
Date:     Fri Oct  5 02:14:08 2012
Log:      Reject local module declarations.

R=mstarzin...@chromium.org
BUG=150628

Review URL: https://codereview.chromium.org/11033025
http://code.google.com/p/v8/source/detail?r=12665

Modified:
  /branches/bleeding_edge/src/parser.cc
  /branches/bleeding_edge/src/parser.h
  /branches/bleeding_edge/test/mjsunit/harmony/module-parsing.js

=======================================
--- /branches/bleeding_edge/src/parser.cc	Fri Oct  5 02:07:53 2012
+++ /branches/bleeding_edge/src/parser.cc	Fri Oct  5 02:14:08 2012
@@ -642,7 +642,7 @@
      ZoneList<Statement*>* body = new(zone()) ZoneList<Statement*>(16,  
zone());
      bool ok = true;
      int beg_loc = scanner().location().beg_pos;
-    ParseSourceElements(body, Token::EOS, info->is_eval(), &ok);
+    ParseSourceElements(body, Token::EOS, info->is_eval(), true, &ok);
      if (ok && !top_scope_->is_classic_mode()) {
        CheckOctalLiteral(beg_loc, scanner().location().end_pos, &ok);
      }
@@ -1007,6 +1007,7 @@
  void* Parser::ParseSourceElements(ZoneList<Statement*>* processor,
                                    int end_token,
                                    bool is_eval,
+                                  bool is_global,
                                    bool* ok) {
    // SourceElements ::
    //   (ModuleElement)* <end_token>
@@ -1028,7 +1029,12 @@
      }

      Scanner::Location token_loc = scanner().peek_location();
-    Statement* stat = ParseModuleElement(NULL, CHECK_OK);
+    Statement* stat;
+    if (is_global && !is_eval) {
+      stat = ParseModuleElement(NULL, CHECK_OK);
+    } else {
+      stat = ParseBlockElement(NULL, CHECK_OK);
+    }
      if (stat == NULL || stat->IsEmpty()) {
        directive_prologue = false;   // End of directive prologue.
        continue;
@@ -4533,7 +4539,7 @@
                                       RelocInfo::kNoPosition)),
                                       zone());
        }
-      ParseSourceElements(body, Token::RBRACE, false, CHECK_OK);
+      ParseSourceElements(body, Token::RBRACE, false, false, CHECK_OK);

        materialized_literal_count =  
function_state.materialized_literal_count();
        expected_property_count = function_state.expected_property_count();
=======================================
--- /branches/bleeding_edge/src/parser.h	Mon Sep 24 09:22:17 2012
+++ /branches/bleeding_edge/src/parser.h	Fri Oct  5 02:14:08 2012
@@ -590,8 +590,8 @@
    // which is set to false if parsing failed; it is unchanged otherwise.
    // By making the 'exception handling' explicit, we are forced to check
    // for failure at the call sites.
-  void* ParseSourceElements(ZoneList<Statement*>* processor,
-                            int end_token, bool is_eval, bool* ok);
+  void* ParseSourceElements(ZoneList<Statement*>* processor, int end_token,
+                            bool is_eval, bool is_global, bool* ok);
    Statement* ParseModuleElement(ZoneStringList* labels, bool* ok);
    Statement* ParseModuleDeclaration(ZoneStringList* names, bool* ok);
    Module* ParseModule(bool* ok);
=======================================
--- /branches/bleeding_edge/test/mjsunit/harmony/module-parsing.js	Mon Jul   
9 01:59:03 2012
+++ /branches/bleeding_edge/test/mjsunit/harmony/module-parsing.js	Fri Oct   
5 02:14:08 2012
@@ -162,3 +162,29 @@

  module
  v = 20
+
+
+
+// Check that module declarations are rejected in eval or local scope.
+
+module M { export let x; }
+
+assertThrows("export x;", SyntaxError);  // It's using eval, so should  
throw.
+assertThrows("export let x;", SyntaxError);
+assertThrows("import x from M;", SyntaxError);
+assertThrows("module M {};", SyntaxError);
+
+assertThrows("{ export x; }", SyntaxError);
+assertThrows("{ export let x; }", SyntaxError);
+assertThrows("{ import x from M; }", SyntaxError);
+assertThrows("{ module M {}; }", SyntaxError);
+
+assertThrows("function f() { export x; }", SyntaxError);
+assertThrows("function f() { export let x; }", SyntaxError);
+assertThrows("function f() { import x from M; }", SyntaxError);
+assertThrows("function f() { module M {}; }", SyntaxError);
+
+assertThrows("function f() { { export x; } }", SyntaxError);
+assertThrows("function f() { { export let x; } }", SyntaxError);
+assertThrows("function f() { { import x from M; } }", SyntaxError);
+assertThrows("function f() { { module M {}; } }", SyntaxError);
Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy
Account Options
