diff options
author | schinz <schinz@epfl.ch> | 2003-02-20 12:13:07 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2003-02-20 12:13:07 +0000 |
commit | 2fc8c8dc203f00a936aab60dba50c2d7e4ae054b (patch) | |
tree | 1847a9ea13be5d81072c81637d25a99f7d0a449f | |
parent | e5c5cc620dc0f59fd1e8b4a7e3f7ade4c91a1d06 (diff) | |
download | scala-2fc8c8dc203f00a936aab60dba50c2d7e4ae054b.tar.gz scala-2fc8c8dc203f00a936aab60dba50c2d7e4ae054b.tar.bz2 scala-2fc8c8dc203f00a936aab60dba50c2d7e4ae054b.zip |
- adapted to the new mkParentConstr in TreeGen
-rw-r--r-- | sources/scalac/transformer/AddInterfaces.java | 4 | ||||
-rw-r--r-- | sources/scalac/transformer/ExpandMixins.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java index 65c495a0f3..e8225bd614 100644 --- a/sources/scalac/transformer/AddInterfaces.java +++ b/sources/scalac/transformer/AddInterfaces.java @@ -257,7 +257,7 @@ class AddInterfaces extends SubstTransformer { } Tree[] parentConstr = - gen.mkParentConstrs(impl.pos, ifaceSym.nextInfo().parents(), null); + gen.mkParentConstrs(impl.pos, ifaceSym.nextInfo().parents()); Template ifaceTmpl = make.Template(impl.pos, parentConstr, @@ -420,7 +420,7 @@ class AddInterfaces extends SubstTransformer { Tree[] newParents = new Tree[parents.length + 1]; newParents[0] = parents[0]; - newParents[1] = gen.mkParentConstr(impl.pos, interfaceBaseType, null); + newParents[1] = gen.mkParentConstr(impl.pos, interfaceBaseType); for (int i = 2; i < newParents.length; ++i) newParents[i] = parents[i-1]; diff --git a/sources/scalac/transformer/ExpandMixins.java b/sources/scalac/transformer/ExpandMixins.java index 088f392f63..2b84d9f1fa 100644 --- a/sources/scalac/transformer/ExpandMixins.java +++ b/sources/scalac/transformer/ExpandMixins.java @@ -292,9 +292,7 @@ public class ExpandMixins extends Transformer { } newBaseClasses[i] = - gen.mkParentConstr(tree.pos, - new Type.TypeRef(pre, sym, args), - null); + gen.mkParentConstr(tree.pos, new Type.TypeRef(pre, sym, args)); newBaseTypes[i] = new Type.TypeRef(pre, sym, args); } break; |