summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2011-08-11 21:40:15 +0000
committermichelou <michelou@epfl.ch>2011-08-11 21:40:15 +0000
commitfebd8857dda25f79704031e5bd2005b7271025c1 (patch)
tree22485ae199b868d739c40df3fb74cf7d77e248cb /test/files/neg
parente4288e5143dc85e9b22d881bf5b19996597722f6 (diff)
downloadscala-febd8857dda25f79704031e5bd2005b7271025c1.tar.gz
scala-febd8857dda25f79704031e5bd2005b7271025c1.tar.bz2
scala-febd8857dda25f79704031e5bd2005b7271025c1.zip
fixed text in error message
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/bug3714-neg.check4
-rw-r--r--test/files/neg/protected-constructors.check6
-rw-r--r--test/files/neg/protected-static-fail.check4
-rw-r--r--test/files/neg/t3934.check2
4 files changed, 8 insertions, 8 deletions
diff --git a/test/files/neg/bug3714-neg.check b/test/files/neg/bug3714-neg.check
index fab6623001..48420514ec 100644
--- a/test/files/neg/bug3714-neg.check
+++ b/test/files/neg/bug3714-neg.check
@@ -1,12 +1,12 @@
bug3714-neg.scala:17: error: value break in class BreakImpl cannot be accessed in BreakImpl
Access to protected value break not permitted because
- enclosing class object Test is not a subclass of
+ enclosing object Test is not a subclass of
class BreakImpl where target is defined
case b: BreakImpl => b.break
^
bug3714-neg.scala:25: error: value break in class BreakImpl cannot be accessed in BreakImpl
Access to protected value break not permitted because
- enclosing class object Test is not a subclass of
+ enclosing object Test is not a subclass of
class BreakImpl where target is defined
case b: BreakImpl => b.break
^
diff --git a/test/files/neg/protected-constructors.check b/test/files/neg/protected-constructors.check
index d6b9221a49..3add24c089 100644
--- a/test/files/neg/protected-constructors.check
+++ b/test/files/neg/protected-constructors.check
@@ -3,19 +3,19 @@ protected-constructors.scala:17: error: too many arguments for constructor Foo1:
^
protected-constructors.scala:18: error: constructor Foo2 in class Foo2 cannot be accessed in object P
Access to protected constructor Foo2 not permitted because
- enclosing class object P in package hungus is not a subclass of
+ enclosing object P in package hungus is not a subclass of
class Foo2 in package dingus where target is defined
val foo2 = new Foo2("abc")
^
protected-constructors.scala:19: error: class Foo3 in object Ding cannot be accessed in object dingus.Ding
Access to protected class Foo3 not permitted because
- enclosing class object P in package hungus is not a subclass of
+ enclosing object P in package hungus is not a subclass of
object Ding in package dingus where target is defined
val foo3 = new Ding.Foo3("abc")
^
protected-constructors.scala:15: error: class Foo3 in object Ding cannot be accessed in object dingus.Ding
Access to protected class Foo3 not permitted because
- enclosing class object P in package hungus is not a subclass of
+ enclosing object P in package hungus is not a subclass of
object Ding in package dingus where target is defined
class Bar3 extends Ding.Foo3("abc")
^
diff --git a/test/files/neg/protected-static-fail.check b/test/files/neg/protected-static-fail.check
index 2f8a0caeab..e149bc016f 100644
--- a/test/files/neg/protected-static-fail.check
+++ b/test/files/neg/protected-static-fail.check
@@ -3,13 +3,13 @@ S.scala:5: error: method f in object J cannot be accessed in object bippy.J
^
S.scala:6: error: method f1 in object S1 cannot be accessed in object bippy.S1
Access to protected method f1 not permitted because
- enclosing class object Test in package bippy is not a subclass of
+ enclosing object Test in package bippy is not a subclass of
object S1 in package bippy where target is defined
S1.f1()
^
S.scala:8: error: method f2 in class S2 cannot be accessed in bippy.S2
Access to protected method f2 not permitted because
- enclosing class object Test in package bippy is not a subclass of
+ enclosing object Test in package bippy is not a subclass of
class S2 in package bippy where target is defined
x.f2()
^
diff --git a/test/files/neg/t3934.check b/test/files/neg/t3934.check
index ebc6dfb876..405ed2e879 100644
--- a/test/files/neg/t3934.check
+++ b/test/files/neg/t3934.check
@@ -1,6 +1,6 @@
t3934.scala:15: error: method f2 in class J cannot be accessed in test.J
Access to protected method f2 not permitted because
- enclosing class class S1 in package nest is not a subclass of
+ enclosing class S1 in package nest is not a subclass of
class J in package test where target is defined
def g2(x: J) = x.f2()
^