From 5cc62b4e5cfe4f37b7b30ae9d2cadcdbb406987e Mon Sep 17 00:00:00 2001 From: michelou Date: Thu, 19 Apr 2007 17:59:46 +0000 Subject: updated tests for productElement/-Arity --- .../nsc/backend/opt/DeadCodeElimination.scala | 48 +++++++------- .../scala/tools/nsc/doc/DocGenerator.scala | 76 +++++++++++----------- .../scala/tools/nsc/symtab/Definitions.scala | 6 +- src/compiler/scala/tools/nsc/symtab/Symbols.scala | 28 ++++---- .../tools/nsc/typechecker/SyntheticMethods.scala | 6 +- 5 files changed, 82 insertions(+), 82 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala index b587fa06b8..7eb29b3722 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala @@ -1,35 +1,35 @@ /* NSC -- new scala compiler - * Copyright 2005 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Iulian Dragos */ // $Id$ -package scala.tools.nsc.backend.opt; +package scala.tools.nsc.backend.opt import scala.collection._ -import scala.collection.immutable.{Map, HashMap, Set, HashSet}; -import scala.tools.nsc.backend.icode.analysis.LubError; -import scala.tools.nsc.symtab._; +import scala.collection.immutable.{Map, HashMap, Set, HashSet} +import scala.tools.nsc.backend.icode.analysis.LubError +import scala.tools.nsc.symtab._ /** */ abstract class DeadCodeElimination extends SubComponent { - import global._; - import icodes._; - import icodes.opcodes._; + import global._ + import icodes._ + import icodes.opcodes._ - val phaseName = "dce"; + val phaseName = "dce" /** Create a new phase */ - override def newPhase(p: Phase) = new DeadCodeEliminationPhase(p); + override def newPhase(p: Phase) = new DeadCodeEliminationPhase(p) /** Dead code elimination phase. */ class DeadCodeEliminationPhase(prev: Phase) extends ICodePhase(prev) { def name = phaseName - val dce = new DeadCode(); + val dce = new DeadCode() override def apply(c: IClass): Unit = if (settings.Xdce.value) @@ -86,10 +86,10 @@ abstract class DeadCodeElimination extends SubComponent { rdef.init(m); rdef.run; - for (val bb <- m.code.blocks.toList) { + for (bb <- m.code.blocks.toList) { useful(bb) = new mutable.BitSet(bb.size) var rd = rdef.in(bb); - for (val Pair(i, idx) <- bb.toList.zipWithIndex) { + for (Pair(i, idx) <- bb.toList.zipWithIndex) { i match { case LOAD_LOCAL(l) => defs = defs + ((bb, idx)) -> rd._1 @@ -123,7 +123,7 @@ abstract class DeadCodeElimination extends SubComponent { useful(bb) += idx instr match { case LOAD_LOCAL(l1) => - for (val (l2, bb1, idx1) <- defs((bb, idx)); l1 == l2; !useful(bb1)(idx1)) + for ((l2, bb1, idx1) <- defs((bb, idx)) if l1 == l2; if !useful(bb1)(idx1)) worklist += ((bb1, idx1)) case nw @ NEW(_) => @@ -134,7 +134,7 @@ abstract class DeadCodeElimination extends SubComponent { () case _ => - for (val (bb1, idx1) <- findDefs(bb, idx, instr.consumed); !useful(bb1)(idx1)) + for ((bb1, idx1) <- findDefs(bb, idx, instr.consumed) if !useful(bb1)(idx1)) worklist += ((bb1, idx1)) } } @@ -144,12 +144,12 @@ abstract class DeadCodeElimination extends SubComponent { def sweep(m: IMethod) { val compensations = computeCompensations(m) - for (val bb <- m.code.blocks.toList) { + for (bb <- m.code.blocks.toList) { // Console.println("** Sweeping block " + bb + " **") val oldInstr = bb.toList bb.open bb.clear - for (val Pair(i, idx) <- oldInstr.zipWithIndex) { + for (Pair(i, idx) <- oldInstr.zipWithIndex) { if (useful(bb)(idx)) { // log(" " + i + " is useful") bb.emit(i, i.pos) @@ -188,12 +188,12 @@ abstract class DeadCodeElimination extends SubComponent { private def computeCompensations(m: IMethod): mutable.Map[(BasicBlock, Int), List[Instruction]] = { val compensations: mutable.Map[(BasicBlock, Int), List[Instruction]] = new mutable.HashMap - for (val bb <- m.code.blocks.toList) { + for (bb <- m.code.blocks.toList) { assert(bb.isClosed, "Open block in computeCompensations") - for (val (i, idx) <- bb.toList.zipWithIndex) { + for ((i, idx) <- bb.toList.zipWithIndex) { if (!useful(bb)(idx)) { val defs = findDefs(bb, idx, i.consumed) - for (val d <- defs) { + for (d <- defs) { if (!compensations.isDefinedAt(d)) compensations(d) = i.consumedTypes map DROP } @@ -219,7 +219,7 @@ abstract class DeadCodeElimination extends SubComponent { } } - for (val b <- linearizer.linearizeAt(method, bb)) + for (b <- linearizer.linearizeAt(method, bb)) find(b) match { case Some(p) => return p case None => () @@ -236,7 +236,7 @@ abstract class DeadCodeElimination extends SubComponent { var d = 0 // "I look for who produced the 'n' elements below the 'd' topmost slots of the stack" while (n > 0 && i > 0) { - i = i - 1 + i -= 1 val prod = instrs(i).produced if (prod > d) { res = (bb, i) :: res @@ -244,8 +244,8 @@ abstract class DeadCodeElimination extends SubComponent { if (bb(i) != LOAD_EXCEPTION) d = instrs(i).consumed } else { - d = d - prod - d = d + instrs(i).consumed; + d -= prod + d += instrs(i).consumed } } diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 6933151770..82f08f549e 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -111,7 +111,7 @@ abstract class DocGenerator extends Models { else urlFor(ts.head, target) ++ { val sep = Text(", ") - for (val t <- ts.tail) + for (t <- ts.tail) yield Group(sep ++ urlFor(t, target)) } ) @@ -121,7 +121,7 @@ abstract class DocGenerator extends Models { .++ (Text("[") ++ urlFor(tpe.typeArgs.head, target) .++ { val sep = Text(", ") - for (val t <- tpe.typeArgs.tail) + for (t <- tpe.typeArgs.tail) yield Group(sep ++ urlFor(t, target)) } .++ (Text("]"))) @@ -135,7 +135,7 @@ abstract class DocGenerator extends Models { aref(urlFor(parents1.head.symbol), target, parents1.head.toString()) .++ { val sep = Text(" with ") - for (val t <- parents1.tail) + for (t <- parents1.tail) yield Group(sep ++ urlFor(t, target)) } case _ => @@ -227,7 +227,7 @@ abstract class DocGenerator extends Models { ; @@ -250,7 +250,7 @@ abstract class DocGenerator extends Models { Package Summary { { - for (val top <- modules.elements.toList) yield + for (top <- modules.elements.toList) yield {Text("package")} {(aref(top._2.fullNameString('/') + "$content.html", "_self", top._2.fullNameString('.')))} @@ -286,13 +286,13 @@ abstract class DocGenerator extends Models { if (ids contains id) null else { ids += id; id } } - val body =
{ { for (val kind <- KINDS; classes contains kind) yield { + val body =
{ { for (kind <- KINDS if classes contains kind) yield {
{Text(pluralFor(kind))}
    { { - for (val mmbr <- classes(kind).toList) yield + for (mmbr <- classes(kind).toList) yield
  • {urlFor(mmbr.tree, contentFrame)}
    • } }
@@ -312,7 +312,7 @@ abstract class DocGenerator extends Models { {Text(" extends ")}{forType(parents.head.tpe)} ++ ( { { - for (val parent <- parents.tail) yield + for (parent <- parents.tail) yield
{Text(" with ")}{forType(parent.tpe)}
@@ -344,7 +344,7 @@ abstract class DocGenerator extends Models { Group(name ++ Text(buf.toString)) } val sep = Text("@") - for (val attr <- tree.symbol.attributes) + for (attr <- tree.symbol.attributes) yield Group(br(sep ++ attrFor(attr))) } @@ -362,7 +362,7 @@ abstract class DocGenerator extends Models {
{ attrsFor(mmbr.tree) } - { { for (val str <- stringsFor(mmbr.mods)) yield Text(str + " ") } } + { { for (str <- stringsFor(mmbr.mods)) yield Text(str + " ") } } { Text(codeFor(mmbr.kind)) } { Text(nameFor(mmbr.tree)) } @@ -388,7 +388,7 @@ abstract class DocGenerator extends Models {
{ { val links = - for (val subc <- subcs) + for (subc <- subcs) yield aref(urlFor(subc), contentFrame, subc.nameString) links.reduceRight { (link: Seq[Node], seq: Seq[Node]) => link ++ Text(", ") ++ seq } } }
@@ -412,7 +412,7 @@ abstract class DocGenerator extends Models { def listMembersShort(mmbr: HasTree): NodeSeq = if (mmbr.isInstanceOf[Composite]) { val map = organize(mmbr.asInstanceOf[Composite], emptyMap) - for (val kind <- KINDS) yield Group( + for (kind <- KINDS) yield Group( (if (map contains kind) @@ -442,9 +442,9 @@ abstract class DocGenerator extends Models { (kind == VAR && sym.isVariable) || (kind == VAL && sym.isValue && !sym.isVariable && sym.hasGetter) val parents = sym.info.parents - for (val p <- parents; !ignored.contains(p.symbol); + for (p <- parents if !ignored.contains(p.symbol); val decls = p.decls.toList filter(member => isVisible(member)); - !decls.isEmpty) yield Group( + if !decls.isEmpty) yield Group(
}
@@ -466,7 +466,7 @@ abstract class DocGenerator extends Models { (x, y) => (x.nameString compareTo y.nameString) < 0) {aref1(members.head)} - {for (val m <- members.tail) yield Text(", ") ++ aref1(m)} + {for (m <- members.tail) yield Text(", ") ++ aref1(m)}
) @@ -481,8 +481,8 @@ abstract class DocGenerator extends Models { val map = organize(mmbr.asInstanceOf[Composite], emptyMap) val mmbrx = mmbr val pathx = path - for (val kind0 <- List(OBJECT, CLASS); map contains kind0) - for (val mmbr <- map(kind0)) + for (kind0 <- List(OBJECT, CLASS) if map contains kind0) + for (mmbr <- map(kind0)) new ContentFrame { def clazz = mmbr.asInstanceOf[ImplMod] def kind = kind0 @@ -490,14 +490,14 @@ abstract class DocGenerator extends Models { labelFor(kind0) + " " + mmbr.tree.symbol.nameString + " in " + codeFor(mmbrx.kind) + " " + mmbr.tree.symbol.owner.fullNameString('.') } - for (val kind <- List(TRAIT, CONSTRUCTOR, VAL, VAR, DEF); map contains kind) yield Group( + for (kind <- List(TRAIT, CONSTRUCTOR, VAL, VAR, DEF) if map contains kind) yield Group(
{Text(labelFor(kind))} Detail
- {for (val mmbr <- map(kind).toList) yield fullHeader(mmbr)} + {for (mmbr <- map(kind).toList) yield fullHeader(mmbr)}
) } else NodeSeq.Empty @@ -509,7 +509,7 @@ abstract class DocGenerator extends Models { def shortHeader(mmbr: HasTree): NodeSeq = - { for (val str <- stringsFor(mmbr.mods)) yield {(Text(str + " "))} } + { for (str <- stringsFor(mmbr.mods)) yield {(Text(str + " "))} } {Text(codeFor(mmbr.kind))} @@ -614,7 +614,7 @@ abstract class DocGenerator extends Models { case ddef: DefDef => if (!ddef.vparamss.isEmpty && (!ddef.vparamss.tail.isEmpty || !ddef.vparamss.head.isEmpty)) { - val nodes = for (val vparams <- ddef.vparamss) + val nodes = for (vparams <- ddef.vparamss) yield surround("(", ")", forTrees(vparams)); nodes.flatMap(x => x.toList) } else NodeSeq.Empty @@ -649,7 +649,7 @@ abstract class DocGenerator extends Models {

This document is the API specification for Scala 2. -

++ (for (val kind <- KINDS; classes contains kind) yield Group(hr( +

++ (for (kind <- KINDS if classes contains kind) yield Group(hr( { { - for (val mmbr <- classes(kind).toList) yield shortHeader(mmbr) + for (mmbr <- classes(kind).toList) yield shortHeader(mmbr) } }
@@ -657,7 +657,7 @@ abstract class DocGenerator extends Models {
))) } @@ -768,15 +768,15 @@ abstract class DocGenerator extends Models {
++ ({ val decls = sym.tpe.decls.toList //compute table members once for each relevant kind - val tables = for (val k <- kinds.keys.toList) + val tables = for (k <- kinds.keys.toList) yield (k, decls filter kinds(k)) - for (val (k, members) <- tables; !members.isEmpty) yield + for ((k, members) <- tables if !members.isEmpty) yield { { - for (val m <- members) yield + for (m <- members) yield @@ -821,9 +821,9 @@ abstract class DocGenerator extends Models { var members = emptyMap var topLevel = ListMap.empty[ModuleClassSymbol, ListMap[Kind,TreeSet[HasTree]]] - for (val unit <- units) { + for (unit <- units) { val sourceMod = new SourceMod(unit) - for (val mmbr <- sourceMod.members) mmbr.tree match { + for (mmbr <- sourceMod.members) mmbr.tree match { case cdef: ImplDef => assert(cdef.symbol.owner != NoSymbol) val sym = cdef.symbol.owner.asInstanceOf[ModuleClassSymbol] @@ -832,13 +832,13 @@ abstract class DocGenerator extends Models { topLevel = topLevel.update(sym, emptyMap) topLevel = topLevel.update(sym, organize0(mmbr, topLevel(sym))) } - for (val p <- cdef.symbol.info.parents) { + for (p <- cdef.symbol.info.parents) { subclasses(p.symbol) = cdef.symbol :: subclasses(p.symbol) } import Flags._ val mmbrs = cdef.symbol.info.findMember(nme.ANYNAME, MUTABLE | METHOD | BRIDGE | ACCESSOR, 0, false).alternatives - for (val c <- mmbrs; c.isClass) - for (val p <- c.info.parents) { + for (c <- mmbrs if c.isClass) + for (p <- c.info.parents) { subclasses(p.symbol) = c :: subclasses(p.symbol) } @@ -849,7 +849,7 @@ abstract class DocGenerator extends Models { val modules0 = { var modules0 = new TreeMap[String, ModuleClassSymbol] - for (val top <- topLevel.elements) + for (top <- topLevel.elements) modules0 = modules0.insert(top._1.fullNameString, top._1) modules0 } @@ -896,7 +896,7 @@ abstract class DocGenerator extends Models { new ListClassFrame { def classes = { var allClasses = emptyMap - for (val top <- topLevel.elements) + for (top <- topLevel.elements) allClasses = merge(allClasses, top._2) allClasses } @@ -906,7 +906,7 @@ abstract class DocGenerator extends Models { } // class from for each module. - for (val top <- topLevel.elements) { + for (top <- topLevel.elements) { val module = top._1 val members = top._2 @@ -924,7 +924,7 @@ abstract class DocGenerator extends Models { } // do root frame for each class and object - for (val kind <- members.elements) for (val mmbr <- kind._2.toList) { + for (kind <- members.elements) for (mmbr <- kind._2.toList) { val kind0 = kind._1 new ContentFrame { def title = @@ -1179,7 +1179,7 @@ abstract class DocGenerator extends Models { } // The name of a resource is a '/'-separated path name that identifies the resource. val rsrcdir = "scala/tools/nsc/doc/" - for (val base <- List("style.css", "script.js")) { + for (base <- List("style.css", "script.js")) { try { val in = loader.getResourceAsStream(rsrcdir + base) val out = new FileOutputStream(new File(outdir + File.separator + base)) @@ -1201,7 +1201,7 @@ abstract class DocGenerator extends Models { def organize(c: Composite, map0: ListMap[Kind, TreeSet[HasTree]]) = { var map = map0 //System.err.println("MemBERS: " + c.members.toList) - for (val mmbr <- c.members.toList) map = organize0(mmbr, map) + for (mmbr <- c.members.toList) map = organize0(mmbr, map) map } @@ -1312,7 +1312,7 @@ abstract class DocGenerator extends Models { else { val attrs =
{ { - for (val attr <- attributes.toList) yield + for (attr <- attributes.toList) yield
{tag(attr._1)}
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index f8c55edf10..9261b90544 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -798,14 +798,14 @@ trait Definitions { OptionClass = getClass("scala.Option") ProductRootClass = getClass("scala.Product") - for (val i <- 1 to MaxTupleArity) { + for (i <- 1 to MaxTupleArity) { TupleClass(i) = getClass( "scala.Tuple" + i) } - for (val i <- 1 to MaxProductArity) { + for (i <- 1 to MaxProductArity) { ProductClass(i) = getClass("scala.Product" + i) } /* */ - for (val i <- 0 to MaxFunctionArity) { + for (i <- 0 to MaxFunctionArity) { FunctionClass(i) = getClass("scala.Function" + i) } initValueClasses diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index e3429ceeba..b613104ece 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -42,7 +42,7 @@ trait Symbols { var rawname = initName var rawflags: long = 0 private var rawpos = initPos - val id = { ids = ids + 1; ids } + val id = { ids += 1; ids } var validTo: Period = NoPeriod @@ -56,11 +56,11 @@ trait Symbols { else if (isTypeParameter) pos - name.length else if (isVariable || isMethod || isClass || isModule) { var ret = pos - if (buf(pos) == ',') ret = ret + 1 - else if (isClass) ret = ret + ("class").length() - else if (isModule) ret = ret + ("object").length() - else ret = ret + ("var").length() - while (buf(ret).isWhitespace) ret = ret + 1 + if (buf(pos) == ',') ret += 1 + else if (isClass) ret += "class".length() + else if (isModule) ret += "object".length() + else ret += "var".length() + while (buf(ret).isWhitespace) ret += 1 ret } else if (isValue) { @@ -71,7 +71,7 @@ trait Symbols { (buf(pos + 3) == ' ')) { var pos0 = pos + 4 while (pos0 < buf.length && buf(pos0).isWhitespace) - pos0 = pos0 + 1 + pos0 += 1 pos0 } else pos @@ -412,7 +412,7 @@ trait Symbols { } finally { phase = current } - cnt = cnt + 1 + cnt += 1 // allow for two completions: // one: sourceCompleter to LazyType, two: LazyType to completed type if (cnt == 3) throw new Error("no progress in completing " + this + ":" + tp) @@ -802,9 +802,9 @@ trait Symbols { final def allOverriddenSymbols: List[Symbol] = if (owner.isClass && !owner.info.baseClasses.isEmpty) - for { val bc <- owner.info.baseClasses.tail + for { bc <- owner.info.baseClasses.tail val s = overriddenSymbol(bc) - s != NoSymbol } yield s + if s != NoSymbol } yield s else List() /** The symbol accessed by a super in the definition of this symbol when @@ -1169,7 +1169,7 @@ trait Symbols { case TypeRef(_, sym, _) => assert(sym != this, this) case ClassInfoType(parents, _, _) => - for(val p <- parents) assert(p.symbol != this, owner) + for(p <- parents) assert(p.symbol != this, owner) case _ => } super.setInfo(tp) @@ -1339,13 +1339,13 @@ trait Symbols { def cloneSymbols(syms: List[Symbol]): List[Symbol] = { val syms1 = syms map (.cloneSymbol) - for (val sym1 <- syms1) sym1.setInfo(sym1.info.substSym(syms, syms1)) + for (sym1 <- syms1) sym1.setInfo(sym1.info.substSym(syms, syms1)) syms1 } def cloneSymbols(syms: List[Symbol], owner: Symbol): List[Symbol] = { val syms1 = syms map (.cloneSymbol(owner)) - for (val sym1 <- syms1) sym1.setInfo(sym1.info.substSym(syms, syms1)) + for (sym1 <- syms1) sym1.setInfo(sym1.info.substSym(syms, syms1)) syms1 } diff --git a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala index 3446443628..10c7818e6e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala @@ -81,7 +81,7 @@ trait SyntheticMethods requires Analyzer { //val retTpe = lub(accs map (.tpe.resultType)) val method = syntheticMethod(nme.productElement, FINAL, MethodType(List(IntClass.tpe), AnyClass.tpe/*retTpe*/)) typed(DefDef(method, vparamss => Match(Ident(vparamss.head.head), { - (for(val (sym,i) <- accs.zipWithIndex) yield { + (for((sym,i) <- accs.zipWithIndex) yield { CaseDef(Literal(Constant(i)),EmptyTree, Ident(sym)) }):::List(CaseDef(Ident(nme.WILDCARD), EmptyTree, Throw(New(TypeTree(IndexOutOfBoundsExceptionClass.tpe), List(List( @@ -212,7 +212,7 @@ trait SyntheticMethods requires Analyzer { // case classes are implicitly declared serializable clazz.attributes = AnnotationInfo(SerializableAttr.tpe, List(), List()) :: clazz.attributes - for (val stat <- templ.body) { + for (stat <- templ.body) { if (stat.isDef && stat.symbol.isMethod && stat.symbol.hasFlag(CASEACCESSOR) && !isPublic(stat.symbol)) { ts += newAccessorMethod(stat) stat.symbol.resetFlag(CASEACCESSOR) @@ -244,7 +244,7 @@ trait SyntheticMethods requires Analyzer { if (!hasImplementation(nme.readResolve)) ts += readResolveMethod } if (!forCLDC && !forMSIL) - for (val sym <- clazz.info.decls.toList) + for (sym <- clazz.info.decls.toList) if (!sym.getAttributes(BeanPropertyAttr).isEmpty) if (sym.isGetter) addBeanGetterMethod(sym) -- cgit v1.2.3
{k} Summary