diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-06 14:08:10 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-06 14:08:10 -0800 |
commit | 38ff53cc80de5792247d2aac5fb6e4fc2f59600d (patch) | |
tree | ee2ed00751aebb6e30918ba992b4733fae609249 /test/files | |
parent | b571637c2dbb20208543520f5802fe4de5115616 (diff) | |
parent | 4c7f5a513e24a7ef2437bc5be806052c58d784c5 (diff) | |
download | scala-38ff53cc80de5792247d2aac5fb6e4fc2f59600d.tar.gz scala-38ff53cc80de5792247d2aac5fb6e4fc2f59600d.tar.bz2 scala-38ff53cc80de5792247d2aac5fb6e4fc2f59600d.zip |
Merge pull request #1848 from soc/SI-6918
SI-6918 Changes REPL output from "defined module" to "defined object"
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/constrained-types.check | 4 | ||||
-rw-r--r-- | test/files/run/macro-repl-basic.check | 4 | ||||
-rw-r--r-- | test/files/run/reflection-repl-classes.check | 2 | ||||
-rw-r--r-- | test/files/run/repl-bare-expr.check | 4 | ||||
-rw-r--r-- | test/files/run/repl-paste.check | 2 | ||||
-rw-r--r-- | test/files/run/t4671.check | 2 | ||||
-rw-r--r-- | test/files/run/t5655.check | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check index da97a378e6..d4b8692fa3 100644 --- a/test/files/run/constrained-types.check +++ b/test/files/run/constrained-types.check @@ -37,7 +37,7 @@ scala> object Stuff { val x = "hello" val y : Int @Annot(x) = 10 } -defined module Stuff +defined object Stuff scala> @@ -127,7 +127,7 @@ defined class rep scala> scala> object A { val x = "hello" : String @ rep } -defined module A +defined object A warning: previously defined class A is not a companion to object A. Companions must be defined together; you may wish to use :paste mode for this. diff --git a/test/files/run/macro-repl-basic.check b/test/files/run/macro-repl-basic.check index 5323f429da..8d43a3aa16 100644 --- a/test/files/run/macro-repl-basic.check +++ b/test/files/run/macro-repl-basic.check @@ -30,7 +30,7 @@ scala> object Impls { c.Expr[Int](body) } } -defined module Impls +defined object Impls scala> object Macros { object Shmacros { @@ -40,7 +40,7 @@ scala> object Macros { }; class Macros { def quux(x: Int): Int = macro Impls.quux } -defined module Macros +defined object Macros defined class Macros scala> diff --git a/test/files/run/reflection-repl-classes.check b/test/files/run/reflection-repl-classes.check index 606d67ce5e..d70db59b85 100644 --- a/test/files/run/reflection-repl-classes.check +++ b/test/files/run/reflection-repl-classes.check @@ -22,7 +22,7 @@ scala> object defs { val method = im.symbol.typeSignature.member(u.TermName("foo")).asMethod val mm = im.reflectMethod(method) } -defined module defs +defined object defs scala> import defs._ import defs._ diff --git a/test/files/run/repl-bare-expr.check b/test/files/run/repl-bare-expr.check index 8b6434e986..a92243c7c0 100644 --- a/test/files/run/repl-bare-expr.check +++ b/test/files/run/repl-bare-expr.check @@ -31,7 +31,7 @@ scala> 5 ; 10 ; case object Cow ; 20 ; class Moo { override def toString = "Mooo <console>:7: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses 5 ; 10 ; case object Cow ; 20 ; class Moo { override def toString = "Moooooo" } ; 30 ; def bippy = { ^ -defined module Cow +defined object Cow defined class Moo bippy: Int res2: Int = 105 @@ -39,7 +39,7 @@ res2: Int = 105 scala> scala> object Bovine { var x: List[_] = null } ; case class Ruminant(x: Int) ; bippy * bippy * bippy -defined module Bovine +defined object Bovine defined class Ruminant res3: Int = 216 diff --git a/test/files/run/repl-paste.check b/test/files/run/repl-paste.check index d3e171fbfb..e4c407c6e8 100644 --- a/test/files/run/repl-paste.check +++ b/test/files/run/repl-paste.check @@ -21,7 +21,7 @@ val x = (new Dingus).y // Exiting paste mode, now interpreting. defined class Dingus -defined module Dingus +defined object Dingus x: Int = 110 scala> diff --git a/test/files/run/t4671.check b/test/files/run/t4671.check index 4699818cd4..d4f8af480a 100644 --- a/test/files/run/t4671.check +++ b/test/files/run/t4671.check @@ -2,7 +2,7 @@ Type in expressions to have them evaluated. Type :help for more information. scala> object o { val file = sys.props("partest.cwd") + "/t4671.scala" } -defined module o +defined object o scala> val s = scala.io.Source.fromFile(o.file) s: scala.io.BufferedSource = non-empty iterator diff --git a/test/files/run/t5655.check b/test/files/run/t5655.check index 43ebd50e7a..1103b0e36f 100644 --- a/test/files/run/t5655.check +++ b/test/files/run/t5655.check @@ -4,7 +4,7 @@ Type :help for more information. scala> scala> object x { def x={} } -defined module x +defined object x scala> import x._ import x._ |