Merge pull request scala#2693 from lexspoon/semmle-lint

adriaanm · adriaanm · commit c1451cfca637 · 2013-07-01T11:54:45.000-07:00
Lint-like fixes found by Semmle
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/lib/.gitignore b/lib/.gitignore
@@ -0,0 +1,15 @@
+ant-contrib.jar
+ant-dotnet-1.0.jar
+ant.jar
+fjbg.jar
+forkjoin.jar
+jline.jar
+maven-ant-tasks-2.1.1.jar
+msil.jar
+scala-compiler.jar
+scala-compiler-src.jar
+scala-library.jar
+scala-library-src.jar
+scala-reflect.jar
+scala-reflect-src.jar
+vizant.jar
diff --git a/src/compiler/scala/tools/ant/sabbus/Settings.scala b/src/compiler/scala/tools/ant/sabbus/Settings.scala
@@ -93,4 +93,18 @@ class Settings {
     case _ => false
   }
 
+  override lazy val hashCode: Int = Seq(
+    gBf,
+    uncheckedBf,
+    classpathBf,
+    sourcepathBf,
+    sourcedirBf,
+    bootclasspathBf,
+    extdirsBf,
+    dBf,
+    encodingBf,
+    targetBf,
+    optimiseBf,
+    extraParamsBf
+  ).##
 }
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -1748,7 +1748,7 @@ abstract class GenICode extends SubComponent  {
 
     /////////////////////// Context ////////////////////////////////
 
-    abstract class Cleanup(val value: AnyRef) {
+    sealed abstract class Cleanup(val value: AnyRef) {
       def contains(x: AnyRef) = value == x
     }
     case class MonitorRelease(m: Local) extends Cleanup(m) { }
diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
@@ -108,6 +108,14 @@ trait Members {
       if (symbol eq other.symbol) 0
       else if (symbol isLess other.symbol) -1
       else 1
+
+    override def equals(other: Any): Boolean =
+      other match {
+        case other: IMember => (this compare other) == 0
+        case _ => false
+      }
+
+    override def hashCode = symbol.##
   }
 
   /** Represent a class in ICode */
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
@@ -27,7 +27,7 @@ abstract class CopyPropagation {
   case object This extends Location
 
   /** Values that can be on the stack. */
-  abstract class Value { }
+  sealed abstract class Value { }
   case class Record(cls: Symbol, bindings: mutable.Map[Symbol, Value]) extends Value { }
   /** The value of some location in memory. */
   case class Deref(l: Location) extends Value
diff --git a/src/compiler/scala/tools/nsc/dependencies/Changes.scala b/src/compiler/scala/tools/nsc/dependencies/Changes.scala
@@ -16,7 +16,7 @@ abstract class Changes {
   import compiler._
   import symtab.Flags._
 
-  abstract class Change
+  sealed abstract class Change
 
   private lazy val annotationsChecked =
     List(definitions.SpecializedClass) // Any others that should be checked?
@@ -38,7 +38,7 @@ abstract class Changes {
   /** An entity in source code, either a class or a member definition.
    *  Name is fully-qualified.
    */
-  abstract class Entity
+  sealed abstract class Entity
   case class Class(name: String) extends Entity
   case class Definition(name: String) extends Entity
 
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala b/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
@@ -11,7 +11,7 @@ package tools.nsc.settings
  * Represents a single Scala version in a manner that
  * supports easy comparison and sorting.
  */
-abstract class ScalaVersion extends Ordered[ScalaVersion] {
+sealed abstract class ScalaVersion extends Ordered[ScalaVersion] {
   def unparse: String
 }
 
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
@@ -79,7 +79,7 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
       def chainBefore(next: Tree)(casegen: Casegen): Tree
     }
 
-    trait NoNewBinders extends TreeMaker {
+    sealed trait NoNewBinders extends TreeMaker {
       protected val localSubstitution: Substitution = EmptySubstitution
     }
 
@@ -105,12 +105,12 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
       override def toString = "S"+ localSubstitution
     }
 
-    abstract class FunTreeMaker extends TreeMaker {
+    sealed abstract class FunTreeMaker extends TreeMaker {
       val nextBinder: Symbol
       def pos = nextBinder.pos
     }
 
-    abstract class CondTreeMaker extends FunTreeMaker {
+    sealed abstract class CondTreeMaker extends FunTreeMaker {
       val prevBinder: Symbol
       val nextBinderTp: Type
       val cond: Tree
@@ -126,7 +126,7 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
     // unless we're optimizing, emit local variable bindings for all subpatterns of extractor/case class patterns
     protected val debugInfoEmitVars = !settings.optimise.value
 
-    trait PreserveSubPatBinders extends TreeMaker {
+    sealed trait PreserveSubPatBinders extends TreeMaker {
       val subPatBinders: List[Symbol]
       val subPatRefs: List[Tree]
       val ignoredSubPatBinders: Set[Symbol]
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -21,13 +21,13 @@ trait ContextErrors {
   import global._
   import definitions._
 
-  abstract class AbsTypeError extends Throwable {
+  sealed abstract class AbsTypeError extends Throwable {
     def errPos: Position
     def errMsg: String
     override def toString() = "[Type error at:" + errPos + "] " + errMsg
   }
 
-  abstract class TreeTypeError extends AbsTypeError {
+  sealed abstract class TreeTypeError extends AbsTypeError {
     def underlyingTree: Tree
     def errPos = underlyingTree.pos
   }
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
@@ -259,7 +259,7 @@ trait MethodSynthesis {
      *  So it's important that creating an instance of Derived does not have a side effect,
      *  or if it has a side effect, control that it is done only once.
      */
-    trait Derived {
+    sealed trait Derived {
 
       /** The tree from which we are deriving a synthetic member. Typically, that's
        *  given as an argument of the instance. */
@@ -288,7 +288,7 @@ trait MethodSynthesis {
       def derivedTree: Tree
     }
 
-    trait DerivedFromMemberDef extends Derived {
+    sealed trait DerivedFromMemberDef extends Derived {
       def tree: MemberDef
       def enclClass: Symbol
 
@@ -297,12 +297,12 @@ trait MethodSynthesis {
       final def basisSym           = tree.symbol
     }
 
-    trait DerivedFromClassDef extends DerivedFromMemberDef {
+    sealed trait DerivedFromClassDef extends DerivedFromMemberDef {
       def tree: ClassDef
       final def enclClass = basisSym.owner.enclClass
     }
 
-    trait DerivedFromValDef extends DerivedFromMemberDef {
+    sealed trait DerivedFromValDef extends DerivedFromMemberDef {
       def tree: ValDef
       final def enclClass = basisSym.enclClass
 
@@ -341,10 +341,10 @@ trait MethodSynthesis {
         logDerived(derivedTree)
       }
     }
-    trait DerivedGetter extends DerivedFromValDef {
+    sealed trait DerivedGetter extends DerivedFromValDef {
       // TODO
     }
-    trait DerivedSetter extends DerivedFromValDef {
+    sealed trait DerivedSetter extends DerivedFromValDef {
       override def isSetter = true
       private def setterParam = derivedSym.paramss match {
         case (p :: Nil) :: _  => p
@@ -378,7 +378,7 @@ trait MethodSynthesis {
       def name: TermName               = tree.name.toTermName
     }
 
-    abstract class BaseGetter(tree: ValDef) extends DerivedGetter {
+    sealed abstract class BaseGetter(tree: ValDef) extends DerivedGetter {
       def name       = tree.name
       def category   = GetterTargetClass
       def flagsMask  = GetterFlags
@@ -510,7 +510,7 @@ trait MethodSynthesis {
       def flagsExtra = 0
       override def derivedSym = enclClass.info decl name
     }
-    trait AnyBeanGetter extends BeanAccessor with DerivedGetter {
+    sealed trait AnyBeanGetter extends BeanAccessor with DerivedGetter {
       def category = BeanGetterTargetClass
       override def validate() {
         if (derivedSym == NoSymbol) {
diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala
@@ -12,9 +12,9 @@ package dtd
 
 import Utility.sbToString
 
-abstract class Decl
+sealed abstract class Decl
 
-abstract class MarkupDecl extends Decl {
+sealed abstract class MarkupDecl extends Decl {
   def buildString(sb: StringBuilder): StringBuilder
 }
 
@@ -52,7 +52,7 @@ case class AttrDecl(name: String, tpe: String, default: DefaultDecl) {
 }
 
 /** an entity declaration */
-abstract class EntityDecl extends MarkupDecl
+sealed abstract class EntityDecl extends MarkupDecl
 
 /** a parsed general entity declaration */
 case class ParsedEntityDecl(name: String, entdef: EntityDef) extends EntityDecl {
@@ -85,7 +85,7 @@ case class NotationDecl( name:String, extID:ExternalID ) extends MarkupDecl {
   }
 }
 
-abstract class EntityDef {
+sealed abstract class EntityDef {
   def buildString(sb: StringBuilder): StringBuilder
 }
 
@@ -133,7 +133,7 @@ case class PEReference(ent:String) extends MarkupDecl {
 
 // default declarations for attributes
 
-abstract class DefaultDecl {
+sealed abstract class DefaultDecl {
   override def toString(): String
   def buildString(sb: StringBuilder): StringBuilder
 }
diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala
@@ -15,7 +15,7 @@ package dtd
  *
  *  @author Burak Emir
  */
-abstract class ExternalID extends parsing.TokenTests {
+sealed abstract class ExternalID extends parsing.TokenTests {
   def quoted(s: String) = {
     val c = if (s contains '"') '\'' else '"'
     c + s + c
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
@@ -73,7 +73,7 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
    *  - arrays of constants
    *  - or nested classfile annotations
    */
-  abstract class ClassfileAnnotArg extends Product
+  sealed abstract class ClassfileAnnotArg extends Product
   implicit val JavaArgumentTag = ClassTag[ClassfileAnnotArg](classOf[ClassfileAnnotArg])
   case object UnmappableAnnotArg extends ClassfileAnnotArg
 
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -3433,7 +3433,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
   }
 
   /** A class for type histories */
-  private sealed case class TypeHistory(var validFrom: Period, info: Type, prev: TypeHistory) {
+  private case class TypeHistory(var validFrom: Period, info: Type, prev: TypeHistory) {
     assert((prev eq null) || phaseId(validFrom) > phaseId(prev.validFrom), this)
     assert(validFrom != NoPeriod, this)
 
diff --git a/src/reflect/scala/reflect/internal/util/Statistics.scala b/src/reflect/scala/reflect/internal/util/Statistics.scala
@@ -133,6 +133,12 @@ quant)
       if (this.value < that.value) -1
       else if (this.value > that.value) 1
       else 0
+    override def equals(that: Any): Boolean =
+      that match {
+        case that: Counter => (this compare that) == 0
+        case _ => false
+      }
+    override def hashCode = value
     override def toString = value.toString
   }
 
@@ -184,6 +190,12 @@ quant)
       if (this.specificNanos < that.specificNanos) -1
       else if (this.specificNanos > that.specificNanos) 1
       else 0
+    override def equals(that: Any): Boolean =
+      that match {
+        case that: StackableTimer => (this compare that) == 0
+        case _ => false
+      }
+    override def hashCode = specificNanos.##
     override def toString = s"${super.toString} aggregate, ${show(specificNanos)} specific"
   }
 
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/diagram/Diagram.scala b/src/scaladoc/scala/tools/nsc/doc/model/diagram/Diagram.scala
@@ -10,7 +10,7 @@ import model._
  *  @author Damien Obrist
  *  @author Vlad Ureche
  */
-abstract class Diagram {
+sealed abstract class Diagram {
   def nodes: List[Node]
   def edges: List[(Node, List[Node])]
   def isContentDiagram = false     // Implemented by ContentDiagram
@@ -44,7 +44,7 @@ trait DepthInfo {
   def maxDepth: Int
 }
 
-abstract class Node {
+sealed abstract class Node {
   def name = tpe.name
   def tpe: TypeEntity
   def tpl: Option[TemplateEntity]
diff --git a/test/files/codelib/.gitignore b/test/files/codelib/.gitignore
@@ -0,0 +1 @@
+code.jar
diff --git a/test/files/lib/.gitignore b/test/files/lib/.gitignore
@@ -0,0 +1,8 @@
+annotations.jar
+enums.jar
+genericNest.jar
+javac-artifacts.jar
+jsoup-1.3.1.jar
+methvsfield.jar
+nest.jar
+scalacheck.jar
diff --git a/test/files/speclib/.gitignore b/test/files/speclib/.gitignore
@@ -0,0 +1 @@
+instrumented.jar
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -0,0 +1 @@
+push.jar

Original file line number	Diff line number	Diff line change
`@@ -1748,7 +1748,7 @@ abstract class GenICode extends SubComponent {`
`1748`	`1748`
`1749`	`1749`	`/////////////////////// Context ////////////////////////////////`
`1750`	`1750`
`1751`		`- abstract class Cleanup(val value: AnyRef) {`
	`1751`	`+ sealed abstract class Cleanup(val value: AnyRef) {`
`1752`	`1752`	`def contains(x: AnyRef) = value == x`
`1753`	`1753`	`}`
`1754`	`1754`	`case class MonitorRelease(m: Local) extends Cleanup(m) { }`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ package tools.nsc.settings`
`11`	`11`	`* Represents a single Scala version in a manner that`
`12`	`12`	`* supports easy comparison and sorting.`
`13`	`13`	`*/`
`14`		`-abstract class ScalaVersion extends Ordered[ScalaVersion] {`
	`14`	`+sealed abstract class ScalaVersion extends Ordered[ScalaVersion] {`
`15`	`15`	`def unparse: String`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ trait ContextErrors {`
`21`	`21`	`import global._`
`22`	`22`	`import definitions._`
`23`	`23`
`24`		`- abstract class AbsTypeError extends Throwable {`
	`24`	`+ sealed abstract class AbsTypeError extends Throwable {`
`25`	`25`	`def errPos: Position`
`26`	`26`	`def errMsg: String`
`27`	`27`	`override def toString() = "[Type error at:" + errPos + "] " + errMsg`
`28`	`28`	`}`
`29`	`29`
`30`		`- abstract class TreeTypeError extends AbsTypeError {`
	`30`	`+ sealed abstract class TreeTypeError extends AbsTypeError {`
`31`	`31`	`def underlyingTree: Tree`
`32`	`32`	`def errPos = underlyingTree.pos`
`33`	`33`	`}`