summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'jsuereth/sbt-build' into sbt-build-0.11.3Josh Suereth2012-05-107-109/+303
|\
| * Added an incredibly hacky way for us to override the default sbt compiler ↵Josh Suereth2012-04-032-1/+149
| | | | | | | | interface.
| * Fixed up versioning scheme.Josh Suereth2012-04-035-114/+51
| | | | | | | | SBT build should now mimic ant build for versions.
| * Fixed build for 0.11.x again. Working on bringing version properties file ↵Josh Suereth2012-04-034-3/+112
| | | | | | | | up to par.
* | Fixed plugin dependencies.Josh Suereth2012-05-101-1/+1
| |
* | Fix for ## inconsistency.Paul Phillips2012-05-082-4/+12
| | | | | | | | Hopefully without slowing things down overmuch. Closes SI-5640.
* | Merge commit 'refs/pull/515/head'; commit 'refs/pull/516/head' into developPaul Phillips2012-05-083-1/+21
|\ \
| * | fix SI-1247: don't create a thunk for a by-name argument if the argument ↵Johannes Rudolph2012-05-083-1/+21
| | | | | | | | | | | | expression is a Function0 application
* | | Added tests for SI-4190.Josh Suereth2012-05-082-0/+9
|/ /
| |
| \
*-. \ Merge commit 'refs/pull/512/head'; commit 'refs/pull/513/head' into developPaul Phillips2012-05-0814-47/+86
|\ \ \
| | * | Fixes SI-5564.Aleksandar Prokopec2012-05-083-8/+27
| | | | | | | | | | | | | | | | Catching typer errors in specialization.
| | * | Add test-case for SI-5564.Aleksandar Prokopec2012-05-081-0/+9
| | | |
| * | | Fixed positions in named default applications (no hyperlinking in ↵Iulian Dragos2012-05-089-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | conjunction with implicit arguments). Removed even more code in the presentation compiler testing infrastructure. One less level of indirection, and a top-level object gone!
| * | | Making the locator more robust in the face of weird originals. And changed ↵Martin Odersky2012-05-082-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | positions in AnnotationInfo to avoid position-less trees there. Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | |
| \ \
*-. \ \ Merge commit 'refs/pull/510/head'; commit 'refs/pull/511/head'Paul Phillips2012-05-084-62/+85
|\ \ \ \
| | * | | Test case for SI-5378phaller2012-05-081-0/+19
| | |/ /
| * | | Appendix. Typo that wasn't covered by the test suite.Hubert Plociniczak2012-05-083-62/+66
| | | |
| | | |
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
*-----. \ \ \ 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
| | | | | | |/ / / | | | | | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 12:01:08 +0000