natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected a bug when entering an empty string for the check, stop or skip attribute. 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4663 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dubochet 2005-10-10 17:26:50 +00:00
parent fab9787f31
commit 5921937cb2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sources/scala/tools/nsc/ant/NSC.scala
View File

@ -398,9 +398,10 @@ package scala.tools.nsc.ant {
* @param input The value for <code>force</code>.
*/
def setStop (input: String) = {
if (CompilerPhase.isPermissible(input))
stop = Some(input);
else error("Phase '" + input + "' in stop does not exist.");
if (CompilerPhase.isPermissible(input)) {
if (input != "")
stop = Some(input);
} else error("Phase '" + input + "' in stop does not exist.");
}
/**
@ -408,10 +409,10 @@ package scala.tools.nsc.ant {
* @param input The value for <code>force</code>.
*/
def setSkip (input: String) = {
skip = List.fromArray(input.split(",")).map(s:String=>{
skip = List.fromArray(input.split(",")).flatMap(s:String=>{
val st = s.trim();
if (CompilerPhase.isPermissible(st)) st
else {error("Phase '" + st + "' in skip does not exist."); ""}
if (CompilerPhase.isPermissible(st)) (if (input != "") List(st) else Nil)
else {error("Phase '" + st + "' in skip does not exist."); Nil}
});
}
@ -420,10 +421,10 @@ package scala.tools.nsc.ant {
* @param input The value for <code>force</code>.
*/
def setCheck (input: String) = {
check = List.fromArray(input.split(",")).map(s:String=>{
check = List.fromArray(input.split(",")).flatMap(s:String=>{
val st = s.trim();
if (CompilerPhase.isPermissible(st)) st
else {error("Phase " + st + " in check does not exist."); ""}
if (CompilerPhase.isPermissible(st)) (if (input != "") List(st) else Nil)
else {error("Phase " + st + " in check does not exist."); Nil}
});
}