Build against Scala 2.8 nightly from Sept 29, 2009.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1066 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-09-29 23:00:29 +00:00
parent 113a22b719
commit 4e15cdcc0b
6 changed files with 31 additions and 31 deletions

View File

@ -13,7 +13,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
private val version2_7_4 = "2.7.4" private val version2_7_4 = "2.7.4"
private val version2_7_5 = "2.7.5" private val version2_7_5 = "2.7.5"
private val version2_7_6 = "2.7.6" private val version2_7_6 = "2.7.6"
private val version2_8_0 = "2.8.0-20090910.003346-+" private val version2_8_0 = "2.8.0-20090929.004247-+"
private val base = "base" private val base = "base"
/* The configurations for the versions of Scala.*/ /* The configurations for the versions of Scala.*/

View File

@ -265,7 +265,7 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
for(offset <- pos.offset; src <- pos.source) for(offset <- pos.offset; src <- pos.source)
{ {
val pointer = offset - src.lineToOffset(src.offsetToLine(offset)) val pointer = offset - src.lineToOffset(src.offsetToLine(offset))
val pointerSpace = lineContent.take(pointer).map { case '\t' => '\t'; case x => ' ' } val pointerSpace = (lineContent: Seq[Char]).take(pointer).map { case '\t' => '\t'; case _ => ' ' }
log.log(level, pointerSpace.mkString + "^") // pointer to the column position of the error/warning log.log(level, pointerSpace.mkString + "^") // pointer to the column position of the error/warning
} }
} }

View File

@ -102,7 +102,7 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
private def propertyCompletor(propertyNames: Iterable[String]) = private def propertyCompletor(propertyNames: Iterable[String]) =
simpleArgumentCompletor(propertyActions, propertyNames) simpleArgumentCompletor(propertyActions, propertyNames)
private def prefixedCompletor(baseCompletor: Completor) = private def prefixedCompletor(baseCompletor: Completor) =
singleArgumentCompletor(simpleCompletor(prefixes.toList.toArray), baseCompletor) singleArgumentCompletor(simpleCompletor(prefixes.toList.toArray[String]), baseCompletor)
def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] ) def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] )
{ {
import scala.collection.immutable.TreeSet import scala.collection.immutable.TreeSet

View File

@ -533,7 +533,7 @@ object ManageDependencies
} }
private def addArtifacts(moduleID: DefaultModuleDescriptor, artifacts: Iterable[Artifact]) private def addArtifacts(moduleID: DefaultModuleDescriptor, artifacts: Iterable[Artifact])
{ {
val allConfigurations = moduleID.getPublicConfigurationsNames val allConfigurations = moduleID.getPublicConfigurationsNames.toSeq
for(artifact <- artifacts) for(artifact <- artifacts)
{ {
val configurationStrings = val configurationStrings =

View File

@ -13,12 +13,12 @@ private[sbt] trait ClassFile
val fileName: String val fileName: String
val className: String val className: String
val superClassName: String val superClassName: String
val interfaceNames: RandomAccessSeq[String] val interfaceNames: Array[String]
val accessFlags: Int val accessFlags: Int
val constantPool: RandomAccessSeq[Constant] val constantPool: Array[Constant]
val fields: RandomAccessSeq[FieldOrMethodInfo] val fields: Array[FieldOrMethodInfo]
val methods: RandomAccessSeq[FieldOrMethodInfo] val methods: Array[FieldOrMethodInfo]
val attributes: RandomAccessSeq[AttributeInfo] val attributes: Array[AttributeInfo]
val sourceFile: Option[String] val sourceFile: Option[String]
def types: Set[String] def types: Set[String]
def stringValue(a: AttributeInfo): String def stringValue(a: AttributeInfo): String

View File

@ -128,7 +128,7 @@ private[sbt] object Parser
parse( if(constant.wide) i+2 else i+1 ) parse( if(constant.wide) i+2 else i+1 )
} }
parse(1) // to lookup: why 1? parse(1)
pool pool
} }