diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-03 06:54:24 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-03 06:54:24 +0200 |
| commit | 6ae2dd8dc4556e8085710122097c849fdeac6d95 (patch) | |
| tree | d191c058c49e58b488e0ee959bf93c6663680f47 /src | |
| parent | 4bbae6eb7454dcbb0970a1e982ebb842417d91c0 (diff) | |
| parent | 9fa18ccfc0fd281ac111557fa317aef515c8a46f (diff) | |
| download | scala-6ae2dd8dc4556e8085710122097c849fdeac6d95.tar.gz scala-6ae2dd8dc4556e8085710122097c849fdeac6d95.tar.bz2 scala-6ae2dd8dc4556e8085710122097c849fdeac6d95.zip | |
Merge pull request #4601 from som-snytt/issue/9377
SI-9377 ScalaVersion init no longer fails if versionless
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaVersion.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala b/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala index 7e67b7bec6..0b051ef89d 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala @@ -77,10 +77,7 @@ object ScalaVersion { def apply(versionString: String, errorHandler: String => Unit): ScalaVersion = { def error() = errorHandler( - s"There was a problem parsing ${versionString}. " + - "Versions should be in the form major[.minor[.revision]] " + - "where each part is a positive number, as in 2.10.1. " + - "The minor and revision parts are optional." + s"Bad version (${versionString}) not major[.minor[.revision[-suffix]]]" ) def toInt(s: String) = s match { @@ -97,6 +94,7 @@ object ScalaVersion { versionString match { case "none" => NoScalaVersion + case "" => NoScalaVersion case "any" => AnyScalaVersion case vpat(majorS, minorS, revS, buildS) => SpecificScalaVersion(toInt(majorS), toInt(minorS), toInt(revS), toBuild(buildS)) |