summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-06-22 11:27:36 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-06-22 11:27:36 -0700
commit1fbce4612c21a4d0c553ea489b4765494828c09f (patch)
tree814f29af68d6b78b6cafcaed7e1841c9c54dc928 /test/files/jvm
parentc3b6cfaaadc0426c79fbfc8f42d592ecd9ebe43d (diff)
parent7968421bd6515eeb88fb420bae3ff3bc23e5876d (diff)
downloadscala-1fbce4612c21a4d0c553ea489b4765494828c09f.tar.gz
scala-1fbce4612c21a4d0c553ea489b4765494828c09f.tar.bz2
scala-1fbce4612c21a4d0c553ea489b4765494828c09f.zip
Merge pull request #4564 from som-snytt/issue/promptv2.11.7
SI-9206 Fix REPL code indentation
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/interpreter.check18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index d03edb638c..9e875235c7 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -32,7 +32,7 @@ scala> val four: anotherint = 4
four: anotherint = 4
scala> val bogus: anotherint = "hello"
-<console>:8: error: type mismatch;
+<console>:11: error: type mismatch;
found : String("hello")
required: anotherint
(which expands to) Int
@@ -280,13 +280,13 @@ scala> // both of the following should abort immediately:
scala> def x => y => z
<console>:1: error: '=' expected but '=>' found.
- def x => y => z
- ^
+def x => y => z
+ ^
scala> [1,2,3]
<console>:1: error: illegal start of definition
- [1,2,3]
- ^
+[1,2,3]
+^
scala>
@@ -355,7 +355,7 @@ defined class Term
scala> def f(e: Exp) = e match { // non-exhaustive warning here
case _:Fact => 3
}
-<console>:18: warning: match may not be exhaustive.
+<console>:21: warning: match may not be exhaustive.
It would fail on the following inputs: Exp(), Term()
def f(e: Exp) = e match { // non-exhaustive warning here
^
@@ -365,6 +365,6 @@ scala> :quit
plusOne: (x: Int)Int
res0: Int = 6
res0: String = after reset
-<console>:8: error: not found: value plusOne
- plusOne(5) // should be undefined now
- ^
+<console>:11: error: not found: value plusOne
+ plusOne(5) // should be undefined now
+ ^