Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
*-----. | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 3 | -0/+103 |
|\ \ \ \ | |||||
| | | | * | SI-7214 outer check based on dealiased pattern type. | Jason Zaugg | 2013-03-05 | 1 | -0/+57 |
| | * | | | SI-7185 Avoid NPE in TreeInfo.isExprSafeToInline | Jason Zaugg | 2013-03-02 | 2 | -0/+46 |
| * | | | | Merge pull request #2184 from adriaanm/revert-pr-2083 | Adriaan Moors | 2013-03-01 | 8 | -2071/+0 |
| |\ \ \ \ | |||||
| | * | | | | Revert SI-6240 synchronization for runtime reflection | Adriaan Moors | 2013-03-01 | 8 | -2071/+0 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #2179 from adriaanm/merge-2.10.1 | Adriaan Moors | 2013-03-01 | 5 | -40/+78 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #2083 from scalamacros/ticket/6240 | Adriaan Moors | 2013-02-27 | 8 | -0/+2071 |
| |\ \ \ \ | |||||
| | * | | | | runtime reflection: death from thousand threads | Eugene Burmako | 2013-02-11 | 4 | -0/+2051 |
| | * | | | | SI-7045 reflection now auto-initializes selfType | Eugene Burmako | 2013-02-11 | 2 | -0/+14 |
| | * | | | | removes the crazy extraneous log | Eugene Burmako | 2013-02-11 | 2 | -0/+6 |
* | | | | | | Merge pull request #2197 from paulp/pr/integrate-range-positions | James Iry | 2013-03-05 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Disentangled RangePositions from interactive. | Paul Phillips | 2013-03-04 | 1 | -1/+2 |
* | | | | | | | SI-7132 - don't discard Unit type in interpreter | Dan Rosen | 2013-03-02 | 2 | -10/+15 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2180 from adriaanm/merge-2.10.1-master | Adriaan Moors | 2013-03-01 | 5 | -0/+39 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 2.10.1 into master | Adriaan Moors | 2013-02-27 | 5 | -0/+39 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge 2.10.1 into 2.10.x. | Adriaan Moors | 2013-02-27 | 5 | -40/+78 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | | * | | | fixes the test for SI-7112 | Eugene Burmako | 2013-02-23 | 1 | -1/+1 |
| | | * | | | Merge pull request #2152 from retronym/topic/annotatedRetyping-2.10.1 | Adriaan Moors | 2013-02-21 | 2 | -0/+68 |
| | | |\ \ \ | |||||
| | | | * | | | Fix typing idempotency bug with Annotated trees | Lukas Rytz | 2013-02-21 | 2 | -0/+68 |
| | | * | | | | SI-7128 Fix regression in copyToArray for empty arrays | Jason Zaugg | 2013-02-14 | 1 | -0/+3 |
| | | |/ / / | |||||
| | | * / / | [nomaster] Revert "SI-6548 reflection now correctly enters jinners" | Adriaan Moors | 2013-02-10 | 4 | -40/+75 |
| | | |/ / | |||||
| | * | | | Merge pull request #2134 from scalamacros/topic/resetattrs-this | Paul Phillips | 2013-02-27 | 2 | -0/+12 |
| | |\ \ \ | |||||
| | | * | | | resetAttrs now always erases This.tpe | Eugene Burmako | 2013-02-17 | 2 | -0/+12 |
| | * | | | | Merge pull request #2149 from khernyo/issue/7074 | Grzegorz Kossakowski | 2013-02-25 | 2 | -0/+24 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-7074 Fix xml attribute sorting | Szabolcs Berecz | 2013-02-24 | 2 | -0/+24 |
| | * | | | | | Merge pull request #2159 from scalamacros/topic/7112-followup-210x | James Iry | 2013-02-24 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | fixes the test for SI-7112 | Eugene Burmako | 2013-02-23 | 1 | -1/+1 |
| | | |/ / / | |||||
* | | | | | | Merge pull request #2177 from JamesIry/master_SI-7159 | Grzegorz Kossakowski | 2013-02-28 | 2 | -0/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | SI-7159 Prepare to remove erroneous INT <:< LONG in TypeKinds | James Iry | 2013-02-26 | 2 | -0/+9 |
* | | | | | | Merge pull request #2169 from JamesIry/master_SI-7181 | Grzegorz Kossakowski | 2013-02-26 | 3 | -75/+176 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | SI-7181 Eliminate unnecessary duplication of finally blocks | James Iry | 2013-02-26 | 1 | -75/+75 |
| * | | | | | SI-7181 Prepare to remove duplicated finally blocks | James Iry | 2013-02-25 | 2 | -0/+101 |
* | | | | | | SI-7006 Recognize more jump only blocks | James Iry | 2013-02-25 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2161 from scalamacros/topic/7112-followup-master | James Iry | 2013-02-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fixes the test for SI-7112 | Eugene Burmako | 2013-02-23 | 1 | -1/+1 |
* | | | | | | Merge pull request #2125 from retronym/ticket/7120 | Paul Phillips | 2013-02-23 | 6 | -0/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7120 Erasure must honor typeref prefixes | Jason Zaugg | 2013-02-14 | 6 | -0/+52 |
* | | | | | | | Merge remote-tracking branch 'origin/2.10.x' into master | Paul Phillips | 2013-02-23 | 1 | -0/+22 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | SI-7171 Consider prefix when assessing type finality. | Jason Zaugg | 2013-02-22 | 1 | -0/+22 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #2147 from JamesIry/master_SI-7015 | Grzegorz Kossakowski | 2013-02-22 | 2 | -0/+60 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | SI-7015 Cleanup from review of null duplication | James Iry | 2013-02-22 | 1 | -1/+1 |
| * | | | | | SI-7015 Removes redundant aconst_null; pop; aconst_null creation | James Iry | 2013-02-21 | 2 | -0/+60 |
* | | | | | | Merge pull request #2151 from adriaanm/merge-2.10.x | Paul Phillips | 2013-02-22 | 2 | -0/+68 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 2.10.x into master. | Adriaan Moors | 2013-02-20 | 2 | -0/+68 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | / / | Fix typing idempotency bug with Annotated trees | Lukas Rytz | 2013-02-12 | 2 | -0/+68 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge pull request #2141 from paulp/pr/overriding-methods | Paul Phillips | 2013-02-22 | 2 | -0/+12 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix and optimization in overriding logic. | Paul Phillips | 2013-02-19 | 2 | -0/+12 |
| | |/ / | |/| | | |||||
* | | | | SI-6642 Refactor mutable.TreeSet to use RedBlackTree instead of AVL | James Iry | 2013-02-13 | 1 | -0/+145 |
* | | | | SI-6642 Adds iteratorFrom, keysIteratorFrom, and valuesIteratorFrom | James Iry | 2013-02-13 | 1 | -0/+69 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-master | Adriaan Moors | 2013-02-12 | 2 | -0/+26 |
|\| | |