Skip to content

Commit

Permalink
Fix for failing test, review by extempore.
Browse files Browse the repository at this point in the history
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25254 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
  • Loading branch information
kzys committed Jul 9, 2011
1 parent fb0618f commit 4a7a789
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/compiler/scala/reflect/internal/StdNames.scala
Expand Up @@ -368,7 +368,7 @@ trait StdNames extends /*reflect.generic.StdNames with*/ NameManglers { self: Sy
/** The name of bitmaps for checkinit values that have transient flag*/
def bitmapNameForCheckinitTransient(n: Int): TermName = bitmapName(n, "inittrans$")

/** The expanded name of `name' relative to this class `base` with given `separator`
/** The expanded name of `name` relative to this class `base` with given `separator`
*/
def expandedName(name: TermName, base: Symbol, separator: String = EXPAND_SEPARATOR_STRING): TermName =
newTermName(base.fullName('$') + separator + name)
Expand Down
Expand Up @@ -111,7 +111,7 @@ object PickleFormat {
* AnnotArg = Tree | Constant
* ConstAnnotArg = Constant | AnnotInfo | AnnotArgArray
*
* len is remaining length after `len'.
* len is remaining length after `len`.
*/
val MajorVersion = 5
val MinorVersion = 0
Expand Down
4 changes: 2 additions & 2 deletions src/compiler/scala/reflect/internal/pickling/UnPickler.scala
Expand Up @@ -56,7 +56,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
/** A map from entry numbers to symbols, types, or annotations */
private val entries = new Array[AnyRef](index.length)

/** A map from symbols to their associated `decls' scopes */
/** A map from symbols to their associated `decls` scopes */
private val symScopes = new HashMap[Symbol, Scope]

//println("unpickled " + classRoot + ":" + classRoot.rawInfo + ", " + moduleRoot + ":" + moduleRoot.rawInfo);//debug
Expand Down Expand Up @@ -105,7 +105,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
" in "+filename)
}

/** The `decls' scope associated with given symbol */
/** The `decls` scope associated with given symbol */
protected def symScope(sym: Symbol) = symScopes.getOrElseUpdate(sym, newScope)

/** Does entry represent an (internal) symbol */
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/reflect/internal/util/Set.scala
Expand Up @@ -18,7 +18,7 @@ abstract class Set[T <: AnyRef] {

def apply(x: T): Boolean = contains(x)

@deprecated("use `iterator' instead", "2.9.0") def elements = iterator
@deprecated("use `iterator` instead", "2.9.0") def elements = iterator

def contains(x: T): Boolean =
findEntry(x) ne null
Expand Down
2 changes: 1 addition & 1 deletion test/files/run/bytecodecs.scala
@@ -1,4 +1,4 @@
import scala.reflect.generic.ByteCodecs._
import scala.reflect.internal.ByteCodecs._

object Test {

Expand Down

0 comments on commit 4a7a789

Please sign in to comment.