| 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.base.Joiner; | 7 import com.google.common.base.Joiner; |
| 8 import com.google.common.base.Splitter; | 8 import com.google.common.base.Splitter; |
| 9 import com.google.common.collect.Lists; | 9 import com.google.common.collect.Lists; |
| 10 import com.google.common.collect.Sets; | 10 import com.google.common.collect.Sets; |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 static DartClass makeClass(String name, DartTypeNode supertype, List<DartTypeN
ode> interfaces, | 104 static DartClass makeClass(String name, DartTypeNode supertype, List<DartTypeN
ode> interfaces, |
| 105 String... typeParameters) { | 105 String... typeParameters) { |
| 106 List<DartTypeParameter> parameterNodes = new ArrayList<DartTypeParameter>(); | 106 List<DartTypeParameter> parameterNodes = new ArrayList<DartTypeParameter>(); |
| 107 for (String parameter : typeParameters) { | 107 for (String parameter : typeParameters) { |
| 108 parameterNodes.add(makeTypeVariable(parameter)); | 108 parameterNodes.add(makeTypeVariable(parameter)); |
| 109 } | 109 } |
| 110 List<DartNode> members = Arrays.<DartNode>asList(); | 110 List<DartNode> members = Arrays.<DartNode>asList(); |
| 111 return new DartClass(new DartIdentifier(name), null, supertype, | 111 return new DartClass(new DartIdentifier(name), null, supertype, |
| 112 interfaces, members, parameterNodes, Modifiers.NONE); | 112 interfaces, -1, -1, members, parameterNodes, Modifiers.
NONE); |
| 113 } | 113 } |
| 114 | 114 |
| 115 static DartClass makeInterface(String name, List<DartTypeNode> interfaces, | 115 static DartClass makeInterface(String name, List<DartTypeNode> interfaces, |
| 116 DartParameterizedTypeNode defaultClass, String... typeParameters) { | 116 DartParameterizedTypeNode defaultClass, String... typeParameters) { |
| 117 List<DartTypeParameter> parameterNodes = new ArrayList<DartTypeParameter>(); | 117 List<DartTypeParameter> parameterNodes = new ArrayList<DartTypeParameter>(); |
| 118 for (String parameter : typeParameters) { | 118 for (String parameter : typeParameters) { |
| 119 parameterNodes.add(makeTypeVariable(parameter)); | 119 parameterNodes.add(makeTypeVariable(parameter)); |
| 120 } | 120 } |
| 121 List<DartNode> members = Arrays.<DartNode>asList(); | 121 List<DartNode> members = Arrays.<DartNode> asList(); |
| 122 return new DartClass(new DartIdentifier(name), null, null, | 122 return new DartClass(new DartIdentifier(name), null, null, interfaces, -1, -
1, members, |
| 123 interfaces, members, parameterNodes, defaultClass, true
, Modifiers.NONE); | 123 parameterNodes, defaultClass, true, Modifiers.NONE); |
| 124 } | 124 } |
| 125 | 125 |
| 126 static DartParameterizedTypeNode makeDefault(String name) { | 126 static DartParameterizedTypeNode makeDefault(String name) { |
| 127 return new DartParameterizedTypeNode(new DartIdentifier(name), null); | 127 return new DartParameterizedTypeNode(new DartIdentifier(name), null); |
| 128 } | 128 } |
| 129 | 129 |
| 130 private static DartTypeParameter makeTypeVariable(String name) { | 130 private static DartTypeParameter makeTypeVariable(String name) { |
| 131 return new DartTypeParameter(new DartIdentifier(name), null); | 131 return new DartTypeParameter(new DartIdentifier(name), null); |
| 132 } | 132 } |
| 133 | 133 |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 public void onError(DartCompilationError event) { | 537 public void onError(DartCompilationError event) { |
| 538 resolveErrors.add(event); | 538 resolveErrors.add(event); |
| 539 } | 539 } |
| 540 }; | 540 }; |
| 541 // resolve and check errors | 541 // resolve and check errors |
| 542 resolveCompileTimeConst(unit, ctx); | 542 resolveCompileTimeConst(unit, ctx); |
| 543 ErrorExpectation.assertErrors(resolveErrors, expectedErrors); | 543 ErrorExpectation.assertErrors(resolveErrors, expectedErrors); |
| 544 return resolveErrors; | 544 return resolveErrors; |
| 545 } | 545 } |
| 546 } | 546 } |
| OLD | NEW |