scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'scala/master' into merge-2.10.x	Grzegorz Kossakowski	2013-07-29	1	-2/+2
\|\
* \	Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x	Grzegorz Kossakowski	2013-07-29	1	-5/+11
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: bincompat-backward.whitelist.conf bincompat-forward.whitelist.conf src/compiler/scala/reflect/reify/phases/Reshape.scala src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala src/compiler/scala/tools/nsc/transform/Mixin.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/library/scala/concurrent/impl/Promise.scala src/reflect/scala/reflect/internal/StdAttachments.scala test/files/neg/macro-override-macro-overrides-abstract-method-b.check test/files/run/t7569.check
\| *	SI-7657 clarifies the "macro overrides method" rule	Eugene Burmako	2013-07-14	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we allow macros to override non-abstract methods (in order to provide performance enhancements such as foreach for collections), and we also disallow macros to override abstract methods (otherwise downcasting might lead to AbstractMethodErrors). This patch fixes an oversight in the disallowing rule that prohibited macros from overriding a concrete method if that concrete method itself overrides an abstract method. RefCheck entertains all overriding pairs, not only the immediate ones, so the disallowing rule was triggered. Now macros can override abstract methods if and only if either the base type or the self type contain a matching non-abstract method.
* \|	makes macro override error more consistent	Eugene Burmako	2013-01-09	1	-1/+1
\|/
*	Normalized line endings.	Paul Phillips	2012-09-20	1	-5/+5
\| \| \| \| \| \|	This brings all the files into line with the .gitattributes settings, which should henceforth be automatically maintained by git.
*	Next generation of macros	Eugene Burmako	2012-04-12	1	-0/+5
	Implements SIP 16: Self-cleaning macros: http://bit.ly/wjjXTZ Features: * Macro defs * Reification * Type tags * Manifests aliased to type tags * Extended reflection API * Several hundred tests * 1111 changed files Not yet implemented: * Reification of refined types * Expr.value splicing * Named and default macro expansions * Intricacies of interaction between macros and implicits * Emission of debug information for macros (compliant with JSR-45) Dedicated to Yuri Alekseyevich Gagarin