diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2016-03-22 15:42:17 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2016-03-22 15:42:17 +0100 |
| commit | 3e43c7f989c48c8e78eb6c7b5ae9bcb301a0c07d (patch) | |
| tree | 8328447c3e78f13d206fa3047df6966d08163003 /src | |
| parent | 552a56ae8573f1c08175b3211afa7e414bee681b (diff) | |
| parent | 5ff8649b1bf36c1fcd55ba2ec71c93c4c587af81 (diff) | |
| download | dotty-3e43c7f989c48c8e78eb6c7b5ae9bcb301a0c07d.tar.gz dotty-3e43c7f989c48c8e78eb6c7b5ae9bcb301a0c07d.tar.bz2 dotty-3e43c7f989c48c8e78eb6c7b5ae9bcb301a0c07d.zip | |
Merge pull request #1180 from niktrop/dotc-settings-format
dotc settings: String options after settings with colon shouldn't be ignored
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/config/Settings.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/config/Settings.scala b/src/dotty/tools/dotc/config/Settings.scala index eddeb83ab..f30cedaa0 100644 --- a/src/dotty/tools/dotc/config/Settings.scala +++ b/src/dotty/tools/dotc/config/Settings.scala @@ -119,11 +119,13 @@ object Settings { case (ListTag, _) => if (argRest.isEmpty) missingArg else update((argRest split ",").toList, args) + case (StringTag, _) if choices.nonEmpty => + if (argRest.isEmpty) missingArg + else if (!choices.contains(argRest)) + fail(s"$arg is not a valid choice for $name", args) + else update(argRest, args) case (StringTag, arg2 :: args2) => - if (choices.nonEmpty && !(choices contains arg2)) - fail(s"$arg2 is not a valid choice for $name", args2) - else - update(arg2, args2) + update(arg2, args2) case (IntTag, arg2 :: args2) => try { val x = arg2.toInt |