Simplify decision whether to derive accessors

Originally (modulo renaming & reduction of double negation in previous commit):

```
def deriveAccessors(vd: ValDef) = vd.mods.isLazy || !(
     !owner.isClass
  || (vd.mods.isPrivateLocal && !vd.mods.isCaseAccessor) // this is an error -- now checking first
  || (vd.name startsWith nme.OUTER)
  || (context.unit.isJava) // pulled out to caller
  || isEnumConstant(vd)
)

def deriveAccessorTrees(vd: ValDef) = !(
     (vd.mods.isPrivateLocal && !vd.mods.isLazy) // lazy was pulled out to outer disjunction
  || vd.symbol.isModuleVar // pulled out to caller
  || isEnumConstant(vd))
```

With changes in comments above, these conditions are now captured by one method.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index b0bd9977a8..1b2e7f628e 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -1105,7 +1105,7 @@ trait ContextErrors {
       def GetterDefinedTwiceError(getter: Symbol) =
         issueSymbolTypeError(getter, getter+" is defined twice")
 
-      def ValOrValWithSetterSuffixError(tree: Tree) =
+      def ValOrVarWithSetterSuffixError(tree: Tree) =
         issueNormalTypeError(tree, "Names of vals or vars may not end in `_='")
 
       def PrivateThisCaseClassParameterError(tree: Tree) =