Introduce extended mode.

src/preparser.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 399 matching lines @@
 
   class Scope {
    public:
     Scope(Scope** variable, ScopeType type)
         : variable_(variable),
           prev_(*variable),
           type_(type),
           materialized_literal_count_(0),
           expected_properties_(0),
           with_nesting_count_(0),
-          strict_mode_flag_((prev_ != NULL) ? prev_->strict_mode_flag()
-                            : i::kNonStrictMode) {
+          language_mode_((prev_ != NULL) ? prev_->language_mode()
+                            : i::CLASSIC_MODE) {
       *variable = this;
     }
     ~Scope() { *variable_ = prev_; }
     void NextMaterializedLiteralIndex() { materialized_literal_count_++; }
     void AddProperty() { expected_properties_++; }
     ScopeType type() { return type_; }
     int expected_properties() { return expected_properties_; }
     int materialized_literal_count() { return materialized_literal_count_; }
     bool IsInsideWith() { return with_nesting_count_ != 0; }
-    bool is_strict_mode() { return strict_mode_flag_ == i::kStrictMode; }
-    i::StrictModeFlag strict_mode_flag() {
-      return strict_mode_flag_;
+    bool is_strict_or_extended_mode() {
+      return language_mode_ != i::CLASSIC_MODE;
     }
-    void set_strict_mode_flag(i::StrictModeFlag strict_mode_flag) {
-      strict_mode_flag_ = strict_mode_flag;
+    i::LanguageMode language_mode() {
+      return language_mode_;
+    }
+    void set_language_mode(i::LanguageMode language_mode) {
+      language_mode_ = language_mode;
     }
     void EnterWith() { with_nesting_count_++; }
     void LeaveWith() { with_nesting_count_--; }
 
    private:
     Scope** const variable_;
     Scope* const prev_;
     const ScopeType type_;
     int materialized_literal_count_;
     int expected_properties_;
     int with_nesting_count_;
-    i::StrictModeFlag strict_mode_flag_;
+    i::LanguageMode language_mode_;
   };
 
   // Private constructor only used in PreParseProgram.
   PreParser(i::Scanner* scanner,
             i::ParserRecorder* log,
             uintptr_t stack_limit,
             bool allow_lazy,
             bool allow_natives_syntax)
       : scanner_(scanner),
         log_(log),
@@ skipping 10 matching lines @@
   // Preparse the program. Only called in PreParseProgram after creating
   // the instance.
   PreParseResult PreParse() {
     Scope top_scope(&scope_, kTopLevelScope);
     bool ok = true;
     int start_position = scanner_->peek_location().beg_pos;
     ParseSourceElements(i::Token::EOS, &ok);
     if (stack_overflow_) return kPreParseStackOverflow;
     if (!ok) {
       ReportUnexpectedToken(scanner_->current_token());
-    } else if (scope_->is_strict_mode()) {
+    } else if (scope_->is_strict_or_extended_mode()) {
       CheckOctalLiteral(start_position, scanner_->location().end_pos, &ok);
     }
     return kPreParseSuccess;
   }
 
   // Report syntax error
   void ReportUnexpectedToken(i::Token::Value token);
   void ReportMessageAt(i::Scanner::Location location,
                        const char* type,
                        const char* name_opt) {
@@ skipping 83 matching lines @@
         // The current one will still be returned. It might already
         // have been seen using peek.
         stack_overflow_ = true;
       }
     }
     return scanner_->Next();
   }
 
   bool peek_any_identifier();
 
-  void set_strict_mode() {
-    scope_->set_strict_mode_flag(i::kStrictMode);
+  void set_language_mode(i::LanguageMode language_mode) {
+    scope_->set_language_mode(language_mode);
   }
 
-  bool strict_mode() { return scope_->strict_mode_flag() == i::kStrictMode; }
+  bool is_strict_or_extended_mode() {

[rossberg, 2011/11/08 15:02:46]

And here...

[Steven, 2011/11/08 16:13:49]

Done.

+    return scope_->language_mode() != i::CLASSIC_MODE;
+  }
 
-  i::StrictModeFlag strict_mode_flag() { return scope_->strict_mode_flag(); }
+  bool is_classic_mode() {
+    return scope_->language_mode() == i::CLASSIC_MODE;
+  }
+
+  bool is_extended_mode() {
+    return scope_->language_mode() == i::EXTENDED_MODE;
+  }
+
+  i::LanguageMode language_mode() { return scope_->language_mode(); }
 
   void Consume(i::Token::Value token) { Next(); }
 
   void Expect(i::Token::Value token, bool* ok) {
     if (Next() != token) {
       *ok = false;
     }
   }
 
   bool Check(i::Token::Value token) {
@@ skipping 27 matching lines @@
   const char* strict_mode_violation_type_;
   bool stack_overflow_;
   bool allow_lazy_;
   bool allow_natives_syntax_;
   bool parenthesized_function_;
   bool harmony_scoping_;
 };
 } }  // v8::preparser
 
 #endif  // V8_PREPARSER_H