diff options
| author | michelou <michelou@epfl.ch> | 2007-02-07 12:48:43 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-02-07 12:48:43 +0000 |
| commit | 15d4afe9ebe876f6630ff6718677776b1960c9b0 (patch) | |
| tree | 3759c2c09951284f8cd28a24b93a33863960a60a /src | |
| parent | 852ff5c25c9eaaab4fde01b9a1c26b4778c47bcc (diff) | |
| download | scala-15d4afe9ebe876f6630ff6718677776b1960c9b0.tar.gz scala-15d4afe9ebe876f6630ff6718677776b1960c9b0.tar.bz2 scala-15d4afe9ebe876f6630ff6718677776b1960c9b0.zip | |
updated deprecated methods
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocUtil.scala | 6 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/TypingTransformers.scala | 6 | ||||
| -rw-r--r-- | src/library/scala/ref/PhantomReference.scala | 14 |
3 files changed, 18 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocUtil.scala b/src/compiler/scala/tools/nsc/doc/DocUtil.scala index cc304f5a36..3ca2a36689 100644 --- a/src/compiler/scala/tools/nsc/doc/DocUtil.scala +++ b/src/compiler/scala/tools/nsc/doc/DocUtil.scala @@ -31,8 +31,8 @@ object DocUtil { // def label = "#PCDATA" //} - def br(nodes: NodeSeq): NodeSeq = nodes.concat(<br/>) - def hr(nodes: NodeSeq): NodeSeq = nodes.concat(<hr/>) + def br(nodes: NodeSeq): NodeSeq = nodes ++ <br/> + def hr(nodes: NodeSeq): NodeSeq = nodes ++ <hr/> trait UrlContext { def relative: String @@ -51,7 +51,7 @@ object DocUtil { val encoding = "iso-8859-1" val header = <meta http-equiv="content-type" content={"text/html; charset=" + encoding}/> - <meta name="generator" content="scaladoc (2.3.0)"/> + <meta name="generator" content={ "scaladoc (" + Properties.versionString +")" }/> <link rel="stylesheet" type="text/css" href={ relative + "style.css" }/> <script type="text/javascript" src={relative + "script.js"}></script>; diff --git a/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala b/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala index b16c8aed13..da158a0553 100644 --- a/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala +++ b/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -29,10 +29,10 @@ trait TypingTransformers { def atOwner[A](tree: Tree, owner: Symbol)(trans: => A): A = { val savedLocalTyper = localTyper localTyper = localTyper.atOwner(tree, owner) - typers += owner -> localTyper; + typers += owner -> localTyper val result = super.atOwner(owner)(trans) localTyper = savedLocalTyper - typers.excl(owner); + typers -= owner result } diff --git a/src/library/scala/ref/PhantomReference.scala b/src/library/scala/ref/PhantomReference.scala index 06216df3eb..39eb754081 100644 --- a/src/library/scala/ref/PhantomReference.scala +++ b/src/library/scala/ref/PhantomReference.scala @@ -1,5 +1,15 @@ -package scala.ref; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + +package scala.ref class PhantomReference[+T <: AnyRef](value : T, queue : ReferenceQueue[T]) extends ReferenceWrapper[T] { - val underlying = new java.lang.ref.PhantomReference(value, queue.underlying); + val underlying = new java.lang.ref.PhantomReference(value, queue.underlying) } |