| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 package com.google.dart.compiler.resolver; | 5 package com.google.dart.compiler.resolver; |
| 6 | 6 |
| 7 import com.google.common.annotations.VisibleForTesting; | 7 import com.google.common.annotations.VisibleForTesting; |
| 8 import com.google.common.collect.Lists; | 8 import com.google.common.collect.Lists; |
| 9 import com.google.common.collect.Sets; | 9 import com.google.common.collect.Sets; |
| 10 import com.google.dart.compiler.DartCompilationPhase; | 10 import com.google.dart.compiler.DartCompilationPhase; |
| (...skipping 2126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2137 typeArgs.add(originalTypeArgs.get(0)); | 2137 typeArgs.add(originalTypeArgs.get(0)); |
| 2138 typeArgs.add(originalTypeArgs.get(1)); | 2138 typeArgs.add(originalTypeArgs.get(1)); |
| 2139 break; | 2139 break; |
| 2140 default: | 2140 default: |
| 2141 topLevelContext.onError(node, ResolverErrorCode.WRONG_NUMBER_OF_TYPE_A
RGUMENTS, | 2141 topLevelContext.onError(node, ResolverErrorCode.WRONG_NUMBER_OF_TYPE_A
RGUMENTS, |
| 2142 defaultLiteralMapType, | 2142 defaultLiteralMapType, |
| 2143 originalTypeArgs.size(), 1); | 2143 originalTypeArgs.size(), 1); |
| 2144 // fall through | 2144 // fall through |
| 2145 case 0: | 2145 case 0: |
| 2146 typeArgs.add(implicitKey); | 2146 typeArgs.add(implicitKey); |
| 2147 DartTypeNode implicitValue = new DartTypeNode(new DartIdentifier("Dyna
mic")); | 2147 DartTypeNode implicitValue = new DartTypeNode(new DartIdentifier("dyna
mic")); |
| 2148 typeArgs.add(implicitValue); | 2148 typeArgs.add(implicitValue); |
| 2149 break; | 2149 break; |
| 2150 } | 2150 } |
| 2151 | 2151 |
| 2152 InterfaceType type = | 2152 InterfaceType type = |
| 2153 context.instantiateParameterizedType( | 2153 context.instantiateParameterizedType( |
| 2154 defaultLiteralMapType.getElement(), | 2154 defaultLiteralMapType.getElement(), |
| 2155 node, | 2155 node, |
| 2156 typeArgs, | 2156 typeArgs, |
| 2157 ASTNodes.isStaticContext(node), | 2157 ASTNodes.isStaticContext(node), |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2417 ClassElement currentClass = (ClassElement) constructor.getEnclosingEle
ment(); | 2417 ClassElement currentClass = (ClassElement) constructor.getEnclosingEle
ment(); |
| 2418 if (nextClass == currentClass) { | 2418 if (nextClass == currentClass) { |
| 2419 return (ConstructorNodeElement) nextConstructorElement; | 2419 return (ConstructorNodeElement) nextConstructorElement; |
| 2420 } | 2420 } |
| 2421 } | 2421 } |
| 2422 } | 2422 } |
| 2423 } | 2423 } |
| 2424 return null; | 2424 return null; |
| 2425 } | 2425 } |
| 2426 } | 2426 } |
| OLD | NEW |