From e52053f10b65105ca6ba58806da41a0d14803a37 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 15 Oct 2011 00:14:04 +0000 Subject: Fix regression in companion check. Pulling back from expensive path normalization caused a regression where companions were no longer recognized as such after specialization. (Specifically, the paths turned up as "test.scala" and "./test.scala".) I made it a two-level check, doing the expensive one before failing. Closes SI-5023, no review. --- test/files/neg/t1286.check | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/files') diff --git a/test/files/neg/t1286.check b/test/files/neg/t1286.check index 734964e9cf..2699f0789d 100644 --- a/test/files/neg/t1286.check +++ b/test/files/neg/t1286.check @@ -1,7 +1,9 @@ -a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file +a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file: + Found in files/neg/t1286/b.scala and files/neg/t1286/a.scala trait Foo { ^ -b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file +b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file: + Found in files/neg/t1286/a.scala and files/neg/t1286/b.scala object Foo extends Foo { ^ two errors found -- cgit v1.2.3