Merge branch 'work'
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@23970 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
ce268ee7e3
commit
5192d6932e
|
@ -2801,6 +2801,7 @@ self =>
|
||||||
ts += makePackaging(start, pkg, topstats())
|
ts += makePackaging(start, pkg, topstats())
|
||||||
} else {
|
} else {
|
||||||
ts += inBraces(makePackaging(start, pkg, topStatSeq()))
|
ts += inBraces(makePackaging(start, pkg, topStatSeq()))
|
||||||
|
acceptStatSepOpt()
|
||||||
ts ++= topStatSeq()
|
ts ++= topStatSeq()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,15 +30,17 @@ class Loader(val size: Int, val parallelism: Int, val runWhat: String) extends B
|
||||||
|
|
||||||
reset
|
reset
|
||||||
|
|
||||||
|
val wa = Dictionary.wordarray ++ Dictionary.wordarray ++ Dictionary.wordarray
|
||||||
|
|
||||||
def runseq {
|
def runseq {
|
||||||
val m = Map(
|
val m = Map(
|
||||||
'2' -> "ABC", '3' -> "DEF", '4' -> "GHI", '5' -> "JKL",
|
'2' -> "ABC", '3' -> "DEF", '4' -> "GHI", '5' -> "JKL",
|
||||||
'6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ"
|
'6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ"
|
||||||
)
|
)
|
||||||
val charCode: Map[Char, Char] = for ((digit, letters) <- m; letter <- letters) yield letter -> digit
|
val charCode: Map[Char, Char] = for ((digit, letters) <- m; letter <- letters) yield letter -> digit
|
||||||
def wordCode(word: String): String = word.toUpperCase map charCode
|
def wordCode(word: String): String = (word.toUpperCase.toList map charCode).toString
|
||||||
|
|
||||||
Dictionary.wordarray groupBy wordCode
|
wa groupBy wordCode
|
||||||
}
|
}
|
||||||
|
|
||||||
def runpar {
|
def runpar {
|
||||||
|
@ -47,9 +49,9 @@ class Loader(val size: Int, val parallelism: Int, val runWhat: String) extends B
|
||||||
'6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ"
|
'6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ"
|
||||||
)
|
)
|
||||||
val charCode: Map[Char, Char] = for ((digit, letters) <- m; letter <- letters) yield letter -> digit
|
val charCode: Map[Char, Char] = for ((digit, letters) <- m; letter <- letters) yield letter -> digit
|
||||||
def wordCode(word: String): String = word.toUpperCase map charCode
|
def wordCode(word: String): String = (word.toUpperCase.toList map charCode).toString
|
||||||
|
|
||||||
Dictionary.wordarray.par groupBy wordCode
|
wa.par groupBy wordCode
|
||||||
}
|
}
|
||||||
|
|
||||||
def reset = runWhat match {
|
def reset = runWhat match {
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
t2973.scala:1: error: ';' expected but 'package' found.
|
||||||
|
package foo {} package bar {}
|
||||||
|
^
|
||||||
|
one error found
|
|
@ -0,0 +1 @@
|
||||||
|
package foo {} package bar {}
|
|
@ -0,0 +1 @@
|
||||||
|
package foo {}; package bar {}; package baz {}
|
Loading…
Reference in New Issue