Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dotc settings: String options after settings with colon shouldn't be ignored #1180

Merged
merged 1 commit into from
Mar 22, 2016
Merged

dotc settings: String options after settings with colon shouldn't be ignored #1180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/dotty/tools/dotc/config/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,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
Expand Down