Experimental scanner: fix harmony flag setting.

src/parser.cc

 // Copyright 2012 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 535 matching lines @@
       current_function_state_(NULL),
       target_stack_(NULL),
       extension_(info->extension()),
       pre_parse_data_(NULL),
       fni_(NULL),
       parenthesized_function_(false),
       zone_(info->zone()),
       info_(info) {
   ASSERT(!script_.is_null());
   isolate_->set_ast_node_id(0);
-  // FIXME: these can be done only when the ExperimentalScanner has been
-  // created, and they need to be redone when it's recreated.
-  // set_allow_harmony_scoping(!info->is_native() && FLAG_harmony_scoping);
-  // set_allow_modules(!info->is_native() && FLAG_harmony_modules);
   set_allow_natives_syntax(FLAG_allow_natives_syntax || info->is_native());
-  // set_allow_harmony_numeric_literals(FLAG_harmony_numeric_literals);
   set_allow_lazy(false);  // Must be explicitly enabled.
   set_allow_generators(FLAG_harmony_generators);
   set_allow_for_of(FLAG_harmony_iteration);
 }
 
 
 FunctionLiteral* Parser::ParseProgram() {
   // TODO(bmeurer): We temporarily need to pass allow_nesting = true here,
   // see comment for HistogramTimerScope class.
   HistogramTimerScope timer_scope(isolate()->counters()->parse(), true);
   Handle<String> source(String::cast(script_->source()));
   isolate()->counters()->total_parse_size()->Increment(source->length());
   ElapsedTimer timer;
   if (FLAG_trace_parse) {
     timer.Start();
   }
   fni_ = new(zone()) FuncNameInferrer(isolate(), zone());
 
   // Initialize parser state.
   FlattenString(source);
   FunctionLiteral* result;
   if (source->IsTwoByteRepresentation()) {
-    // Notice that the stream is destroyed at the end of the branch block.
-    // The last line of the blocks can't be moved outside, even though they're
-    // identical calls. // FIXME
+    delete reusable_preparser_;
     delete scanner_;
     scanner_ = new ExperimentalScanner<uint16_t>(source, isolate());
-    // FIXME: set flags
-    result = DoParseProgram(info(), source);
   } else {
+    delete reusable_preparser_;
     delete scanner_;
     scanner_ = new ExperimentalScanner<uint8_t>(source, isolate());
-    // FIXME: set flags
-    result = DoParseProgram(info(), source);
   }
+  SetScannerFlags();
+  scanner_->Init();
+  result = DoParseProgram(info(), source);
 
   if (FLAG_trace_parse && result != NULL) {
     double ms = timer.Elapsed().InMillisecondsF();
     if (info()->is_eval()) {
       PrintF("[parsing eval");
     } else if (info()->script()->name()->IsString()) {
       String* name = String::cast(info()->script()->name());
       SmartArrayPointer<char> name_chars = name->ToCString();
       PrintF("[parsing script: %s", *name_chars);
     } else {
@@ skipping 111 matching lines @@
   if (FLAG_trace_parse && result != NULL) {
     double ms = timer.Elapsed().InMillisecondsF();
     SmartArrayPointer<char> name_chars = result->debug_name()->ToCString();
     PrintF("[parsing function: %s - took %0.3f ms]\n", *name_chars, ms);
   }
   return result;
 }
 
 
 FunctionLiteral* Parser::ParseLazy(Handle<String> source, int start, int end) {
+  delete reusable_preparser_;
   delete scanner_;
   if (source->IsTwoByteRepresentation()) {
     scanner_ = new ExperimentalScanner<uint16_t>(source, isolate());
   } else {
     scanner_ = new ExperimentalScanner<uint8_t>(source, isolate());
   }
+  SetScannerFlags();
+  // We don't need to Init() if we immediately SeekForward.
   scanner_->SeekForward(start);
   scanner_->SetEnd(end);
-  // FIXME: set flags
 
   Handle<SharedFunctionInfo> shared_info = info()->shared_info();
   ASSERT(top_scope_ == NULL);
   ASSERT(target_stack_ == NULL);
 
   Handle<String> name(String::cast(shared_info->name()));
   fni_ = new(zone()) FuncNameInferrer(isolate(), zone());
   fni_->PushEnclosingName(name);
 
   ParsingModeScope parsing_mode(this, PARSE_EAGERLY);
@@ skipping 4920 matching lines @@
       DeleteArray(args.start());
       ASSERT(info()->isolate()->has_pending_exception());
     } else {
       result = ParseProgram();
     }
   }
   info()->SetFunction(result);
   return (result != NULL);
 }
 
+
+void Parser::SetScannerFlags() {
+  scanner_->SetHarmonyScoping(!info_->is_native() && FLAG_harmony_scoping);
+  scanner_->SetHarmonyModules(!info_->is_native() && FLAG_harmony_modules);
+  scanner_->SetHarmonyNumericLiterals(FLAG_harmony_numeric_literals);
+}
+
 } }  // namespace v8::internal