diff options
| author | paltherr <paltherr@epfl.ch> | 2003-09-11 12:03:13 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-09-11 12:03:13 +0000 |
| commit | c4b7a33f58721756974e79f6df392f9f90825cfe (patch) | |
| tree | 9cd774cdf215bcdb95e0979264c9942fa5f5ab08 /sources/scalac/typechecker | |
| parent | 3551973214371050c0517d65c1c0371ad37785aa (diff) | |
| download | scala-c4b7a33f58721756974e79f6df392f9f90825cfe.tar.gz scala-c4b7a33f58721756974e79f6df392f9f90825cfe.tar.bz2 scala-c4b7a33f58721756974e79f6df392f9f90825cfe.zip | |
- Reviewed and cleaned TreeGen.
- Fixed some errors.
- Removed "dangerous" methods in TreeGen.
- Renamed some methods in TreeGen.
Diffstat (limited to 'sources/scalac/typechecker')
| -rw-r--r-- | sources/scalac/typechecker/RefCheck.java | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java index b2e394458a..da3bef4476 100644 --- a/sources/scalac/typechecker/RefCheck.java +++ b/sources/scalac/typechecker/RefCheck.java @@ -455,20 +455,8 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { private Tree[] transformModule(Tree tree, int mods, Name name, Tree tpe, Tree.Template templ) { Symbol sym = tree.symbol(); - Tree cdef = make.ClassDef( - tree.pos, - mods | FINAL | MODUL, - name.toTypeName(), - Tree.AbsTypeDef_EMPTY_ARRAY, - Tree.ValDef_EMPTY_ARRAY_ARRAY, - Tree.Empty, - templ) - .setSymbol(sym.moduleClass()).setType(tree.type); - Tree alloc = gen.New( - tree.pos, - sym.type().prefix(), - sym.moduleClass(), - Tree.EMPTY_ARRAY); + Tree cdef = gen.ClassDef(sym.moduleClass(), templ); + Tree alloc = gen.New(gen.mkPrimaryConstr(tree.pos, sym.moduleClass())); if (sym.isGlobalModule()) { Tree vdef = gen.ValDef(sym, alloc); return new Tree[]{cdef, vdef}; @@ -506,7 +494,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { m_eq.setInfo( Type.MethodType(new Symbol[] {m_eqarg}, defs.UNIT_TYPE)); Tree m_eqdef = gen.DefDef(m_eq, - gen.Assign(gen.mkRef(tree.pos, mvar), gen.Ident(m_eqarg))); + gen.Assign(gen.mkRef(tree.pos, mvar), gen.Ident(tree.pos, m_eqarg))); sym.owner().members().enterOrOverload(m_eq); return new Tree[]{cdef, vdef, ddef, m_eqdef}; @@ -597,7 +585,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { new Tree[]{gen.mkStringLit(clazz.pos, str)}); } } - return gen.DefDef(clazz.pos, toStringSym, body); + return gen.DefDef(toStringSym, body); } private Tree equalsMethod(ClassSymbol clazz) { @@ -675,7 +663,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { clazz.isSubClass(defs.OBJECT_CLASS) ? OVERRIDE : 0) .setInfo(Type.MethodType(Symbol.EMPTY_ARRAY, defs.INT_TYPE)); clazz.info().members().enter(tagSym); - return gen.DefDef(clazz.pos, tagSym, gen.mkIntLit(clazz.pos, clazz.tag())); + return gen.DefDef(tagSym, gen.mkIntLit(clazz.pos, clazz.tag())); } private Tree hashCodeMethod(ClassSymbol clazz) { @@ -712,7 +700,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { addMethod), new Tree[]{operand}); } - return gen.DefDef(clazz.pos, hashCodeSym, body); + return gen.DefDef(hashCodeSym, body); } // where |