summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-12-14 10:51:25 +0000
committermichelou <michelou@epfl.ch>2007-12-14 10:51:25 +0000
commit72f80909492fbd107386df25e25e5b416b23a2f0 (patch)
treeab4d0dc0671d7ddb8f1ecd5ed27a0f77b0ffe9d9
parent3bb414bd27255d47069dcc406bee695a271c8278 (diff)
downloadscala-72f80909492fbd107386df25e25e5b416b23a2f0.tar.gz
scala-72f80909492fbd107386df25e25e5b416b23a2f0.tar.bz2
scala-72f80909492fbd107386df25e25e5b416b23a2f0.zip
propagated "#153 still not fixed.."
-rw-r--r--src/compiler/scala/tools/nsc/Settings.scala1
-rw-r--r--test/files/run/streams.check4
-rw-r--r--test/files/run/streams.scala2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala
index b827ef5ea5..d51c173149 100644
--- a/src/compiler/scala/tools/nsc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/Settings.scala
@@ -88,7 +88,6 @@ class Settings(error: String => Unit) {
val verbose = BooleanSetting ("-verbose", "Output messages about what the compiler is doing").hideToIDE
val deprecation = BooleanSetting ("-deprecation", "Output source locations where deprecated APIs are used").hideToIDE
val unchecked = BooleanSetting ("-unchecked", "Enable detailed unchecked warnings").hideToIDE
- val noide = BooleanSetting ("-noide", "Do not generate class-source mappings that are used by the Scala IDE").hideToIDE
val classpath = new StringSetting ("-classpath", "path", "Specify where to find user class files", classpathDefault) { override val abbreviation = "-cp" }
val sourcepath = StringSetting ("-sourcepath", "path", "Specify where to find input source files", "")
val bootclasspath = StringSetting ("-bootclasspath", "path", "Override location of bootstrap class files", bootclasspathDefault)
diff --git a/test/files/run/streams.check b/test/files/run/streams.check
index f36b719ac1..4942b319c8 100644
--- a/test/files/run/streams.check
+++ b/test/files/run/streams.check
@@ -15,5 +15,5 @@ Stream()
Stream(1, 2)
Stream()
-99999
-65536
+49999
+32768
diff --git a/test/files/run/streams.scala b/test/files/run/streams.scala
index 19bb9c943d..80fedb38ce 100644
--- a/test/files/run/streams.scala
+++ b/test/files/run/streams.scala
@@ -22,7 +22,7 @@ object Test extends Application {
println(s2.dropWhile(_ > 0))
println
- val s3 = Stream.range(1, 100000) // ticket #153: Stackoverflow
+ val s3 = Stream.range(1, 50000) //100000 (ticket #153: Stackoverflow)
println(s3.length)
// ticket #153