Separate type for dynamic in mirrors.dart2js

pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart

 // 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.
 
 #library('mirrors.dart2js');
 
 #import('dart:io');
 #import('dart:uri');
 
 #import('../../../../../lib/compiler/compiler.dart', prefix: 'diagnostics');
@@ skipping 41 matching lines @@
 }
 
 Dart2JsTypeMirror _convertTypeToTypeMirror(
     Dart2JsMirrorSystem system,
     DartType type,
     InterfaceType defaultType,
     [FunctionSignature functionSignature]) {
   if (type === null) {
     return new Dart2JsInterfaceTypeMirror(system, defaultType);
   } else if (type is InterfaceType) {
-    return new Dart2JsInterfaceTypeMirror(system, type);
+    if (type === system.compiler.types.dynamicType) {
+      return new Dart2JsDynamicMirror(system, type);
+    } else {
+      return new Dart2JsInterfaceTypeMirror(system, type);
+    }
   } else if (type is TypeVariableType) {
     return new Dart2JsTypeVariableMirror(system, type);
   } else if (type is FunctionType) {
     return new Dart2JsFunctionTypeMirror(system, type, functionSignature);
   } else if (type is VoidType) {
     return new Dart2JsVoidMirror(system, type);
   } else if (type is TypedefType) {
     return new Dart2JsTypedefMirror(system, type);
   }
   throw new IllegalArgumentException("Unexpected interface type $type");
@@ skipping 1132 matching lines @@
     if (this === other) {
       return true;
     }
     if (other is! TypeMirror) {
       return false;
     }
     return other.isVoid;
   }
 }
 
+class Dart2JsDynamicMirror extends Dart2JsTypeElementMirror {
+
+  Dart2JsDynamicMirror(Dart2JsMirrorSystem system, InterfaceType voidType)
+      : super(system, voidType);
+
+  InterfaceType get _dynamicType => _type;
+
+  String get qualifiedName => simpleName;
+
+  /**
+   * The dynamic type has no location.
+   */
+  Location get location => null;
+
+  /**
+   * The dynamic type has no library.
+   */
+  LibraryMirror get library => null;
+
+  bool get isObject => false;

[Lasse Reichstein Nielsen, 2012/09/24 10:41:09]

Why not put these "false" getters on the supertype, and only override the true
ones in subclasses? That seems like a quadratic->linear space optimization, if
nothing else. (And it's easier to maintain - you only need to fix two places
when adding a new one).

[Johnni Winther, 2012/09/24 10:58:18]

Done.

+
+  bool get isVoid => false;
+
+  bool get isDynamic => true;
+
+  bool get isTypeVariable => false;
+
+  bool get isTypedef => false;
+
+  bool get isFunction => false;
+
+  bool operator ==(Object other) {
+    if (this === other) {
+      return true;
+    }
+    if (other is! TypeMirror) {
+      return false;
+    }
+    return other.isDynamic;
+  }
+}
+
 //------------------------------------------------------------------------------
 // Member mirrors implementation.
 //------------------------------------------------------------------------------
 
 class Dart2JsMethodMirror extends Dart2JsElementMirror
     implements Dart2JsMemberMirror, MethodMirror {
   final Dart2JsObjectMirror _objectMirror;
   String _name;
   String _constructorName;
   String _operatorName;
@@ skipping 166 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }