Fighting bitrot with typing.

  if (false && settings.debug.value) { ... }
      Date:   7 years ago
      *** empty log message ***

That's way past the sell-by date for 'if (false && condition)'.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index 37caa06fe9..c2ef633d58 100644
--- a/src/compiler/scala/reflect/internal/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -1425,7 +1425,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     /** Reset symbol to initial state
      */
-    def reset(completer: Type) {
+    def reset(completer: Type): this.type = {
       resetFlags()
       infos = null
       _validTo = NoPeriod
@@ -2054,6 +2054,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     def sealedDescendants: Set[Symbol] = children.flatMap(_.sealedDescendants) + this
 
     @inline final def orElse(alt: => Symbol): Symbol = if (this ne NoSymbol) this else alt
+    @inline final def andAlso(f: Symbol => Unit): Symbol = if (this eq NoSymbol) NoSymbol else { f(this) ; this }
 
 // ------ toString -------------------------------------------------------------------
 
@@ -2636,10 +2637,11 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       info.baseTypeIndex(that) >= 0
     )
 
-    override def reset(completer: Type) {
+    override def reset(completer: Type): this.type = {
       super.reset(completer)
       tpePeriod = NoPeriod
       tyconRunId = NoRunId
+      this
     }
 
     /*** example:
@@ -2822,9 +2824,10 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       else super.sourceFile
     override def sourceFile_=(f: AbstractFileType) { source = f }
 
-    override def reset(completer: Type) {
+    override def reset(completer: Type): this.type = {
       super.reset(completer)
       thissym = this
+      this
     }
 
     /** the type this.type in this class */
@@ -3022,7 +3025,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     override def ownerChain: List[Symbol] = List()
     override def ownersIterator: Iterator[Symbol] = Iterator.empty
     override def alternatives: List[Symbol] = List()
-    override def reset(completer: Type) {}
+    override def reset(completer: Type): this.type = this
     override def info: Type = NoType
     override def existentialBound: Type = NoType
     override def rawInfo: Type = NoType