diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2010-08-23 08:52:35 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2010-08-23 08:52:35 +0000 |
commit | 7b387e898c622df11579a405dd47dd75f2207773 (patch) | |
tree | 212f11c10ef30b4095a896d321488c8a6c385710 /src | |
parent | 6892195b1f94b64e9749f52e2af4bf4c663e8dde (diff) | |
download | scala-7b387e898c622df11579a405dd47dd75f2207773.tar.gz scala-7b387e898c622df11579a405dd47dd75f2207773.tar.bz2 scala-7b387e898c622df11579a405dd47dd75f2207773.zip |
Renaming and small tweak in testing.Benchmark f...
Renaming and small tweak in testing.Benchmark for the output format.
Diffstat (limited to 'src')
7 files changed, 9 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala index 4efefe89f9..10c03f4455 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/CompleteLattice.scala @@ -9,7 +9,7 @@ package backend.icode.analysis /** A complete lattice. */ -trait CompleteLattice { +trait SemiLattice { type Elem <: AnyRef /** Hold together local variable and stack state. The diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala index 289fae6fe3..5d6f5045bc 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala @@ -50,7 +50,7 @@ abstract class CopyPropagation { object AllRecords extends Record(NoSymbol, new HashMap[Symbol, Value]) /** The lattice for this analysis. */ - object copyLattice extends CompleteLattice { + object copyLattice extends SemiLattice { type Bindings = Map[Location, Value] def emptyBinding = new HashMap[Location, Value]() diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala index 39405cd84e..19cbeaa0ec 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala @@ -11,7 +11,7 @@ import scala.collection.mutable.{Map, HashMap, Set, HashSet, LinkedHashSet} /** A generic framework for data flow analysis. */ -trait DataFlowAnalysis[L <: CompleteLattice] { +trait DataFlowAnalysis[L <: SemiLattice] { /** A type for program points. */ type P <: ProgramPoint[P] val lattice: L diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala index b1d22a12f0..c1e5a0eac7 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/Liveness.scala @@ -21,7 +21,7 @@ abstract class Liveness { import icodes._ /** The lattice for this analysis. */ - object livenessLattice extends CompleteLattice { + object livenessLattice extends SemiLattice { type Elem = Set[Local] val top: Elem = new ListSet[Local]() { diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala index f3dd6dd93b..e993a38dfa 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/ReachingDefinitions.scala @@ -23,7 +23,7 @@ abstract class ReachingDefinitions { /** The lattice for reaching definitions. Elements are * a triple (local variable, basic block, index of instruction of that basic block) */ - object rdefLattice extends CompleteLattice { + object rdefLattice extends SemiLattice { type Definition = (Local, BasicBlock, Int) type Elem = IState[Set[Definition], Stack] type StackPos = Set[(BasicBlock, Int)] diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala index 819182c3ba..fd38ae0ff4 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala @@ -19,7 +19,7 @@ abstract class TypeFlowAnalysis { /** The lattice of ICode types. */ - object typeLattice extends CompleteLattice { + object typeLattice extends SemiLattice { type Elem = icodes.TypeKind val Object = icodes.REFERENCE(global.definitions.ObjectClass) @@ -37,7 +37,7 @@ abstract class TypeFlowAnalysis { /** The lattice of type stacks. It is a straight forward extension of * the type lattice (lub is pairwise lub of the list elements). */ - object typeStackLattice extends CompleteLattice { + object typeStackLattice extends SemiLattice { import icodes._ type Elem = TypeStack @@ -73,7 +73,7 @@ abstract class TypeFlowAnalysis { /** The type flow lattice contains a binding from local variable * names to types and a type stack. */ - object typeFlowLattice extends CompleteLattice { + object typeFlowLattice extends SemiLattice { import icodes._ type Elem = IState[VarBinding, icodes.TypeStack] diff --git a/src/library/scala/testing/Benchmark.scala b/src/library/scala/testing/Benchmark.scala index 19ae1b9c3f..ad3735ca27 100644 --- a/src/library/scala/testing/Benchmark.scala +++ b/src/library/scala/testing/Benchmark.scala @@ -105,7 +105,7 @@ trait Benchmark { if (args.length > 1) multiplier = args(1).toInt logFile.write(prefix) for (t <- runBenchmark(args(0).toInt)) - logFile.write("\t\t" + t) + logFile.write("\t" + t) logFile.write(Platform.EOL) logFile.flush() |