summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-07-11 19:03:35 +0200
committerMartin Odersky <odersky@gmail.com>2012-07-11 19:35:55 +0200
commita9b85dbaad568b5c709a5eb6ab23907cdf4ee29e (patch)
tree56180948d8986aafa37e93e837db70c9106c2f6b /test/files/neg
parent026a70d55591c3b5ee157e22998b62168afee686 (diff)
downloadscala-a9b85dbaad568b5c709a5eb6ab23907cdf4ee29e.tar.gz
scala-a9b85dbaad568b5c709a5eb6ab23907cdf4ee29e.tar.bz2
scala-a9b85dbaad568b5c709a5eb6ab23907cdf4ee29e.zip
Pickled flag reorg
Cleaned up and optimized code that maps between raw and pickled flags. Avoids mystery constants. Makes a whole bunch of new flags be pickled which were not pickled before (more precisely: Everything in InitialFlags with value greater than 1 << 31 which is not in FlagsNotPickled now gets pickled whereas before it wasn't. Among these: VARARGS, IMPLCLASS, SPECIALZED, DEFAULTINIT, SYNCHRONIZED. I am curious how many tickets will get fixed by this change. The first one I noted is t5504, which previously enforced the buggy behavior through a neg check! There are also some build manager check file changes that have to do with the fact that flags now print in a different order for performance reasons.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t5504.check4
-rw-r--r--test/files/neg/t5504/s_1.scala4
-rw-r--r--test/files/neg/t5504/s_2.scala8
3 files changed, 0 insertions, 16 deletions
diff --git a/test/files/neg/t5504.check b/test/files/neg/t5504.check
deleted file mode 100644
index 2827c02d10..0000000000
--- a/test/files/neg/t5504.check
+++ /dev/null
@@ -1,4 +0,0 @@
-error: type _$1 is defined twice
- conflicting symbols both originated in file 't5504/s_1.scala'
- Note: this may be due to a bug in the compiler involving wildcards in package objects
-one error found
diff --git a/test/files/neg/t5504/s_1.scala b/test/files/neg/t5504/s_1.scala
deleted file mode 100644
index 35cb2c8bae..0000000000
--- a/test/files/neg/t5504/s_1.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// a.scala
-package object foo {
- val m: List[_] = Nil
-}
diff --git a/test/files/neg/t5504/s_2.scala b/test/files/neg/t5504/s_2.scala
deleted file mode 100644
index 03eecf6e19..0000000000
--- a/test/files/neg/t5504/s_2.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-// b.scala
-package foo
-
-object Test {
- def main(args: Array[String]): Unit = {
- println(foo.m)
- }
-}