Revert "dart2js: add support for configuration-specific imports."

pkg/compiler/lib/src/tree/nodes.dart

Index: pkg/compiler/lib/src/tree/nodes.dart
diff --git a/pkg/compiler/lib/src/tree/nodes.dart b/pkg/compiler/lib/src/tree/nodes.dart
index 4cebbb89742a6e45d5f29ffb939f4b6fc6c02863..7ef28dcb7764aeaf3647454e861978f1e42e0a87 100644
--- a/pkg/compiler/lib/src/tree/nodes.dart
+++ b/pkg/compiler/lib/src/tree/nodes.dart
@@ -34,9 +34,8 @@ abstract class Visitor<R> {
   R visitFunctionExpression(FunctionExpression node) => visitExpression(node);
   R visitGotoStatement(GotoStatement node) => visitStatement(node);
   R visitIdentifier(Identifier node) => visitExpression(node);
-  R visitDottedName(DottedName node) => visitExpression(node);
   R visitIf(If node) => visitStatement(node);
-  R visitConditionalUri(ConditionalUri node) => visitNode(node);
+  R visitImport(Import node) => visitLibraryDependency(node);
   R visitLabel(Label node) => visitNode(node);
   R visitLabeledStatement(LabeledStatement node) => visitStatement(node);
   R visitLibraryDependency(LibraryDependency node) => visitLibraryTag(node);
@@ -160,9 +159,7 @@ abstract class Node extends NullTreeElementMixin implements Spannable {
   ClassNode asClassNode() => null;
   Combinator asCombinator() => null;
   Conditional asConditional() => null;
-  ConditionalUri asConditionalUri() => null;
   ContinueStatement asContinueStatement() => null;
-  DottedName asDottedName() => null;
   DoWhile asDoWhile() => null;
   EmptyStatement asEmptyStatement() => null;
   Enum asEnum() => null;
@@ -1025,7 +1022,6 @@ class LiteralList extends Expression {
 
 class LiteralSymbol extends Expression {
   final Token hashToken;
-  // TODO: this could be a DottedNamed.
   final NodeList identifiers;
 
   LiteralSymbol(this.hashToken, this.identifiers);
@@ -1071,32 +1067,6 @@ class Identifier extends Expression with StoredTreeElementMixin {
   Token getEndToken() => token;
 }
 
-// TODO(floitsch): a dotted identifier isn't really an expression. Should it
-// inherit from Node instead?
-class DottedName extends Expression {
-  final Token token;
-  final NodeList identifiers;
-
-  DottedName(this.token, this.identifiers);
-
-  DottedName asDottedName() => this;
-
-  void visitChildren(Visitor visitor) {
-    identifiers.accept(visitor);
-  }
-
-  accept(Visitor visitor) => visitor.visitDottedName(this);
-
-  Token getBeginToken() => token;
-  Token getEndToken() => identifiers.getEndToken();
-
-  String get slowNameString {
-    Unparser unparser = new Unparser();
-    unparser.unparseNodeListOfIdentifiers(identifiers);
-    return unparser.result;
-  }
-}
-
 class Operator extends Identifier {
   static const COMPLEX_OPERATORS =
       const ["--", "++", '+=', "-=", "*=", "/=", "%=", "&=", "|=", "~/=", "^=",
@@ -1994,18 +1964,14 @@ class LibraryName extends LibraryTag {
  */
 abstract class LibraryDependency extends LibraryTag {
   final StringNode uri;
-  final NodeList conditionalUris;
   final NodeList combinators;
 
   LibraryDependency(this.uri,
-                    this.conditionalUris,
                     this.combinators,
                     List<MetadataAnnotation> metadata)
     : super(metadata);
 
   LibraryDependency asLibraryDependency() => this;
-
-  bool get hasConditionalUris => conditionalUris != null;
 }
 
 /**
@@ -2020,11 +1986,11 @@ class Import extends LibraryDependency {
   final Token importKeyword;
   final bool isDeferred;
 
-  Import(this.importKeyword, StringNode uri, NodeList conditionalUris,
+  Import(this.importKeyword, StringNode uri,
          this.prefix, NodeList combinators,
          List<MetadataAnnotation> metadata,
          {this.isDeferred})
-      : super(uri, conditionalUris, combinators, metadata);
+      : super(uri, combinators, metadata);
 
   bool get isImport => true;
 
@@ -2043,45 +2009,11 @@ class Import extends LibraryDependency {
   Token getEndToken() {
     if (combinators != null) return combinators.getEndToken().next;
     if (prefix != null) return prefix.getEndToken().next;
-    if (conditionalUris != null) return conditionalUris.getEndToken().next;
     return uri.getEndToken().next;
   }
 }
 
 /**
- * A conditional uri inside an import or export clause.
- *
- * Example:
- *
- *     import 'foo.dart'
- *       if (some.condition == "someValue") 'bar.dart'
- *       if (other.condition) 'gee.dart';
- */
-class ConditionalUri extends Node {
-  final Token ifToken;
-  final DottedName key;
-  // Value may be null.
-  final LiteralString value;
-  final StringNode uri;
-
-  ConditionalUri(this.ifToken, this.key, this.value, this.uri);
-
-  ConditionalUri asConditionalUri() => this;
-
-  accept(Visitor visitor) => visitor.visitConditionalUri(this);
-
-  visitChildren(Visitor visitor) {
-    key.accept(visitor);
-    if (value != null) value.accept(visitor);
-    uri.accept(visitor);
-  }
-
-  Token getBeginToken() => ifToken;
-
-  Token getEndToken() => uri.getEndToken();
-}
-
-/**
  * An `enum` declaration.
  *
  * An `enum` defines a number of named constants inside a non-extensible class
@@ -2120,10 +2052,9 @@ class Export extends LibraryDependency {
 
   Export(this.exportKeyword,
          StringNode uri,
-         NodeList conditionalUris,
          NodeList combinators,
          List<MetadataAnnotation> metadata)
-      : super(uri, conditionalUris, combinators, metadata);
+      : super(uri, combinators, metadata);
 
   bool get isExport => true;
 
@@ -2140,7 +2071,6 @@ class Export extends LibraryDependency {
 
   Token getEndToken() {
     if (combinators != null) return combinators.getEndToken().next;
-    if (conditionalUris != null) return conditionalUris.getEndToken().next;
     return uri.getEndToken().next;
   }
 }