diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-10 10:19:24 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-10 10:19:54 -0800 |
| commit | 7dfbf07a89b6daac0dddf004fff512e8c9e325b4 (patch) | |
| tree | 03bd4ea1c8cefd3bc8e1bb1ac0e12bdd582aacf5 /src/compiler/scala/tools/nsc/transform/LambdaLift.scala | |
| parent | 2a4882129a8bb4ef70fe0d45d881649e1071f55f (diff) | |
| parent | b43ae58f312e4769de5a6942b4cb820cd609f31b (diff) | |
| parent | b579a42ee3c079e9acf53b74085ae01ac6c35f0f (diff) | |
| parent | 81fa8316092e295c1a893b6fcf65568c11fffb58 (diff) | |
| download | scala-7dfbf07a89b6daac0dddf004fff512e8c9e325b4.tar.gz scala-7dfbf07a89b6daac0dddf004fff512e8c9e325b4.tar.bz2 scala-7dfbf07a89b6daac0dddf004fff512e8c9e325b4.zip | |
Merge commit 'b43ae58f31'; commit 'b579a42ee3'; commit '81fa831609' into merge-210
* commit 'b43ae58f31':
introduces an exhaustive java-to-scala test
SI-6989 privateWithin is now populated in reflect
* commit 'b579a42ee3':
SI-6888 Loosen criteria for $outer search.
* commit '81fa831609':
Class symbols can't be contravariant.
SI-6666 Catch VerifyErrors in the making in early defs.
Broader checks for poisonous this references.
Add a test case from the comments of SI-6666.
SI-6666 Account for nesting in setting INCONSTRUCTOR
Move a test from pos to run to highlight bytecode deficiencies.
Conflicts:
src/compiler/scala/tools/nsc/interpreter/IMain.scala