summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2327 from paulp/pr/2315-rebasedPaul Phillips2013-04-0262-182/+182
|\
| * SI-7261 Implicit conversion of BooleanSetting to Boolean and BooleanFlagSom Snytt2013-03-2762-182/+182
* | Merge pull request #2310 from retronym/ticket/6168Paul Phillips2013-04-021-1/+7
|\ \
| * | SI-6168 Retain prefix when parsing types in JVM signaturesJason Zaugg2013-03-251-1/+7
* | | Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11...Jason Zaugg2013-04-0215-92/+144
|\ \ \
| * \ \ Merge pull request #2321 from kzys/js-deferAdriaan Moors2013-04-012-16/+30
| |\ \ \
| | * | | Scaladoc: Load scripts at the bottom, and with a defer attributeKato Kazuyoshi2013-03-272-16/+30
| * | | | Merge pull request #2292 from retronym/ticket/7285Adriaan Moors2013-03-271-1/+2
| |\ \ \ \
| | * | | | SI-7285 Fix match analysis with nested objects.Jason Zaugg2013-03-231-1/+2
| * | | | | Merge pull request #2291 from retronym/ticket/7290Adriaan Moors2013-03-271-5/+15
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | SI-7290 Minor cleanups driven by review comments.Jason Zaugg2013-03-271-4/+4
| | * | | | SI-7290 Discard duplicates in switchable alternative patterns.Jason Zaugg2013-03-231-3/+13
| | |/ / /
| * | | | Merge pull request #2270 from retronym/ticket/7246-2Paul Phillips2013-03-251-14/+12
| |\ \ \ \
| | * | | | SI-7246 Make $outer pointer elision Java awareJason Zaugg2013-03-231-14/+12
| * | | | | Merge pull request #2306 from retronym/ticket/7299Paul Phillips2013-03-251-2/+8
| |\ \ \ \ \
| | * | | | | SI-7299 Improve error message for eta-expanding 23+ param methodJason Zaugg2013-03-251-2/+8
| * | | | | | Merge pull request #2257 from JamesIry/2.10.x_classfile_51Paul Phillips2013-03-255-2/+35
| |\ \ \ \ \ \
| | * | | | | | Log when invokedynamic instruction is encounteredJames Iry2013-03-251-0/+1
| | * | | | | | Read version 51 (JDK 7) class files.James Iry2013-03-145-2/+34
| | | |/ / / / | | |/| | | |
| * | | | | | SI-6580 Scaladoc: Should not close void elementsKato Kazuyoshi2013-03-251-7/+11
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #2279 from kzys/jira-7013Paul Phillips2013-03-231-3/+3
| |\ \ \ \ \
| | * | | | | SI-7013 Scaladoc: Fix StackOverflowErrorKato Kazuyoshi2013-03-201-3/+3
| * | | | | | Merge pull request #2266 from paulp/issue/7251Paul Phillips2013-03-231-127/+114
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2264 from Blaisorblade/issue/7253Paul Phillips2013-03-222-18/+18
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | SI-7253: update comments and namingPaolo G. Giarrusso2013-03-162-14/+14
| | * | | | | | Remove fragile code, made redundant by previous commitPaolo G. Giarrusso2013-03-162-4/+2
| | * | | | | | SI-7253: respect binary compatibility constraintsPaolo G. Giarrusso2013-03-162-2/+4
| | | |_|/ / / | | |/| | | |
| * | | | | | 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 #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 #2317 from retronym/ticket/7232-masterAdriaan Moors2013-04-012-2/+26
|\ \ \ \ \ \ \
| * | | | | | | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-262-2/+26
* | | | | | | | Merge pull request #2318 from retronym/ticket/7259-masterAdriaan Moors2013-04-011-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-261-2/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #2305 from retronym/ticket/7296-2Adriaan Moors2013-03-294-61/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7296 Remove arity limit for case classesJason Zaugg2013-03-254-60/+67
| * | | | | | | | SI-7296 Avoid crash with nested 23-param case classJason Zaugg2013-03-251-1/+3
| | |_|_|_|_|/ / | |/| | | | | |