summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-10-19 06:16:27 -0700
committerPaul Phillips <paulp@improving.org>2012-10-19 06:16:27 -0700
commitdad425242a5905f624115d9ad5fdbec63b8c61e8 (patch)
tree20fffc5eccf1d96f791f2d143a269f8f07d90e12
parent25ad7876a97aafb7a33283843b05023e48cedc55 (diff)
parent1b9a58848db469a5922678add7cc150faccd4dc8 (diff)
downloadscala-dad425242a5905f624115d9ad5fdbec63b8c61e8.tar.gz
scala-dad425242a5905f624115d9ad5fdbec63b8c61e8.tar.bz2
scala-dad425242a5905f624115d9ad5fdbec63b8c61e8.zip
Merge pull request #1498 from paulp/defs-not-vals
Changes Tree and Type members from vals to defs.
-rw-r--r--src/reflect/scala/reflect/api/Trees.scala176
-rw-r--r--src/reflect/scala/reflect/api/Types.scala54
2 files changed, 115 insertions, 115 deletions
diff --git a/src/reflect/scala/reflect/api/Trees.scala b/src/reflect/scala/reflect/api/Trees.scala
index 44f5776a57..bcb1d0031f 100644
--- a/src/reflect/scala/reflect/api/Trees.scala
+++ b/src/reflect/scala/reflect/api/Trees.scala
@@ -367,10 +367,10 @@ trait Trees { self: Universe =>
*/
trait PackageDefApi extends MemberDefApi { this: PackageDef =>
/** The (possibly, fully-qualified) name of the package. */
- val pid: RefTree
+ def pid: RefTree
/** Body of the package definition. */
- val stats: List[Tree]
+ def stats: List[Tree]
}
/** A common base class for class and object definitions.
@@ -390,7 +390,7 @@ trait Trees { self: Universe =>
*/
trait ImplDefApi extends MemberDefApi { this: ImplDef =>
/** The body of the definition. */
- val impl: Template
+ def impl: Template
}
/** A class definition.
@@ -430,16 +430,16 @@ trait Trees { self: Universe =>
*/
trait ClassDefApi extends ImplDefApi { this: ClassDef =>
/** @inheritdoc */
- val mods: Modifiers
+ def mods: Modifiers
/** The name of the class. */
- val name: TypeName
+ def name: TypeName
/** The type parameters of the class. */
- val tparams: List[TypeDef]
+ def tparams: List[TypeDef]
/** @inheritdoc */
- val impl: Template
+ def impl: Template
}
/** An object definition, e.g. `object Foo`. Internally, objects are
@@ -481,13 +481,13 @@ trait Trees { self: Universe =>
*/
trait ModuleDefApi extends ImplDefApi { this: ModuleDef =>
/** @inheritdoc */
- val mods: Modifiers
+ def mods: Modifiers
/** The name of the module. */
- val name: TermName
+ def name: TermName
/** @inheritdoc */
- val impl: Template
+ def impl: Template
}
/** A common base class for ValDefs and DefDefs.
@@ -569,16 +569,16 @@ trait Trees { self: Universe =>
*/
trait ValDefApi extends ValOrDefDefApi { this: ValDef =>
/** @inheritdoc */
- val mods: Modifiers
+ def mods: Modifiers
/** @inheritdoc */
- val name: TermName
+ def name: TermName
/** @inheritdoc */
- val tpt: Tree
+ def tpt: Tree
/** @inheritdoc */
- val rhs: Tree
+ def rhs: Tree
}
/** A method or macro definition.
@@ -618,22 +618,22 @@ trait Trees { self: Universe =>
*/
trait DefDefApi extends ValOrDefDefApi { this: DefDef =>
/** @inheritdoc */
- val mods: Modifiers
+ def mods: Modifiers
/** @inheritdoc */
- val name: Name
+ def name: Name
/** The type parameters of the method. */
- val tparams: List[TypeDef]
+ def tparams: List[TypeDef]
/** The parameter lists of the method. */
- val vparamss: List[List[ValDef]]
+ def vparamss: List[List[ValDef]]
/** @inheritdoc */
- val tpt: Tree
+ def tpt: Tree
/** @inheritdoc */
- val rhs: Tree
+ def rhs: Tree
}
/** An abstract type, a type parameter, or a type alias.
@@ -676,18 +676,18 @@ trait Trees { self: Universe =>
*/
trait TypeDefApi extends MemberDefApi { this: TypeDef =>
/** @inheritdoc */
- val mods: Modifiers
+ def mods: Modifiers
/** @inheritdoc */
- val name: TypeName
+ def name: TypeName
/** The type parameters of this type definition. */
- val tparams: List[TypeDef]
+ def tparams: List[TypeDef]
/** The body of the definition.
* The `EmptyTree` is the body is empty (e.g. for abstract type members).
*/
- val rhs: Tree
+ def rhs: Tree
}
/** A labelled expression. Not expressible in language syntax, but
@@ -742,17 +742,17 @@ trait Trees { self: Universe =>
*/
trait LabelDefApi extends DefTreeApi with TermTreeApi { this: LabelDef =>
/** @inheritdoc */
- val name: TermName
+ def name: TermName
/** Label's parameters - names that can be used in the body of the label.
* See the example for [[scala.reflect.api.Trees#LabelDefExtractor]].
*/
- val params: List[Ident]
+ def params: List[Ident]
/** The body of the label.
* See the example for [[scala.reflect.api.Trees#LabelDefExtractor]].
*/
- val rhs: Tree
+ def rhs: Tree
}
/** Import selector
@@ -795,22 +795,22 @@ trait Trees { self: Universe =>
*/
trait ImportSelectorApi { this: ImportSelector =>
/** The imported name. */
- val name: Name
+ def name: Name
/** Offset of the position of the importing part of the selector in the source file.
* Is equal to -1 is the position is unknown.
*/
- val namePos: Int
+ def namePos: Int
/** The name the import is renamed to.
* Is equal to `name` if it's not a renaming import.
*/
- val rename: Name
+ def rename: Name
/** Offset of the position of the renaming part of the selector in the source file.
* Is equal to -1 is the position is unknown.
*/
- val renamePos: Int
+ def renamePos: Int
}
/** Import clause
@@ -863,12 +863,12 @@ trait Trees { self: Universe =>
/** The qualifier of the import.
* See the example for [[scala.reflect.api.Trees#ImportExtractor]].
*/
- val expr: Tree
+ def expr: Tree
/** The selectors of the import.
* See the example for [[scala.reflect.api.Trees#ImportExtractor]].
*/
- val selectors: List[ImportSelector]
+ def selectors: List[ImportSelector]
}
/** Instantiation template of a class or trait
@@ -920,16 +920,16 @@ trait Trees { self: Universe =>
*/
trait TemplateApi extends SymTreeApi { this: Template =>
/** Superclasses of the template. */
- val parents: List[Tree]
+ def parents: List[Tree]
/** Self type of the template.
* Is equal to `emptyValDef` if the self type is not specified.
*/
- val self: ValDef
+ def self: ValDef
/** Body of the template.
*/
- val body: List[Tree]
+ def body: List[Tree]
}
/** Block of expressions (semicolon separated expressions)
@@ -969,10 +969,10 @@ trait Trees { self: Universe =>
/** All, but the last, expressions in the block.
* Can very well be an empty list.
*/
- val stats: List[Tree]
+ def stats: List[Tree]
/** The last expression in the block. */
- val expr: Tree
+ def expr: Tree
}
/** Case clause in a pattern match.
@@ -1013,17 +1013,17 @@ trait Trees { self: Universe =>
*/
trait CaseDefApi extends TreeApi { this: CaseDef =>
/** The pattern of the pattern matching clause. */
- val pat: Tree
+ def pat: Tree
/** The guard of the pattern matching clause.
* Is equal to `EmptyTree` if the guard is not specified.
*/
- val guard: Tree
+ def guard: Tree
/** The body of the pattern matching clause.
* Is equal to `Literal(Constant())` if the body is not specified.
*/
- val body: Tree
+ def body: Tree
}
/** Alternatives of patterns.
@@ -1063,7 +1063,7 @@ trait Trees { self: Universe =>
*/
trait AlternativeApi extends TermTreeApi { this: Alternative =>
/** Alternatives of the pattern matching clause. */
- val trees: List[Tree]
+ def trees: List[Tree]
}
/** Repetition of pattern.
@@ -1101,7 +1101,7 @@ trait Trees { self: Universe =>
*/
trait StarApi extends TermTreeApi { this: Star =>
/** The quantified pattern. */
- val elem: Tree
+ def elem: Tree
}
/** Bind a variable to a rhs pattern.
@@ -1144,13 +1144,13 @@ trait Trees { self: Universe =>
/** The name that can be used to refer to this fragment of the matched expression.
* The `list` part of the `list @ List(x, y)`.
*/
- val name: Name
+ def name: Name
/** The pattern that represents this fragment of the matched expression.
* The `List(x, y)` part of the `list @ List(x, y)`.
* Is equal to `EmptyTree` if the pattern is not specified as in `case x => x`.
*/
- val body: Tree
+ def body: Tree
}
/**
@@ -1212,12 +1212,12 @@ trait Trees { self: Universe =>
/** A dummy node that carries the type of unapplication.
* See the example for [[scala.reflect.api.Trees#UnApplyExtractor]].
*/
- val fun: Tree
+ def fun: Tree
/** The arguments of the unapplication.
* See the example for [[scala.reflect.api.Trees#UnApplyExtractor]].
*/
- val args: List[Tree]
+ def args: List[Tree]
}
/** Anonymous function, eliminated by compiler phase lambdalift
@@ -1257,11 +1257,11 @@ trait Trees { self: Universe =>
trait FunctionApi extends TermTreeApi with SymTreeApi { this: Function =>
/** The list of parameters of the function.
*/
- val vparams: List[ValDef]
+ def vparams: List[ValDef]
/** The body of the function.
*/
- val body: Tree
+ def body: Tree
}
/** Assignment
@@ -1298,11 +1298,11 @@ trait Trees { self: Universe =>
trait AssignApi extends TermTreeApi { this: Assign =>
/** The left-hand side of the assignment.
*/
- val lhs: Tree
+ def lhs: Tree
/** The right-hand side of the assignment.
*/
- val rhs: Tree
+ def rhs: Tree
}
/** Either an assignment or a named argument. Only appears in argument lists,
@@ -1346,11 +1346,11 @@ trait Trees { self: Universe =>
trait AssignOrNamedArgApi extends TermTreeApi { this: AssignOrNamedArg =>
/** The left-hand side of the expression.
*/
- val lhs: Tree
+ def lhs: Tree
/** The right-hand side of the expression.
*/
- val rhs: Tree
+ def rhs: Tree
}
/** Conditional expression
@@ -1389,16 +1389,16 @@ trait Trees { self: Universe =>
trait IfApi extends TermTreeApi { this: If =>
/** The condition of the if.
*/
- val cond: Tree
+ def cond: Tree
/** The main branch of the if.
*/
- val thenp: Tree
+ def thenp: Tree
/** The alternative of the if.
* Is equal to `Literal(Constant(()))` if not specified.
*/
- val elsep: Tree
+ def elsep: Tree
}
/** - Pattern matching expression (before compiler phase explicitouter before 2.10 / patmat from 2.10)
@@ -1445,10 +1445,10 @@ trait Trees { self: Universe =>
*/
trait MatchApi extends TermTreeApi { this: Match =>
/** The scrutinee of the pattern match. */
- val selector: Tree
+ def selector: Tree
/** The arms of the pattern match. */
- val cases: List[CaseDef]
+ def cases: List[CaseDef]
}
/** Return expression
@@ -1486,7 +1486,7 @@ trait Trees { self: Universe =>
*/
trait ReturnApi extends TermTreeApi { this: Return =>
/** The returned expression. */
- val expr: Tree
+ def expr: Tree
}
/** Try catch node
@@ -1524,13 +1524,13 @@ trait Trees { self: Universe =>
*/
trait TryApi extends TermTreeApi { this: Try =>
/** The protected block. */
- val block: Tree
+ def block: Tree
/** The `catch` pattern-matching clauses of the try. */
- val catches: List[CaseDef]
+ def catches: List[CaseDef]
/** The `finally` part of the try. */
- val finalizer: Tree
+ def finalizer: Tree
}
/** Throw expression
@@ -1566,7 +1566,7 @@ trait Trees { self: Universe =>
*/
trait ThrowApi extends TermTreeApi { this: Throw =>
/** The thrown expression. */
- val expr: Tree
+ def expr: Tree
}
/** Object instantiation
@@ -1613,7 +1613,7 @@ trait Trees { self: Universe =>
/** The tree that represents the type being instantiated.
* See the example for [[scala.reflect.api.Trees#NewExtractor]].
*/
- val tpt: Tree
+ def tpt: Tree
}
/** Type annotation, eliminated by compiler phase cleanup
@@ -1649,10 +1649,10 @@ trait Trees { self: Universe =>
*/
trait TypedApi extends TermTreeApi { this: Typed =>
/** The expression being ascribed with the type. */
- val expr: Tree
+ def expr: Tree
/** The type being ascribed to the expression. */
- val tpt: Tree
+ def tpt: Tree
}
/** Common base class for Apply and TypeApply.
@@ -1672,10 +1672,10 @@ trait Trees { self: Universe =>
*/
trait GenericApplyApi extends TermTreeApi { this: GenericApply =>
/** The target of the application. */
- val fun: Tree
+ def fun: Tree
/** The arguments of the application. */
- val args: List[Tree]
+ def args: List[Tree]
}
/* @PP: All signs point toward it being a requirement that args.nonEmpty,
@@ -1803,12 +1803,12 @@ trait Trees { self: Universe =>
/** The qualifier of the `super` expression.
* See the example for [[scala.reflect.api.Trees#SuperExtractor]].
*/
- val qual: Tree
+ def qual: Tree
/** The selector of the `super` expression.
* See the example for [[scala.reflect.api.Trees#SuperExtractor]].
*/
- val mix: TypeName
+ def mix: TypeName
}
/** Self reference
@@ -1849,7 +1849,7 @@ trait Trees { self: Universe =>
/** The qualifier of the `this` expression.
* For an unqualified `this` refers to the enclosing class.
*/
- val qual: TypeName
+ def qual: TypeName
}
/** A member selection <qualifier> . <name>
@@ -1885,10 +1885,10 @@ trait Trees { self: Universe =>
*/
trait SelectApi extends RefTreeApi { this: Select =>
/** @inheritdoc */
- val qualifier: Tree
+ def qualifier: Tree
/** @inheritdoc */
- val name: Name
+ def name: Name
}
/** A reference to identifier `name`.
@@ -1927,7 +1927,7 @@ trait Trees { self: Universe =>
*/
trait IdentApi extends RefTreeApi { this: Ident =>
/** @inheritdoc */
- val name: Name
+ def name: Name
}
/** Marks underlying reference to id as boxed.
@@ -1983,7 +1983,7 @@ trait Trees { self: Universe =>
*/
trait ReferenceToBoxedApi extends TermTreeApi { this: ReferenceToBoxed =>
/** The underlying reference. */
- val ident: Tree
+ def ident: Tree
}
/** Literal
@@ -2019,7 +2019,7 @@ trait Trees { self: Universe =>
*/
trait LiteralApi extends TermTreeApi { this: Literal =>
/** The compile-time constant underlying the literal. */
- val value: Constant
+ def value: Constant
}
/** A tree that has an annotation attached to it. Only used for annotated types and
@@ -2059,10 +2059,10 @@ trait Trees { self: Universe =>
*/
trait AnnotatedApi extends TreeApi { this: Annotated =>
/** The annotation. */
- val annot: Tree
+ def annot: Tree
/** The annotee. */
- val arg: Tree
+ def arg: Tree
}
/** Singleton type, eliminated by RefCheck
@@ -2098,7 +2098,7 @@ trait Trees { self: Universe =>
*/
trait SingletonTypeTreeApi extends TypTreeApi { this: SingletonTypeTree =>
/** The underlying reference. */
- val ref: Tree
+ def ref: Tree
}
/** Type selection <qualifier> # <name>, eliminated by RefCheck
@@ -2137,10 +2137,10 @@ trait Trees { self: Universe =>
*/
trait SelectFromTypeTreeApi extends TypTreeApi with RefTreeApi { this: SelectFromTypeTree =>
/** @inheritdoc */
- val qualifier: Tree
+ def qualifier: Tree
/** @inheritdoc */
- val name: TypeName
+ def name: TypeName
}
/** Intersection type <parent1> with ... with <parentN> { <decls> }, eliminated by RefCheck
@@ -2176,7 +2176,7 @@ trait Trees { self: Universe =>
*/
trait CompoundTypeTreeApi extends TypTreeApi { this: CompoundTypeTree =>
/** The template of the compound type - represents the parents, the optional self-type and the optional definitions. */
- val templ: Template
+ def templ: Template
}
/** Applied type <tpt> [ <args> ], eliminated by RefCheck
@@ -2212,10 +2212,10 @@ trait Trees { self: Universe =>
*/
trait AppliedTypeTreeApi extends TypTreeApi { this: AppliedTypeTree =>
/** The target of the application. */
- val tpt: Tree
+ def tpt: Tree
/** The arguments of the application. */
- val args: List[Tree]
+ def args: List[Tree]
}
/** Type bounds tree node
@@ -2253,12 +2253,12 @@ trait Trees { self: Universe =>
/** The lower bound.
* Is equal to `Ident(<scala.Nothing>)` if not specified explicitly.
*/
- val lo: Tree
+ def lo: Tree
/** The upper bound.
* Is equal to `Ident(<scala.Any>)` if not specified explicitly.
*/
- val hi: Tree
+ def hi: Tree
}
/** Existential type tree node
@@ -2294,10 +2294,10 @@ trait Trees { self: Universe =>
*/
trait ExistentialTypeTreeApi extends TypTreeApi { this: ExistentialTypeTree =>
/** The underlying type of the existential type. */
- val tpt: Tree
+ def tpt: Tree
/** The clauses of the definition of the existential type. */
- val whereClauses: List[Tree]
+ def whereClauses: List[Tree]
}
/** A synthetic tree holding an arbitrary type. Not to be confused with
diff --git a/src/reflect/scala/reflect/api/Types.scala b/src/reflect/scala/reflect/api/Types.scala
index 2267f21609..7b8cf592ff 100644
--- a/src/reflect/scala/reflect/api/Types.scala
+++ b/src/reflect/scala/reflect/api/Types.scala
@@ -302,7 +302,7 @@ trait Types { self: Universe =>
*/
trait ThisTypeApi extends TypeApi { this: ThisType =>
/** The underlying class symbol. */
- val sym: Symbol
+ def sym: Symbol
}
/** The `SingleType` type describes types of any of the forms on the left,
@@ -344,10 +344,10 @@ trait Types { self: Universe =>
*/
trait SingleTypeApi extends TypeApi { this: SingleType =>
/** The type of the qualifier. */
- val pre: Type
+ def pre: Type
/** The underlying symbol. */
- val sym: Symbol
+ def sym: Symbol
}
/** The `SuperType` type is not directly written, but arises when `C.super` is used
* as a prefix in a `TypeRef` or `SingleType`. It's internal presentation is
@@ -389,12 +389,12 @@ trait Types { self: Universe =>
/** The type of the qualifier.
* See the example for [[scala.reflect.api.Trees#SuperExtractor]].
*/
- val thistpe: Type
+ def thistpe: Type
/** The type of the selector.
* See the example for [[scala.reflect.api.Trees#SuperExtractor]].
*/
- val supertpe: Type
+ def supertpe: Type
}
/** The `ConstantType` type is not directly written in user programs, but arises as the type of a constant.
* The REPL expresses constant types like `Int(11)`. Here are some constants with their types:
@@ -433,7 +433,7 @@ trait Types { self: Universe =>
*/
trait ConstantTypeApi extends TypeApi { this: ConstantType =>
/** The compile-time constant underlying this type. */
- val value: Constant
+ def value: Constant
}
/** The `TypeRef` type describes types of any of the forms on the left,
@@ -481,15 +481,15 @@ trait Types { self: Universe =>
/** The prefix of the type reference.
* Is equal to `NoPrefix` if the prefix is not applicable.
*/
- val pre: Type
+ def pre: Type
/** The underlying symbol of the type reference. */
- val sym: Symbol
+ def sym: Symbol
/** The arguments of the type reference.
* Is equal to `Nil` if the arguments are not provided.
*/
- val args: List[Type]
+ def args: List[Type]
}
/** A subtype of Type representing refined types as well as `ClassInfo` signatures.
@@ -548,10 +548,10 @@ trait Types { self: Universe =>
*/
trait RefinedTypeApi extends TypeApi { this: RefinedType =>
/** The superclasses of the type. */
- val parents: List[Type]
+ def parents: List[Type]
/** The scope that holds the definitions comprising the type. */
- val decls: Scope
+ def decls: Scope
}
/** The `ClassInfo` type signature is used to define parents and declarations
@@ -596,13 +596,13 @@ trait Types { self: Universe =>
*/
trait ClassInfoTypeApi extends TypeApi { this: ClassInfoType =>
/** The superclasses of the class type. */
- val parents: List[Type]
+ def parents: List[Type]
/** The scope that holds the definitions comprising the class type. */
- val decls: Scope
+ def decls: Scope
/** The symbol underlying the class type. */
- val typeSymbol: Symbol
+ def typeSymbol: Symbol
}
/** The `MethodType` type signature is used to indicate parameters and result type of a method
@@ -648,10 +648,10 @@ trait Types { self: Universe =>
*/
trait MethodTypeApi extends TypeApi { this: MethodType =>
/** The symbols that correspond to the parameters of the method. */
- val params: List[Symbol]
+ def params: List[Symbol]
/** The result type of the method. */
- val resultType: Type
+ def resultType: Type
}
/** The `NullaryMethodType` type signature is used for parameterless methods
@@ -687,7 +687,7 @@ trait Types { self: Universe =>
*/
trait NullaryMethodTypeApi extends TypeApi { this: NullaryMethodType =>
/** The result type of the method. */
- val resultType: Type
+ def resultType: Type
}
/** The `PolyType` type signature is used for polymorphic methods
@@ -724,10 +724,10 @@ trait Types { self: Universe =>
*/
trait PolyTypeApi extends TypeApi { this: PolyType =>
/** The symbols corresponding to the type parameters. */
- val typeParams: List[Symbol]
+ def typeParams: List[Symbol]
/** The underlying type. */
- val resultType: Type
+ def resultType: Type
}
/** The `ExistentialType` type signature is used for existential types and
@@ -765,10 +765,10 @@ trait Types { self: Universe =>
*/
trait ExistentialTypeApi extends TypeApi { this: ExistentialType =>
/** The symbols corresponding to the `forSome` clauses of the existential type. */
- val quantified: List[Symbol]
+ def quantified: List[Symbol]
/** The underlying type of the existential type. */
- val underlying: Type
+ def underlying: Type
}
/** The `AnnotatedType` type signature is used for annotated types of the
@@ -806,13 +806,13 @@ trait Types { self: Universe =>
*/
trait AnnotatedTypeApi extends TypeApi { this: AnnotatedType =>
/** The annotations. */
- val annotations: List[Annotation]
+ def annotations: List[Annotation]
/** The annotee. */
- val underlying: Type
+ def underlying: Type
/** A symbol that represents the annotated type itself. */
- val selfsym: Symbol
+ def selfsym: Symbol
}
/** The `TypeBounds` type signature is used to indicate lower and upper type bounds
@@ -858,12 +858,12 @@ trait Types { self: Universe =>
/** The lower bound.
* Is equal to `definitions.NothingTpe` if not specified explicitly.
*/
- val lo: Type
+ def lo: Type
/** The upper bound.
* Is equal to `definitions.AnyTpe` if not specified explicitly.
*/
- val hi: Type
+ def hi: Type
}
/** An object representing an unknown type, used during type inference.
@@ -912,7 +912,7 @@ trait Types { self: Universe =>
*/
trait BoundedWildcardTypeApi extends TypeApi { this: BoundedWildcardType =>
/** Type bounds for the wildcard type. */
- val bounds: TypeBounds
+ def bounds: TypeBounds
}
/** The least upper bound of a list of types, as determined by `<:<`.