summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-02-20 13:15:06 +0000
committerMartin Odersky <odersky@gmail.com>2003-02-20 13:15:06 +0000
commit17bd66e3cf7734ccf1ccd3a0adb987feb880d325 (patch)
tree52c57891aac018ce89643e41dd0dd05170ae42ab /test
parent2fc8c8dc203f00a936aab60dba50c2d7e4ae054b (diff)
downloadscala-17bd66e3cf7734ccf1ccd3a0adb987feb880d325.tar.gz
scala-17bd66e3cf7734ccf1ccd3a0adb987feb880d325.tar.bz2
scala-17bd66e3cf7734ccf1ccd3a0adb987feb880d325.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/test5.scala16
-rw-r--r--test/files/pos/test5refine.scala16
-rw-r--r--test/pos/test5.scala16
-rw-r--r--test/pos/test5refine.scala16
4 files changed, 32 insertions, 32 deletions
diff --git a/test/files/pos/test5.scala b/test/files/pos/test5.scala
index 4851e5e6a2..850fb49a31 100644
--- a/test/files/pos/test5.scala
+++ b/test/files/pos/test5.scala
@@ -4,11 +4,11 @@ module test {
trait F[If] {}
- def f[Jf](h: Jf):F[Jf] = f@[Jf](h);
+ def f[Jf](h: Jf):F[Jf] = f[Jf](h);
trait G[Ig] {}
- def g[Jg](h: Jg):G[Jg] = g@[Jg](h);
+ def g[Jg](h: Jg):G[Jg] = g[Jg](h);
class M[P]() {
class I[X]() {
@@ -24,7 +24,7 @@ module test {
// Values with types P and i.X as seen from instances of M
def val_mp: P = val_mp;
- def val_mix: G[P] = g@[P](val_mp);
+ def val_mix: G[P] = g[P](val_mp);
}
class N[Q]() extends M[F[Q]]() {
@@ -33,7 +33,7 @@ module test {
class J[Y]() extends I[G[Y]]() {
// Values with types Y and X as seen from instances of J
def val_jy: Y = val_jy;
- def val_jx: G[Y] = g@[Y](val_jy);
+ def val_jx: G[Y] = g[Y](val_jy);
// Check type P
chk_ip(val_mp);
@@ -42,10 +42,10 @@ module test {
// Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
def val_nq: Q = val_nq;
- def val_np: F[Q] = f@[Q](val_nq);
- def val_nix: G[F[Q]] = g@[F[Q]](val_np);
- def val_njy: G[Q] = g@[Q](val_nq);
- def val_njx: G[G[Q]] = g@[G[Q]](val_njy);
+ def val_np: F[Q] = f[Q](val_nq);
+ def val_nix: G[F[Q]] = g[F[Q]](val_np);
+ def val_njy: G[Q] = g[Q](val_nq);
+ def val_njx: G[G[Q]] = g[G[Q]](val_njy);
// Check type i.P
i.chk_ip(val_mp);
diff --git a/test/files/pos/test5refine.scala b/test/files/pos/test5refine.scala
index 1097c6cff7..a9d7a02bf6 100644
--- a/test/files/pos/test5refine.scala
+++ b/test/files/pos/test5refine.scala
@@ -4,11 +4,11 @@ module test {
abstract trait F { type If; }
- def f[Jf](h: Jf):F with { type If = Jf } = f@[Jf](h);
+ def f[Jf](h: Jf):F with { type If = Jf } = f[Jf](h);
abstract trait G { type Ig; }
- def g[Jg](h: Jg):G with { type Ig = Jg } = g@[Jg](h);
+ def g[Jg](h: Jg):G with { type Ig = Jg } = g[Jg](h);
abstract class M() {
type P;
@@ -27,7 +27,7 @@ module test {
// Values with types P and i.X as seen from instances of M
def val_mp: P = val_mp;
- def val_mix: G with { type Ig = P } = g@[P](val_mp);
+ def val_mix: G with { type Ig = P } = g[P](val_mp);
}
abstract class N() extends M() {
@@ -40,7 +40,7 @@ module test {
type X = G with { type Ig = Y; };
// Values with types Y and X as seen from instances of J
def val_jy: Y = val_jy;
- def val_jx: G with { type Ig = Y; } = g@[Y](val_jy);
+ def val_jx: G with { type Ig = Y; } = g[Y](val_jy);
// Check type P
chk_ip(val_mp);
@@ -49,10 +49,10 @@ module test {
// Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
def val_nq: Q = val_nq;
- def val_np: F with { type If = Q } = f@[Q](val_nq);
- def val_nix: G with { type Ig = F with { type If = Q } } = g@[F with { type If = Q }](val_np);
- def val_njy: G with { type Ig = Q; } = g@[Q](val_nq);
- def val_njx: G with { type Ig = G with { type Ig = Q }} = g@[G with { type Ig = Q; }](val_njy);
+ def val_np: F with { type If = Q } = f[Q](val_nq);
+ def val_nix: G with { type Ig = F with { type If = Q } } = g[F with { type If = Q }](val_np);
+ def val_njy: G with { type Ig = Q; } = g[Q](val_nq);
+ def val_njx: G with { type Ig = G with { type Ig = Q }} = g[G with { type Ig = Q; }](val_njy);
// Check type i.P
i.chk_ip(val_mp);
diff --git a/test/pos/test5.scala b/test/pos/test5.scala
index 4851e5e6a2..850fb49a31 100644
--- a/test/pos/test5.scala
+++ b/test/pos/test5.scala
@@ -4,11 +4,11 @@ module test {
trait F[If] {}
- def f[Jf](h: Jf):F[Jf] = f@[Jf](h);
+ def f[Jf](h: Jf):F[Jf] = f[Jf](h);
trait G[Ig] {}
- def g[Jg](h: Jg):G[Jg] = g@[Jg](h);
+ def g[Jg](h: Jg):G[Jg] = g[Jg](h);
class M[P]() {
class I[X]() {
@@ -24,7 +24,7 @@ module test {
// Values with types P and i.X as seen from instances of M
def val_mp: P = val_mp;
- def val_mix: G[P] = g@[P](val_mp);
+ def val_mix: G[P] = g[P](val_mp);
}
class N[Q]() extends M[F[Q]]() {
@@ -33,7 +33,7 @@ module test {
class J[Y]() extends I[G[Y]]() {
// Values with types Y and X as seen from instances of J
def val_jy: Y = val_jy;
- def val_jx: G[Y] = g@[Y](val_jy);
+ def val_jx: G[Y] = g[Y](val_jy);
// Check type P
chk_ip(val_mp);
@@ -42,10 +42,10 @@ module test {
// Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
def val_nq: Q = val_nq;
- def val_np: F[Q] = f@[Q](val_nq);
- def val_nix: G[F[Q]] = g@[F[Q]](val_np);
- def val_njy: G[Q] = g@[Q](val_nq);
- def val_njx: G[G[Q]] = g@[G[Q]](val_njy);
+ def val_np: F[Q] = f[Q](val_nq);
+ def val_nix: G[F[Q]] = g[F[Q]](val_np);
+ def val_njy: G[Q] = g[Q](val_nq);
+ def val_njx: G[G[Q]] = g[G[Q]](val_njy);
// Check type i.P
i.chk_ip(val_mp);
diff --git a/test/pos/test5refine.scala b/test/pos/test5refine.scala
index 1097c6cff7..a9d7a02bf6 100644
--- a/test/pos/test5refine.scala
+++ b/test/pos/test5refine.scala
@@ -4,11 +4,11 @@ module test {
abstract trait F { type If; }
- def f[Jf](h: Jf):F with { type If = Jf } = f@[Jf](h);
+ def f[Jf](h: Jf):F with { type If = Jf } = f[Jf](h);
abstract trait G { type Ig; }
- def g[Jg](h: Jg):G with { type Ig = Jg } = g@[Jg](h);
+ def g[Jg](h: Jg):G with { type Ig = Jg } = g[Jg](h);
abstract class M() {
type P;
@@ -27,7 +27,7 @@ module test {
// Values with types P and i.X as seen from instances of M
def val_mp: P = val_mp;
- def val_mix: G with { type Ig = P } = g@[P](val_mp);
+ def val_mix: G with { type Ig = P } = g[P](val_mp);
}
abstract class N() extends M() {
@@ -40,7 +40,7 @@ module test {
type X = G with { type Ig = Y; };
// Values with types Y and X as seen from instances of J
def val_jy: Y = val_jy;
- def val_jx: G with { type Ig = Y; } = g@[Y](val_jy);
+ def val_jx: G with { type Ig = Y; } = g[Y](val_jy);
// Check type P
chk_ip(val_mp);
@@ -49,10 +49,10 @@ module test {
// Values with types Q, X.P, i.X, j.Y and j.X as seen from instances of N
def val_nq: Q = val_nq;
- def val_np: F with { type If = Q } = f@[Q](val_nq);
- def val_nix: G with { type Ig = F with { type If = Q } } = g@[F with { type If = Q }](val_np);
- def val_njy: G with { type Ig = Q; } = g@[Q](val_nq);
- def val_njx: G with { type Ig = G with { type Ig = Q }} = g@[G with { type Ig = Q; }](val_njy);
+ def val_np: F with { type If = Q } = f[Q](val_nq);
+ def val_nix: G with { type Ig = F with { type If = Q } } = g[F with { type If = Q }](val_np);
+ def val_njy: G with { type Ig = Q; } = g[Q](val_nq);
+ def val_njx: G with { type Ig = G with { type Ig = Q }} = g[G with { type Ig = Q; }](val_njy);
// Check type i.P
i.chk_ip(val_mp);