scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master	Jason Zaugg	2013-05-17	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	================================================================ Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala ================================================================ Merge -s ours 4e64a27 ([nomaster commit range]) ================================================================ Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/Macros.scala
* \|	Refactor DirectTest so java can be tested.	Paul Phillips	2013-04-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	There was no way to make a java compilation unit. Now there is.
* \|	[nomaster] Revert "introduces global.pendingSuperCall"	Eugene Burmako	2013-02-05	1	-2/+2
\|/ \| \| \| \| \| \| \|	This reverts commit 0ebf72b9498108e67c2133c6522c436af50a18e8. Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/internal/Trees.scala
*	introduces global.pendingSuperCall	Eugene Burmako	2012-12-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Similarly to global.emptyValDef, which is a dummy that stands for an empty self-type, this commit introduces global.pendingSuperCall, which stands for a yet-to-be-filled-in call to a superclass constructor. pendingSuperCall is emitted by Parsers.template, treated specially by Typers.typedParentType and replaced with a real superclass ctor call by Typers.typedTemplate. To avoid copy/paste, this commit also factors out and unifies dumminess of EmptyTree, emptyValDef and pendingSuperCall - they all don't have a position and actively refuse to gain one, same story for tpe.
*	Fixed SI-5603. Early definitions now get transparent positions.	Hubert Plociniczak	2012-07-30	1	-0/+29
	This includes a fix for a minor problem described in #594 - ensureNonOverlapping still focuses on default position when outside of early defs. Review by @dragos, @odersky.