diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-08-18 12:55:57 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-08-18 12:55:57 +0000 |
| commit | 8d07df2b37ee2d17e705e7e1a934be06d0b925e8 (patch) | |
| tree | 86837becede83d2185771020be92a48a1f21f701 | |
| parent | c19ea510a36c3daf265415a84a8a45a5e0a2d6a5 (diff) | |
| download | scala-8d07df2b37ee2d17e705e7e1a934be06d0b925e8.tar.gz scala-8d07df2b37ee2d17e705e7e1a934be06d0b925e8.tar.bz2 scala-8d07df2b37ee2d17e705e7e1a934be06d0b925e8.zip | |
Fixed #1189
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/native.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/remote.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/throws.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/transient.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/volatile.scala | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala index de4854b1e2..3f6448300a 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala @@ -408,7 +408,7 @@ abstract class Pickler extends SubComponent { private def putConstant(c: Constant) = if (putEntry(c)) { if (c.tag == StringTag) putEntry(newTermName(c.stringValue)) - else if (c.tag == ClassTag) putEntry(c.typeValue) + else if (c.tag == ClassTag) putType(c.typeValue) } private def putChildren(sym: Symbol, children: List[Symbol]) { @@ -939,6 +939,8 @@ abstract class Pickler extends SubComponent { case _ => throw new FatalError("bad entry: " + entry + " " + entry.getClass) } + + // begin writeEntry val startpos = writeIndex writeByte(0); writeByte(0) patchNat(startpos, writeBody(entry)) diff --git a/src/library/scala/native.scala b/src/library/scala/native.scala index 157834e446..01f5d656e3 100644 --- a/src/library/scala/native.scala +++ b/src/library/scala/native.scala @@ -21,4 +21,4 @@ package scala * but it is type checked when present. * </p> */ -class native extends Annotation {} +class native extends StaticAnnotation {} diff --git a/src/library/scala/remote.scala b/src/library/scala/remote.scala index 441eb45131..b628d8c8a4 100644 --- a/src/library/scala/remote.scala +++ b/src/library/scala/remote.scala @@ -17,4 +17,4 @@ package scala * @see Method <a href="ScalaObject.html#$tag()">$tag</a> in trait * <a href="ScalaObject.html">scala.ScalaObject</a>. */ -class remote extends Annotation {} +class remote extends StaticAnnotation {} diff --git a/src/library/scala/throws.scala b/src/library/scala/throws.scala index 463a01b3f9..1715a50a24 100644 --- a/src/library/scala/throws.scala +++ b/src/library/scala/throws.scala @@ -27,4 +27,4 @@ import Predef._ * @author Nikolay Mihaylov * @version 1.0, 19/05/2006 */ -class throws(clazz: Class[_]) extends Annotation +class throws(clazz: Class[_]) extends StaticAnnotation diff --git a/src/library/scala/transient.scala b/src/library/scala/transient.scala index d20b2e8c59..4d68d79d0a 100644 --- a/src/library/scala/transient.scala +++ b/src/library/scala/transient.scala @@ -11,4 +11,4 @@ package scala -class transient extends Annotation +class transient extends StaticAnnotation diff --git a/src/library/scala/volatile.scala b/src/library/scala/volatile.scala index ef1ca4e8e6..18b68c4fb0 100644 --- a/src/library/scala/volatile.scala +++ b/src/library/scala/volatile.scala @@ -11,4 +11,4 @@ package scala -class volatile extends Annotation +class volatile extends StaticAnnotation |