diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/Definitions.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Definitions.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index 340ab09c81..ecda252ec6 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -28,7 +28,7 @@ trait Definitions extends reflect.generic.StandardDefinitions { lazy val RootPackage: Symbol = { val rp = NoSymbol.newValue(NoPosition, nme.ROOTPKG) .setFlag(FINAL | MODULE | PACKAGE | JAVA) - .setInfo(PolyType(List(), RootClass.tpe)) + .setInfo(NullaryMethodType(RootClass.tpe)) RootClass.sourceModule = rp rp } @@ -227,7 +227,7 @@ trait Definitions extends reflect.generic.StandardDefinitions { ) lazy val EqualsPatternClass = { val clazz = newClass(ScalaPackageClass, tpnme.EQUALS_PATTERN_NAME, Nil) - clazz setInfo PolyType(List(newTypeParam(clazz, 0)), ClassInfoType(anyparam, new Scope, clazz)) + clazz setInfo polyType(List(newTypeParam(clazz, 0)), ClassInfoType(anyparam, new Scope, clazz)) } // collections classes @@ -587,7 +587,7 @@ trait Definitions extends reflect.generic.StandardDefinitions { else*/ List(p) println("creating " + name + " with parents " + parents) */ clazz.setInfo( - PolyType( + polyType( List(tparam), ClassInfoType(List(AnyRefClass.tpe, p), new Scope, clazz))) } @@ -619,11 +619,11 @@ trait Definitions extends reflect.generic.StandardDefinitions { private def newPolyMethodCon(owner: Symbol, name: TermName, tcon: Symbol => Symbol => Type): Symbol = { val msym = newMethod(owner, name) val tparam = newTypeParam(msym, 0) - msym.setInfo(PolyType(List(tparam), tcon(tparam)(msym))) + msym.setInfo(polyType(List(tparam), tcon(tparam)(msym))) } private def newParameterlessMethod(owner: Symbol, name: TermName, restpe: Type) = - newMethod(owner, name).setInfo(PolyType(List(),restpe)) + newMethod(owner, name).setInfo(NullaryMethodType(restpe)) private def newTypeParam(owner: Symbol, index: Int): Symbol = owner.newTypeParameter(NoPosition, newTypeName("T" + index)) setInfo TypeBounds.empty @@ -889,9 +889,9 @@ trait Definitions extends reflect.generic.StandardDefinitions { Any_## = newMethod(AnyClass, nme.HASHHASH, Nil, inttype) setFlag FINAL Any_isInstanceOf = newPolyMethod( - AnyClass, nme.isInstanceOf_, tparam => booltype) setFlag FINAL + AnyClass, nme.isInstanceOf_, tparam => NullaryMethodType(booltype)) setFlag FINAL Any_asInstanceOf = newPolyMethod( - AnyClass, nme.asInstanceOf_, tparam => tparam.typeConstructor) setFlag FINAL + AnyClass, nme.asInstanceOf_, tparam => NullaryMethodType(tparam.typeConstructor)) setFlag FINAL // members of class java.lang.{ Object, String } Object_## = newMethod(ObjectClass, nme.HASHHASH, Nil, inttype) setFlag FINAL |