Introduce collective --harmony flag.

src/parser.h

Index: src/parser.h
diff --git a/src/parser.h b/src/parser.h
index 2c41c8a5244d74fdf5621c8d38ffee63cd3059ee..359bb384827ee9e6e9423ae93ab479fb80b4d3fb 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -164,13 +164,13 @@ class ParserApi {
   // Generic preparser generating full preparse data.
   static ScriptDataImpl* PreParse(UC16CharacterStream* source,
                                   v8::Extension* extension,
-                                  bool harmony_block_scoping);
+                                  bool harmony_scoping);
 
   // Preparser that only does preprocessing that makes sense if only used
   // immediately after.
   static ScriptDataImpl* PartialPreParse(UC16CharacterStream* source,
                                          v8::Extension* extension,
-                                         bool harmony_block_scoping);
+                                         bool harmony_scoping);
 };
 
 // ----------------------------------------------------------------------------
@@ -436,7 +436,7 @@ class Parser {
   void ReportMessageAt(Scanner::Location loc,
                        const char* message,
                        Vector<Handle<String> > args);
-  void SetHarmonyBlockScoping(bool block_scoping);
+  void SetHarmonyScoping(bool block_scoping);
 
  private:
   // Limit on number of function parameters is chosen arbitrarily.
@@ -731,7 +731,7 @@ class Parser {
   // Heuristically that means that the function will be called immediately,
   // so never lazily compile it.
   bool parenthesized_function_;
-  bool harmony_block_scoping_;
+  bool harmony_scoping_;
 
   friend class LexicalScope;
 };