summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-10-20 06:22:42 +0000
committermichelou <michelou@epfl.ch>2008-10-20 06:22:42 +0000
commit9b7039e9462676d608685fb1e6242228649b21ac (patch)
treebf468e6490c1643219ab8a41602235b5deead0a8
parentbaf7e773f3784fa1778c061be09e77606a72a25f (diff)
downloadscala-9b7039e9462676d608685fb1e6242228649b21ac.tar.gz
scala-9b7039e9462676d608685fb1e6242228649b21ac.tar.bz2
scala-9b7039e9462676d608685fb1e6242228649b21ac.zip
minor change (getProperty)
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
index 2c90d87975..116cc04ce4 100644
--- a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2007 LAMP/EPFL
+ * Copyright 2005-2008 LAMP/EPFL
* @author Stepan Koltsov
*/
// $Id$
@@ -28,22 +28,21 @@ trait InteractiveReader {
}
-
object InteractiveReader {
// hacks necessary for OSX jvm suspension because read calls are not restarted after SIGTSTP
- val vendor = { val v = System.getProperty("java.vendor") ; if (v == null) "" else v }
+ val vendor = System.getProperty("java.vendor", "")
val msgEINTR = "Interrupted system call"
- /** Create an interactive reader. Uses JLine if the
+ /** Create an interactive reader. Uses <code>JLineReader</code> if the
* library is available, but otherwise uses a
- * SimpleReader. */
- def createDefault(): InteractiveReader = {
- try {
- new JLineReader
- } catch {
- case e =>
- //out.println("jline is not available: " + e) //debug
- new SimpleReader()
- }
- }
+ * <code>SimpleReaderi</code>. */
+ def createDefault(): InteractiveReader =
+ try {
+ new JLineReader
+ } catch {
+ case e =>
+ //out.println("jline is not available: " + e) //debug
+ new SimpleReader()
+ }
}
+