summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* | | What did you bring me Santa?Paul Phillips2012-05-051-1/+2
| | | | | | | | | | | | Oh boy, a checkfile! This is the best christmas ever!
* | | Working around the VerifyErrors.Paul Phillips2012-05-042-2/+6
| | | | | | | | | | | | Since the optimizer seems to have lost its mind.
* | | A couple checkfile updates which snuck by.Paul Phillips2012-05-042-2/+4
| | |
* | | Removed some tests for a "not a bug".Paul Phillips2012-05-042-46/+0
| | |
* | | Put corresponds on Iterator.Paul Phillips2012-05-041-0/+18
| | | | | | | | | | | | | | | | | | | | | I guess we can look forward to more and more duplication in the collections. I had to cut and paste the doc comment too, or at least I have no idea how to avoid that given the file I took it from was in parallel somewhere.
* | | Have ArrayCharSequence reuse its Array.Paul Phillips2012-05-043-5/+295
| | | | | | | | | | | | Your know, for performance. Closes SI-5641.
* | | Updated Symbol to record classfile origin.Paul Phillips2012-05-0424-50/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change should be transparent to anything using sourceFile, unless it was drinking from the inheritance well too deeply. Rather than squander the already allocated field for every ClassSymbol not being compiled from source, I'm now populating it with the file representing the class. This will make a broad range of things easier, like debugging, issuing useful error messages, symbol invalidation, signature verification, you name it. def sourceFile - still returns only source code files def binaryFile - returns only class files def associatedFile - returns whatever is there, if anything Performance: I may be mistaken, but I believe this is a zero-impact change. No new fields are allocated; fields which were null now hold a useful reference. The reference is to a file instance which was already being allocated and already long-lived. Compare error messages: // Version 1 % scalac a.scala error: type _$1 is defined twice // Version 2 % scalac a.scala error: type _$1 is defined twice conflicting symbols both originated in file './foo/package.class' Note: this may be due to a bug in the compiler involving wildcards in package objects one error found Bonus for people who read commit logs. Try this in the repl after starting power mode. ListClass.info.members groupBy (_.associatedFile) foreach { case (k, vs) => println("%s\n %s\n".format(k, vs map (_.defString) mkString "\n ")) }
* | | Reluctant surgery on partest.Paul Phillips2012-05-042-112/+57
| | | | | | | | | | | | | | | | | | | | | Now neg tests are treated like all the other tests in terms of grouping, so if you have a negative test which requires more than one pass (like the one enclosed with the next commit) you can actually test it.
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
*-------. \ \ Merge commit 'refs/pull/471/head'; commit 'refs/pull/473/head'; commit ↵Paul Phillips2012-05-0416-23/+150
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'refs/pull/474/head'; commit 'refs/pull/475/head'; commit 'refs/pull/476/head' into develop
| | | | | * | | Fixes SI-5514.Aleksandar Prokopec2012-05-043-13/+34
| | | | | | |/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The acceptIf and acceptMatch parsers now check for end of input. Review by moors.
| | | | * / | Fixes si-5656.Aleksandar Prokopec2012-05-043-5/+25
| | | | |/ /
| | | * / / Fix for si-5577.Aleksandar Prokopec2012-05-043-0/+40
| | | |/ /
| | * / / Fix for si-5590.Aleksandar Prokopec2012-05-044-1/+44
| | |/ /
| * / / Fix for si-5018.Aleksandar Prokopec2012-05-043-4/+7
| |/ / | | | | | | | | | Methods keySet, values and withDefault now return serializable collections.
* | | Merge pull request #472 from adriaanm/topic/virtpatmatAdriaan Moors2012-05-041-2/+4
|\ \ \ | | | | | | | | run patmat after typer, but not *right* after
| * | | run patmat after typer, but not *right* afterAdriaan Moors2012-05-041-2/+4
|/ / / | | | | | | | | | sbt needs that spot right after type for its phase xsbt-api
* | | Fix for one of the oldest open soundness bugs.Paul Phillips2012-05-046-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes SI-963, since it was one of my random 30 it won the prize. The trick after adding the stability check (which has been sitting there commented out for 3+ years) was that implicit search depended on the wrongness, because memberWildcardType would create scopes with members of the form ?{ val name: tp } And since a def shouldn't match that, fixing it broke everything until I flipped it around: memberWildcardType should be seeking ?{ def name: tp } It could also search for a mutable value: the relevant quality is that it not be stable so it doesn't have a tighter type than the members it hopes to match.