compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java - Issue 11776037: Initial support for mixins in dartc.

Unified Diff: compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java

Issue 11776037: Initial support for mixins in dartc. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Forgot MixinScope.java Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« compiler/java/com/google/dart/compiler/type/InterfaceTypeImplementation.java ('K') | « compiler/javatests/com/google/dart/compiler/parser/SyntaxTest.java ('k') | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/bindings/BindingUtils.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java

diff --git a/compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java b/compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java

index 68199870556747a63ccd5b580d7428eb4a9b6a30..bf2ddf838b6d944e253df48654c073f0d328bddd 100644

--- a/compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java

+++ b/compiler/javatests/com/google/dart/compiler/resolver/ResolverTestCase.java

@@ -103,24 +103,26 @@ abstract class ResolverTestCase extends TestCase {

static DartClass makeClass(String name, DartTypeNode supertype, List<DartTypeNode> interfaces,

String... typeParameters) {

+ List<DartTypeNode> mixins = new ArrayList<DartTypeNode>();

List<DartTypeParameter> parameterNodes = new ArrayList<DartTypeParameter>();

for (String parameter : typeParameters) {

parameterNodes.add(makeTypeVariable(parameter));

}

- List<DartNode> members = Arrays.<DartNode>asList();

- return new DartClass(-1, 0, new DartIdentifier(name), null, supertype,

- -1, interfaces, -1, -1, -1, members, parameterNodes, Modifiers.NONE);

+ List<DartNode> members = Arrays.<DartNode> asList();

+ return new DartClass(-1, 0, new DartIdentifier(name), null, supertype, -1, interfaces, mixins,

+ -1, -1, -1, members, parameterNodes, null, false, Modifiers.NONE);

}

static DartClass makeInterface(String name, List<DartTypeNode> interfaces,

DartParameterizedTypeNode defaultClass, String... typeParameters) {

+ List<DartTypeNode> mixins = new ArrayList<DartTypeNode>();

List<DartTypeParameter> parameterNodes = new ArrayList<DartTypeParameter>();

for (String parameter : typeParameters) {

parameterNodes.add(makeTypeVariable(parameter));

}

List<DartNode> members = Arrays.<DartNode> asList();

- return new DartClass(-1, 0, new DartIdentifier(name), null, null, -1, interfaces, -1, -1, -1,

- members, parameterNodes, defaultClass, true, Modifiers.NONE);

+ return new DartClass(-1, 0, new DartIdentifier(name), null, null, -1, interfaces, mixins, -1,

+ -1, -1, members, parameterNodes, defaultClass, true, Modifiers.NONE);

}

static DartParameterizedTypeNode makeDefault(String name) {