Enable conditional directives by default.

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 #include "vm/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 26 matching lines @@
 #include "vm/tags.h"
 #include "vm/timeline.h"
 #include "vm/timer.h"
 #include "vm/zone.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, enable_debug_break, false, "Allow use of break \"message\".");
 DEFINE_FLAG(bool, trace_parser, false, "Trace parser operations.");
 DEFINE_FLAG(bool, warn_mixin_typedef, true, "Warning on legacy mixin typedef.");
-DEFINE_FLAG(bool, conditional_directives, false,
-    "Enable conditional directives");
 DEFINE_FLAG(bool, warn_super, false,
     "Warning if super initializer not last in initializer list.");
 DEFINE_FLAG(bool, await_is_keyword, false,
     "await and yield are treated as proper keywords in synchronous code.");
 
 DECLARE_FLAG(bool, profile_vm);
 DECLARE_FLAG(bool, trace_service);
 
 // Quick access to the current thread, isolate and zone.
 #define T (thread())
@@ skipping 5732 matching lines @@
 
 void Parser::ParseLibraryImportExport(const Object& tl_owner,
                                       TokenPosition metadata_pos) {
   bool is_import = (CurrentToken() == Token::kIMPORT);
   bool is_export = (CurrentToken() == Token::kEXPORT);
   ASSERT(is_import || is_export);
   const TokenPosition import_pos = TokenPos();
   ConsumeToken();
   CheckToken(Token::kSTRING, "library url expected");
   AstNode* url_literal = ParseStringLiteral(false);
-  if (FLAG_conditional_directives) {
-    bool condition_triggered = false;
-    while (CurrentToken() == Token::kIF) {
-      // Conditional import: if (env == val) uri.
+  bool condition_triggered = false;
+  while (CurrentToken() == Token::kIF) {
+    // Conditional import: if (env == val) uri.
+    ConsumeToken();
+    ExpectToken(Token::kLPAREN);
+    // Parse dotted name.
+    const GrowableObjectArray& pieces =
+        GrowableObjectArray::Handle(Z, GrowableObjectArray::New());
+    pieces.Add(*ExpectIdentifier("identifier expected"));
+    while (CurrentToken() == Token::kPERIOD) {
+      pieces.Add(Symbols::Dot());
       ConsumeToken();
-      ExpectToken(Token::kLPAREN);
-      // Parse dotted name.
-      const GrowableObjectArray& pieces =
-          GrowableObjectArray::Handle(Z, GrowableObjectArray::New());
       pieces.Add(*ExpectIdentifier("identifier expected"));
-      while (CurrentToken() == Token::kPERIOD) {
-        pieces.Add(Symbols::Dot());
-        ConsumeToken();
-        pieces.Add(*ExpectIdentifier("identifier expected"));
-      }
-      AstNode* valueNode = NULL;
-      if (CurrentToken() == Token::kEQ) {
-        ConsumeToken();
-        CheckToken(Token::kSTRING, "string literal expected");
-        valueNode = ParseStringLiteral(false);
-        ASSERT(valueNode->IsLiteralNode());
-        ASSERT(valueNode->AsLiteralNode()->literal().IsString());
-      }
-      ExpectToken(Token::kRPAREN);
-      CheckToken(Token::kSTRING, "library url expected");
-      AstNode* conditional_url_literal = ParseStringLiteral(false);
+    }
+    AstNode* valueNode = NULL;
+    if (CurrentToken() == Token::kEQ) {
+      ConsumeToken();
+      CheckToken(Token::kSTRING, "string literal expected");
+      valueNode = ParseStringLiteral(false);
+      ASSERT(valueNode->IsLiteralNode());
+      ASSERT(valueNode->AsLiteralNode()->literal().IsString());
+    }
+    ExpectToken(Token::kRPAREN);
+    CheckToken(Token::kSTRING, "library url expected");
+    AstNode* conditional_url_literal = ParseStringLiteral(false);
 
-      // If there was already a condition that triggered, don't try to match
-      // again.
-      if (condition_triggered) {
-        continue;
-      }
-      // Check if this conditional line overrides the default import.
-      const String& key = String::Handle(
-          String::ConcatAll(Array::Handle(Array::MakeArray(pieces))));
-      const String& value = (valueNode == NULL)
-          ? Symbols::True()
-          : String::Cast(valueNode->AsLiteralNode()->literal());
-      // Call the embedder to supply us with the environment.
-      const String& env_value =
-          String::Handle(Api::GetEnvironmentValue(T, key));
-      if (!env_value.IsNull() && env_value.Equals(value)) {
-        condition_triggered = true;
-        url_literal = conditional_url_literal;
-      }
+    // If there was already a condition that triggered, don't try to match
+    // again.
+    if (condition_triggered) {
+      continue;
+    }
+    // Check if this conditional line overrides the default import.
+    const String& key = String::Handle(
+        String::ConcatAll(Array::Handle(Array::MakeArray(pieces))));
+    const String& value = (valueNode == NULL)
+        ? Symbols::True()
+        : String::Cast(valueNode->AsLiteralNode()->literal());
+    // Call the embedder to supply us with the environment.
+    const String& env_value =
+        String::Handle(Api::GetEnvironmentValue(T, key));
+    if (!env_value.IsNull() && env_value.Equals(value)) {
+      condition_triggered = true;
+      url_literal = conditional_url_literal;
     }
   }
   ASSERT(url_literal->IsLiteralNode());
   ASSERT(url_literal->AsLiteralNode()->literal().IsString());
   const String& url = String::Cast(url_literal->AsLiteralNode()->literal());
   if (url.Length() == 0) {
     ReportError("library url expected");
   }
   bool is_deferred_import = false;
   if (is_import && (IsSymbol(Symbols::Deferred()))) {
@@ skipping 8606 matching lines @@
     const ArgumentListNode& function_args,
     const LocalVariable* temp_for_last_arg,
     bool is_super_invocation) {
   UNREACHABLE();
   return NULL;
 }
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME