Browse files

re-align 2.10.x's pattern matcher with master's

The diff was mostly code cleanup, so most of that was propagated from master to 2.10.x.
The remaining diff is encapsulated in compatibility stubs (see below).
(There was also the on/off potential for the 2.10.x "new" pattern matcher.
 The old one is gone in 2.11, so no turning off new patmat, of course.)

The stubs:

protected final def dealiasWiden(tp: Type)   = tp.dealias                       // 2.11: dealiasWiden
protected final def mkTRUE                   = CODE.TRUE_typed                  // 2.11: CODE.TRUE
protected final def mkFALSE                  = CODE.FALSE_typed                 // 2.11: CODE.FALSE
protected final def hasStableSymbol(p: Tree) = p.hasSymbol && p.symbol.isStable // 2.11: p.hasSymbolField && p.symbol.isStable
protected final def devWarning(str: String)  = global.debugwarn(str)            // 2.11: omit
  • Loading branch information...
adriaanm committed Feb 12, 2013
1 parent f51ed74 commit f5ed914fe5ae18a884cd2ab8b2cdede7cf11da94
Showing with 37 additions and 93 deletions.
  1. +37 −93 src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
Oops, something went wrong.

0 comments on commit f5ed914

Please sign in to comment.