summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2274 from vigdorchik/ticket/si-5699James Iry2013-03-221-7/+1
|\
| * SI-5699 correct java parser for annotation defs.Eugene Vigdorchik2013-03-191-7/+1
* | Merge pull request #2268 from scalamacros/topic/shannon-entropyPaul Phillips2013-03-221-43/+22
|\ \
| * | removes duplication in FreeDef extractorsEugene Burmako2013-03-161-43/+22
| |/
* | Merge pull request #2245 from retronym/ticket/7242Paul Phillips2013-03-221-5/+33
|\ \
| * | SI-7242 Fix crash when inner object mixes in its companionJason Zaugg2013-03-131-5/+33
* | | Merge pull request #2276 from scalamacros/topic/macro-traceJames Iry2013-03-201-1/+1
|\ \ \
| * | | an amazing discovery made by IulianEugene Burmako2013-03-181-1/+1
| | |/ | |/|
* | | Merge pull request #2283 from scalamacros/topic/silence-the-logJames Iry2013-03-201-1/+1
|\ \ \
| * | | fixes the craziness in JavaUniverse.logEugene Burmako2013-03-201-1/+1
* | | | Merge pull request #2269 from retronym/ticket/7259James Iry2013-03-201-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-161-1/+3
| |/ /
* | | Merge pull request #2255 from retronym/ticket/7249Adriaan Moors2013-03-171-1/+5
|\ \ \
| * | | SI-7249 Reign in overzealous Function0 optimization.Jason Zaugg2013-03-131-1/+5
| |/ /
* | | Merge pull request #2253 from retronym/ticket/7239Adriaan Moors2013-03-172-4/+3
|\ \ \
| * | | SI-6921 SI-7239 Tread lightly during exploratory typingJason Zaugg2013-03-132-4/+3
| |/ /
* | | Merge pull request #2247 from retronym/ticket/7232-2Adriaan Moors2013-03-172-2/+26
|\ \ \ | |/ / |/| |
| * | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-132-2/+26
* | | Merge pull request #2234 from scalamacros/ticket/7240Paul Phillips2013-03-122-2/+2
|\ \ \
| * | | SI-7240 fixes language feature lookupEugene Burmako2013-03-122-2/+2
* | | | Merge pull request #2230 from retronym/ticket/7233Paul Phillips2013-03-122-1/+2
|\ \ \ \
| * | | | SI-7233 Account for aliased imports in ErasureJason Zaugg2013-03-101-1/+1
| * | | | SI-7233 Account for aliased imports in eta expansion.Jason Zaugg2013-03-101-0/+1
* | | | | Merge pull request #2222 from scalamacros/ticket/6725Paul Phillips2013-03-121-1/+2
|\ \ \ \ \
| * | | | | SI-6725 `f` interpolator now supports %n tokensEugene Burmako2013-03-091-1/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #2227 from mergeconflict/2.10.x-SI-7132Paul Phillips2013-03-121-5/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | SI-7132 - don't discard Unit type in interpreterDan Rosen2013-03-091-5/+7
* | | | | Merge pull request #2224 from retronym/ticket/7238Adriaan Moors2013-03-111-3/+3
|\ \ \ \ \
| * | | | | SI-7328 Bail out of names/defaults if args are error typedJason Zaugg2013-03-091-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2225 from retronym/ticket/7234Adriaan Moors2013-03-111-7/+10
|\ \ \ \ \
| * | | | | SI-7234 Make named args play nice with dep. method typesJason Zaugg2013-03-091-7/+10
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2223 from scalamacros/ticket/7235Adriaan Moors2013-03-112-0/+6
|\ \ \ \ \
| * | | | | reifier is now aware of SI-7235Eugene Burmako2013-03-092-0/+6
| | |_|_|/ | |/| | |
* | | | | SI-7226 Fix inference regression caused by TypeVar equality.Jason Zaugg2013-03-091-0/+6
| |_|/ / |/| | |
* | | | Fix SI-7224.Iulian Dragos2013-03-071-1/+1
| |/ / |/| |
* | | Merge pull request #2199 from retronym/ticket/7214Adriaan Moors2013-03-051-1/+3
|\ \ \
| * | | SI-7214 outer check based on dealiased pattern type.Jason Zaugg2013-03-051-1/+3
* | | | Merge pull request #2156 from vigdorchik/hierarchyAdriaan Moors2013-03-055-61/+65
|\ \ \ \
| * | | | SI-7109 SI-7153 Generalize the API to get docComments: allow to force docTreesEugene Vigdorchik2013-02-245-61/+65
* | | | | Merge pull request #2193 from adriaanm/patmat-refactorAdriaan Moors2013-03-0510-307/+353
|\ \ \ \ \
| * \ \ \ \ Merge 2.10.1 into 2.10.xAdriaan Moors2013-03-032-7/+21
| |\ \ \ \ \
| | * | | | | [nomaster] SI-7195 minor version mustn't introduce warningsAdriaan Moors2013-03-011-1/+3
| | * | | | | Merge pull request #2168 from retronym/ticket/7183Adriaan Moors2013-03-011-14/+28
| | |\ \ \ \ \
| | | * | | | | SI-7183 Disable unreachability for withFilter matches.Jason Zaugg2013-02-251-14/+28
| | * | | | | | Merge pull request #2167 from retronym/ticket/7126Adriaan Moors2013-03-012-6/+18
| | |\ \ \ \ \ \
| | | * | | | | | SI-7126 Eliminate a source of malformed types.Jason Zaugg2013-02-261-4/+11
| | | * | | | | | SI-7126 Account for the alias types that don't dealias.Jason Zaugg2013-02-251-2/+7
| | | |/ / / / /
| * | | | | | | [port] SI-7183 Disable unreachability for withFilter matches.Adriaan Moors2013-03-033-16/+29
| * | | | | | | better names for components of MatchTranslatorAdriaan Moors2013-03-033-34/+33
| * | | | | | | move sat solving to separate fileAdriaan Moors2013-03-033-233/+243