summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #598 from retronym/ticket/2405Adriaan Moors2012-05-223-0/+41
|\ | | | | SI-2405 Confer implicit privileges to renamed imports.
| * SI-2405 Confer implicit privileges to renamed imports.Jason Zaugg2012-05-223-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yin and yang would be pleased: A fix in two parts. 1. Use the name of the imported symbol, rather than the alias, in the generated `Select(qual, name)` tree. 2. Do the opposite in `isQualifyingImplicit`, which performs one part of the shadowing check. But there is still work to do. The second part of the shadowing check, `nonImplicitSynonymInScope`, fails to notice this case (irrespective of aliased imports). // Expecting shadowing #2. Alas, none is cast! object Test1 { object A { implicit val x: Int = 1 } import A.x def x: Int = 0 implicitly[Int] } I'm hitching the residual problem to SI-4270's wagon.
* | Merge pull request #586 from axel22/issue/5804Josh Suereth2012-05-222-0/+36
|\ \ | |/ |/| Fixes SI-5804.
| * Fixes SI-5804.Aleksandar Prokopec2012-05-182-0/+36
| | | | | | | | | | | | | | | | | | The hash table initialSize method is now within the the hashset and hashmap classes, and not in the companion. Overriding this method now yields hashmaps and hashsets of the proper initial capacity. Review by @phaller.
* | Merge pull request #593 from som-snytt/ticket/5760-pkgobj-warnAdriaan Moors2012-05-213-0/+26
|\ \ | | | | | | SI-5760: Improve error message for package$Klass conflict with Klass
| * | SI-5760: Improve error message for package$Klass conflict with KlassSom Snytt2012-05-203-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a clarification to DoubleDefError for when the previous symbol was in the package object but current symbol is not. This was actually supposed to be an opportunity to hack partest to run the two-step failing compilation, but somebody beat me to it and my rebase failed. The next hacking opportunity might be to add .pt script files! The possibilities are endless.
* | | Merge pull request #591 from retronym/ticket/3888Adriaan Moors2012-05-211-0/+16
|\ \ \ | | | | | | | | Test case closes SI-3880.
| * | | Test case closes SI-3880.Jason Zaugg2012-05-201-0/+16
| |/ / | | | | | | | | | virtpatmat ftw.
* | | Merge pull request #590 from retronym/ticket/3899Adriaan Moors2012-05-213-0/+39
|\ \ \ | | | | | | | | Pending test for SI-3899.
| * | | Pending test for SI-3899.Jason Zaugg2012-05-203-0/+39
| |/ / | | | | | | | | | | | | | | | The super accessor for the Java varargs method impedes Uncurry's efforts to convert repeated arguments to an Array. I'm not sure how to fix that.
* | | Merge pull request #587 from retronym/ticket/5125Adriaan Moors2012-05-214-0/+72
|\ \ \ | | | | | | | | Fix @varargs forwarder generation in the presence of nested templates.
| * | | Improve test for SI-5125.Jason Zaugg2012-05-201-1/+1
| | | | | | | | | | | | | | | | Uncomment a line, as was the intent.
| * | | Fix @varargs forwarder generation in the presence of nested templates.Jason Zaugg2012-05-204-0/+72
| |/ / | | | | | | | | | | | | | | | Makes `newMembers` a Map[Symbol, Buffer[Tree]] to ensure we add the forwarders to the right template. Closes SI-5125.
* | | Merge pull request #576 from axel22/issue/4717Adriaan Moors2012-05-211-0/+35
|\ \ \ | |/ / |/| | | | | Fix SI-4717: lazy val declared inside an anonymous class inside a specialized context no longer crashes Duplicators.
| * | Fixes SI-4717.Aleksandar Prokopec2012-05-181-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lazy val declared inside an anonymous class inside a specialized context no longer crashes Duplicators. Previously, a duplicated lazy val was assigned to the wrong owner in Duplicators: def x[B >: A]: Unit = new Bounds[B] { lazy val it = ??? // def or val okay } Above, the `it` in `$anon` in `x$mcZ$sp` had its owner set to `x$mcZ$sp` instead of `$anon`. This crashed the typer when it had to retype its lazy accessor, because there was no `lazy var it` in `$anon$`. Furthermore, the duplicated symbol wasn't being added to the list of declarations of `$anon`. Changes: 1) `invalidate` in Duplicators takes an additional parameter which is the new owner of the new symbol that has to be duplicated. If this parameter is set to `NoSymbol`, then the new owner is `context.owner`, as before. 2) the newly created lazy val symbol is being added to the list of declarations of its new owner. Removes debugging output from the previous commit. Review by dragos. @mention dragos
| * | Add more logging.Aleksandar Prokopec2012-05-151-0/+39
| | |
* | | Merge pull request #581 from lrytz/t4812-uncAdriaan Moors2012-05-191-0/+4
|\ \ \ | | | | | | | | Fix SI-4812: handle trait method with Symbol as default for argument
| * | | Fix 4812Lukas Rytz2012-05-191-0/+4
| | | | | | | | | | | | | | | | Remove default arguments from parameter ValDefs in UnCurry.
* | | | Merge pull request #578 from lrytz/wip/t5044-squashedAdriaan Moors2012-05-193-1/+23
|\ \ \ \ | | | | | | | | | | fix SI-5044: better error message on cyclic error and named/default args
| * | | | better feedback for SI-5044Lukas Rytz2012-05-183-1/+23
| | | | |
* | | | | Merge pull request #577 from lrytz/wip/t2488Adriaan Moors2012-05-194-0/+58
|\ \ \ \ \ | | | | | | | | | | | | Fix SI-2488: allow named arg, in original position, before positionals
| * | | | | Fix SI-2488Lukas Rytz2012-05-184-0/+58
| | | | | |
* | | | | | Merge pull request #568 from hubertp/issue/5801Adriaan Moors2012-05-192-0/+38
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix SI-5801: error messages regression.
| * | | | | Fixes SI-5801, error messages regression. Review by @adriaanmHubert Plociniczak2012-05-182-0/+38
| | | | | |
* | | | | | Merge pull request #574 from axel22/issue/4461Josh Suereth2012-05-182-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes SI-4461.
| * | | | | | Fixes SI-4461.Aleksandar Prokopec2012-05-182-1/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | No review.
* | | | | | Merge pull request #572 from lrytz/wip/t5544Adriaan Moors2012-05-186-0/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5544
| * | | | | | Fix SI-5544Lukas Rytz2012-05-186-0/+27
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Type-check annotations in a context with a localDummy owner
* | | | | | Merge pull request #569 from phaller/wip-sip14-fixes-newAdriaan Moors2012-05-183-12/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | SIP-14: clean ups and fixes by @viktorklang
| * | | | | | SIP-14: clean ups and fixesphaller2012-05-173-12/+88
| | | | | | |
* | | | | | | Merge pull request #571 from lrytz/wip/t4138Josh Suereth2012-05-182-0/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix 4138
| * | | | | | Fix 4138Lukas Rytz2012-05-182-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #567 from lrytz/wip/t3488Josh Suereth2012-05-182-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Test case for SI-3844 - fixed by #virtpatmat @adriaanm
| * | | | | Test case for SI-3844 - fixed by #virtpatmat @adriaanmLukas Rytz2012-05-162-0/+8
| |/ / / /
* | | | | Merge pull request #566 from lrytz/wip/t4928Adriaan Moors2012-05-183-6/+15
|\ \ \ \ \ | | | | | | | | | | | | Fix SI-4928
| * | | | | Fix SI-4928Lukas Rytz2012-05-163-6/+15
| | |_|/ / | |/| | | | | | | | | | | | | better error message when a parameter is first defined positionally, then with a named argument.
* | | | | Merge pull request #563 from milessabin/feature/enrich-gentraversablesJosh Suereth2012-05-172-0/+34
|\ \ \ \ \ | | | | | | | | | | | | Added infrastructure to enable easy enrichment of GenTraversables.
| * | | | | Added infrastructure to enable easy enrichment of GenTraversables.Miles Sabin2012-05-172-0/+34
| | |/ / / | |/| | |
* / | | | A band-aid solution for SI-5803.Jason Zaugg2012-05-172-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ae5ff662, resetAttrs duplicates trees, which doesn't preserve ApplyConstructor. My attempt to modify TreeCopier to do so proved trickier than expected. In any case, ApplyConstructor is not long for this world, and is only used in tree printing to distinguish `new X` from regular Apply trees, so this should suffice pending full surgery.
* | | | Merge pull request #558 from lrytz/wip/t5259Josh Suereth2012-05-161-0/+21
|\ \ \ \ | | | | | | | | | | Fix SI-5259
| * | | | Fix SI-5259Lukas Rytz2012-05-151-0/+21
| | | | | | | | | | | | | | | | | | | | Calling the type checker on an Ident tree instead of using gen.mkAttributedRef assigns a SingleType to the tree.
* | | | | Merge pull request #557 from lrytz/wip/t5610Josh Suereth2012-05-162-0/+36
|\ \ \ \ \ | |_|/ / / |/| | | | Fix for SI-5610
| * | | | Fix for SI-5610Lukas Rytz2012-05-152-0/+36
| |/ / /
* | | | Removing more unneeded code.Paul Phillips2012-05-156-102/+5
| | | |
* | | | Test adjustments.Paul Phillips2012-05-151-1/+3
| | | |
* | | | Removing extraneous files.Paul Phillips2012-05-1512-916/+0
| | | | | | | | | | | | | | | | Culling accumulated unnecessary code.
* | | | Debugging output tweaks.Paul Phillips2012-05-141-1/+1
|/ / / | | | | | | | | | And undeprecated Positional.
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge commit 'refs/pull/547/head'; commit 'refs/pull/548/head'; commit ↵Paul Phillips2012-05-148-25/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'refs/pull/549/head'; commit 'refs/pull/550/head'; commit 'refs/pull/551/head' into develop
| | | | * | | Better fix for SI-5676. Review by @paulpHubert Plociniczak2012-05-144-25/+27
| | | | |/ /
| | | * / / Closes SI-5796.Hubert Plociniczak2012-05-141-0/+8
| | | |/ /