summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | |
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
*-----. \ \ \ Merge commit 'refs/pull/504/head'; commit 'refs/pull/505/head'; commit ↵Paul Phillips2012-05-08512-3748/+43595
|\ \ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | 'refs/pull/506/head'; commit 'refs/pull/507/head'; commit 'refs/pull/508/head' into develop
| | | | * | | GenASM activated via -target:jvm-1.6 or -target:jvm-1.5-asmMiguel Garcia2012-05-088-8/+3349
| | | | | | |
| | | | * | | glue ASM <-> GenASM, the only part of scala.tools.asm to maintain manuallyMiguel Garcia2012-05-082-0/+67
| | | | | | |
| | | | * | | subset of the ASM framework, re-namespaced as scala.tools.asmMiguel Garcia2012-05-0875-0/+27954
| | | | | | |
| | | | * | | compile Java files under src/compilerMiguel Garcia2012-05-081-0/+42
| | | | | | |
| | | | * | | make strap build use exact same compiler options as quick buildMiguel Garcia2012-05-081-11/+14
| | | | | | |
| | | | * | | documentation about BasicBlock and InlinerMiguel Garcia2012-05-082-16/+19
| | | | | | |
| | | | * | | BytecodeWriters can do without the FJBG dependencyMiguel Garcia2012-05-082-23/+30
| | | | | | |
| | | | * | | overriding rather than pattern matching in icode.OpcodesMiguel Garcia2012-05-081-29/+30
| | | | |/ /
| | | * | | Changes scala.math.signum to return negative zeros.Dominik Gruntz2012-05-082-14/+9
| | | | | |
| | * | | | Part IV of the Lazy Vals Saga: Optimized local vals. That's all folks.Hubert Plociniczak2012-05-083-45/+75
| | | | | |
| | * | | | Part III of the Lazy Vals Saga: Inliner strikes back. Or at least let's hope ↵Hubert Plociniczak2012-05-075-33/+77
| | | | | | | | | | | | | | | | | | | | | | | | it will.
| | * | | | Part II of the Lazy Vals Saga: Saving bitmap by the Three Musketeers: Byte, ↵Hubert Plociniczak2012-05-047-40/+84
| | | | | | | | | | | | | | | | | | | | | | | | Int and Long. And Boolean (hey, he also deserves some credit!).
| | * | | | Part I of the Lazy Vals Saga: Bitmaps are no longer inherited.Hubert Plociniczak2012-05-035-86/+7
| | | | | |
| * | | | | Add test for t5564 in pending/posphaller2012-05-081-0/+5
| | |_|/ / | |/| | |
| * | | | A little sketchiness in recent commit.Paul Phillips2012-05-081-1/+1
| | |/ / | |/| | | | | | | | | | Retro-reviewing.
| * | | Fix for aliasing bug in reifier.Paul Phillips2012-05-082-9/+18
| | | | | | | | | | | | | | | | Closes SI-5769.
| * | | Test case closes SI-3798.Paul Phillips2012-05-072-0/+11
| | | |
| | | |
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-----------------. \ \ Merge remote-tracking branches 'scalamacros/ticket/5722', ↵Paul Phillips2012-05-0716-0/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'scalamacros/ticket/5726', 'scalamacros/ticket/5610', 'scalamacros/ticket/5654', 'scalamacros/ticket/5521', 'scalamacros/ticket/5585', 'scalamacros/ticket/5503', 'scalamacros/ticket/4728', 'scalamacros/ticket/5534' and 'scalamacros/ticket/4560'
| | | | | | | | | | | * | | test for SI-4560Eugene Burmako2012-05-081-0/+9
| | | | | | | | | | | | | |
| | | | | | | | | | * | | | test for SI-5534Eugene Burmako2012-05-081-0/+11
| | | | | | | | | | |/ / /
| | | | | | | | | * / / / test for SI-4728Eugene Burmako2012-05-082-0/+13
| | | | | | | | | |/ / /
| | | | | | | | * / / / test for SI-5503Eugene Burmako2012-05-082-0/+19
| | | | | | | | |/ / /
| | | | | | | * / / / test for SI-5585Eugene Burmako2012-05-081-0/+18
| | | | | | | |/ / /
| | | | | | * / / / test for SI-5521Eugene Burmako2012-05-081-0/+3
| | | | | | |/ / /
| | | | | * / / / test for SI-5654Eugene Burmako2012-05-081-0/+4
| | | | | |/ / /
| | | | * / / / test for SI-5610Eugene Burmako2012-05-084-0/+42
| | | | |/ / /
| | | * / / / tests for SI-5726Eugene Burmako2012-05-072-0/+33
| | | |/ / /
| | * / / / test for SI-5722Eugene Burmako2012-05-071-0/+6
| | |/ / /
| * | | | Merge commit 'refs/pull/491/head' into developPaul Phillips2012-05-075-13/+108
| |\ \ \ \
| | * | | | Fixes SI-5629.Aleksandar Prokopec2012-05-075-13/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an additional argument to the unify method in specialization - `tparams`. When this parameter is set to `true`, unification is done over type parameters in poly types as well. Additionally, the unification in specialization now works over type bounds. This ensures that in the below example: trait Foo[@specialized(Int) A] { def bar[B <: A](b: B) {} } class IntFoo extends Foo[Int] { override def bar[B <: Int](b: B) {} } the method `bar` gets correctly determined as a method that needs a special override for its `bar$mcI$sp`.
| | | | | |
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-----. \ \ \ \ Merge commit 'refs/pull/486/head'; commit 'refs/pull/487/head'; commit ↵Paul Phillips2012-05-0712-38/+109
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'refs/pull/488/head'; commit 'refs/pull/489/head'; commit 'refs/pull/490/head' into develop
| | | | | * | | | | minor tag-related fixesEugene Burmako2012-05-079-35/+35
| | | | | | |/ / / | | | | | |/| | |
| | | | * | | | | Fixes SI-5199 through improved API docsHeather Miller2012-05-071-3/+29
| | | | | | | | |
| | | * | | | | | Add test for t5579 in pending/posphaller2012-05-071-0/+29
| | | | |_|/ / / | | | |/| | | |
| | * / | | | | Test case for SI-2066Heather Miller2012-05-071-0/+16
| | |/ / / / /
| * / / / / / Add test files for t5639 in pending/posphaller2012-05-072-0/+14
| |/ / / / /
| | | | | |
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *---------. \ \ \ \ Merge commit 'refs/pull/479/head'; commit 'refs/pull/480/head'; commit ↵Paul Phillips2012-05-0615-10/+248
| |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / | | | | | |/| | | | | | | | | | | | | | | | 'refs/pull/481/head'; commit 'refs/pull/482/head'; commit 'refs/pull/483/head'; commit 'refs/pull/484/head'; commit 'refs/pull/485/head' into develop
| | | | | | | * | | | Add test for t5695 in pending/runphaller2012-05-073-0/+22
| | | | | | | |/ / /
| | | | | | * / / / Add test for t5708 in pending/presentationphaller2012-05-063-0/+97
| | | | | | |/ / /
| | | | | * / / / Test case for SI-1557Heather Miller2012-05-061-0/+18
| | | | | |/ / /
| | | | * | | | Add missing methods to GenTraversableLike.Aleksandar2012-05-065-10/+80
| | | | | | | |
| | | * | | | | Add test file in pending/posphaller2012-05-061-0/+14
| | | | |/ / / | | | |/| | |
| | * / | | | Test case closes SI-4568.Jason Zaugg2012-05-062-0/+17
| | |/ / / / | | | | | | | | | | | | | | | | | | What's the opposite of regression? Progression!
| * / / / / Test that primitive arrays aren't accepted as a Java generic array.Jason Zaugg2012-05-066-0/+52
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They exercise both joint and separate compilation. This resolves SI-750 (which was somewhat unfairly merged with another ticket). The error message itself could do with refinement: in particular instance of the much beloved: found X, required X.
| | | | |
| | \ \ \
| *-. \ \ \ Merge commit 'refs/pull/477/head'; commit 'refs/pull/478/head' into developPaul Phillips2012-05-056-8/+74
| |\ \ \ \ \
| | | * | | | Don't admit primitive arrays as a generic Java varargs param.Jason Zaugg2012-05-055-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were sneaking through as polymorphic Arrays and avoiding boxing. Closes SI-4216
| | * | | | | Test case closes SI-1785.Jason Zaugg2012-05-051-0/+7
| | |/ / / /
| * | | | | Merge commit 'refs/pull/124/head' into developPaul Phillips2012-05-053-9/+53
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: src/library/scala/util/parsing/combinator/Parsers.scala
| | * | | | Fixes SI-4929, with a test to verify.Stephen Judkins2012-01-213-14/+58
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes potential issue with Parsers.phrase not being reentrant; however, I was unable to actually reproduce this issue in practice. (The order in which lastNoSuccess was being set and compared seemed to guarantee that it would never actually be a problem).