summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* better error when typetagging local classesEugene Burmako2012-11-121-1/+1
| | | | Inspired by https://issues.scala-lang.org/browse/SI-6649
* Merge branch '2.10.0-wip' into merge-2.10.0Josh Suereth2012-11-0537-1579/+126
|\
| * Merge pull request #1562 from paulp/issue/6600Josh Suereth2012-11-021-0/+8
| |\ | | | | | | Fix for SI-6600, regression with ScalaNumber.
| | * Fix for SI-6600, regression with ScalaNumber.Paul Phillips2012-11-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not much in the end; I divided ScalaNumericConversions into two traits such that the ScalaNumericAnyConversions can be used in value classes, and ScalaNumericConversions can override methods in ScalaNumber (since one trait cannot do both those things.) The fact that ScalaNumber is privileged for equality but a) extends java.lang.Number and therefore b) cannot be a value class is something we will want to revisit real soon.
| * | SI-6562 Fix crash with class nested in @inline methodJason Zaugg2012-11-021-0/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6b4204604 moved access widenings from ExplicitOuter to SuperAccessors to reflect them in pickled signatures so that the inliner can take advantage of them under separate compilation. The followup discussion [1] determined that this wasn't the right solution: while it enabled new separate compilation inlinings, it failed to widen access of outer pointers and hence prevented certain inlinings. A better solution was proposed: modify the inliner to know that access widening is guaranteed to have happened in ExplicitOuter for any field accessed by an @inline-d method body, rather than relying solely on the pickled types. But this hasn't happened yet. In the meantime 07f94297 / #1121 reinstated the access widening to SuperAccessors, but took a slightly different approach, using `Symbol#enclMethod` rather than `closestEnclMethod`. That deviation triggers SI-6562. This commit goes back to `closestEnclMethod`. [1] https://groups.google.com/forum/#!topic/scala-internals/iPkMCygzws4
| * Merge pull request #1526 from paulp/value-classes/6534-equalsAdriaan Moors2012-11-014-0/+42
| |\ | | | | | | New take on SI-6534, value classes.
| | * Modification to SI-6534 patch.Paul Phillips2012-10-302-1/+7
| | | | | | | | | | | | | | | | | | Only exclude hashCode and equals from being overridden in value classes, not other synthetics which may turn up such as case class methods.
| | * New take on SI-6534, value classes.Paul Phillips2012-10-244-0/+36
| | | | | | | | | | | | | | | Don't prohibit equals and hashCode in universal traits; instead, always override them in value classes.
| * | Merge pull request #1540 from odersky/ticket/6500Adriaan Moors2012-11-011-0/+13
| |\ \ | | | | | | | | Fixes SI-6500 by making erasure more regular.
| | * | Fixes SI-6500 by making erasure more regular.Martin Odersky2012-10-301-0/+13
| | |/ | | | | | | | | | | | | | | | With the introduction of value classes, erasure uses specialErasure where a value class C with underlying type T is unboxed to an ErasedValueType. ErasedValue types are eliminated on phase later, in post-erasure. This was done everywhere, except in the parameter types of bridge methods. That was a mistale, because that way bridge methods could not do the boxing/unboxing logic triggered by ErasedValueTypes. Note: there is one remaining use of erasure (not specialErasure) in Erasure.scala. I put in a comment why that is OK.
| * | Merge pull request #1542 from adriaanm/odersky-ticket/6556v2Adriaan Moors2012-11-011-0/+32
| |\ \ | | | | | | | | SI-6556 no assert for surprising ctor result type
| | * | SI-6556 no assert for surprising ctor result typeMartin Odersky2012-10-301-0/+32
| | |/ | | | | | | | | | | | | | | | | | | Previous fix to value classes uncovered some questionable cases in the backend where result types of constructor signatures are surprising. It's not a big deal because these types will be ignored afterwards anyway. But the method uncovered some questionable situations which we should follow up on. However, breaking 2.9 code because of this is way too harsh. That's why the asserts were converted to warnings. review by @paulp, @adriaanm
| * | Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-11-012-35/+0
| | | | | | | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
| * | Merge branch '2.10.0-wip' of github.com:scala/scala into 2.10.0-wipJosh Suereth2012-11-017-0/+84
| |\ \
| | * \ Merge pull request #1536 from vjovanov/issues/SI-6581Josh Suereth2012-10-312-0/+35
| | |\ \ | | | | | | | | | | SI-6581 fixed by inlining `Actor.self`.
| | | * | SI-6581 fixed by inlining `Actor.self`.Vojin Jovanovic2012-10-302-0/+35
| | | |/ | | | | | | | | | | | | | | | | | | | | This avoids the necessary type cast that was preventing leakage of internal migration classes. Review by @phaller
| | * | Merge pull request #1532 from hubertp/2.10.0-wip-issue/5031Josh Suereth2012-10-313-0/+17
| | |\ \ | | | | | | | | | | Fixes SI-5031 for separate compilation scenario.
| | | * | Fixes SI-5031 for separate compilation scenario.Hubert Plociniczak2012-10-283-0/+17
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | When you have a conflicting member in package object and normal package that share the same namespace we remove the latter ClassSymbol from the scope. Now, this has an unpleasant consequence that companionClass/companionModule/companionSymbol no longer work correctly as they rely on finding the correspondent symbol using decls of the owner. This fixes the problem of SI-5031 for separate compilation. Why the above change matters for finding foo.bar.Foo? Because when parsing the class we needed information about the static module (and we have the correct module symbol when completing the info). It's just that 043ce6d0565c9d5d960 relied on no longer valid assumptions. So we were getting NoSymbol and sym.exist was failing. Obviously a more complete solution would be better if we didn't rely on the scope but that's too big to change for 2.10.0.
| * | / Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-3026-1579/+0
| | |/ | |/| | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
* | | Fix for SI-6597, implicit case class crasher.Paul Phillips2012-10-312-0/+9
| | | | | | | | | | | | | | | | | | | | | It seems to me like every call to scope.lookup in the compiler is a latent bug. If a symbol is overloaded, you get one at random. (See the FIXME comment in f5c336d5660 for more on this.)
* | | Merge pull request #1546 from paulp/merge-2.10.0-wipJosh Suereth2012-10-3114-78/+201
|\ \ \ | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.0-wipPaul Phillips2012-10-3114-78/+201
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jason Zaugg (5) and others # Via Josh Suereth (5) and others * origin/2.10.0-wip: Use Typed rather than .setType Wider use and a new variant of typedPos. SI-6575 Plug inference leak of AbstractPartialFun Disabled generation of _1, _2, etc. methods. SI-6526 Additional test case. Fix SI-6552, regression with self types. avoid single-art assert where harmful in duration-tck Fix for SI-6537, inaccurate unchecked warning. SI-6526 Tail call elimination should descend deeper. Changes Tree and Type members from vals to defs. Fixes SI-6170: issue with dragging scaladoc splitter over central iframe
| | * | SI-6575 Plug inference leak of AbstractPartialFunJason Zaugg2012-10-282-0/+32
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually this isn't needed, as partial functions can only be defined with an expected type. But if that expected type is and inherited method return type, the actual type of the partial function literal is used, and the implementation detail of `AbstractPartialFunction[A, B] with Serializable` leaks out. After this change, the inferred types match those from Scala 2.9.2. ticket/6575 ~/code/scala scalac29 -Xprint:typer test/files/pos/t6575a.scala | grep def > 29.txt ticket/6575 ~/code/scala squalac -Xprint:typer test/files/pos/t6575a.scala | grep def > 210.txt ticket/6575 ~/code/scala diff -u 29.txt 210.txt --- 29.txt 2012-10-28 13:51:07.000000000 +0100 +++ 210.txt 2012-10-28 13:51:20.000000000 +0100 @@ -1,7 +1,16 @@ def foo: PartialFunction[Int,Int] def /*Y*/$init$(): Unit = { - absoverride def foo: PartialFunction[Int,Int] = ((x0$1: Int) => x0$1 match { + absoverride def foo: PartialFunction[Int,Int] = { + def <init>(): anonymous class $anonfun = { + final override def applyOrElse[A1 >: Nothing <: Int, B1 >: Int <: Any](x$1: A1, default: A1 => B1): B1 = (x$1: A1 @unchecked) match { + final def isDefinedAt(x$1: Int): Boolean = (x$1: Int @unchecked) match { def /*Z*/$init$(): Unit = { - absoverride def foo: PartialFunction[Int,Int] = ((x0$2: Int) => x0$2 match { + absoverride def foo: PartialFunction[Int,Int] = { + def <init>(): anonymous class $anonfun = { + final override def applyOrElse[A1 >: Nothing <: Int, B1 >: Int <: Any](x$1: A1, default: A1 => B1): B1 = (x$1: A1 @unchecked) match { + final def isDefinedAt(x$1: Int): Boolean = (x$1: Int @unchecked) match { def /*Comb*/$init$(): Unit = { - absoverride def foo: PartialFunction[Int,Int] = ((x0$3: Int) => x0$3 match { + absoverride def foo: PartialFunction[Int,Int] = { + def <init>(): anonymous class $anonfun = { + final override def applyOrElse[A1 >: Nothing <: Int, B1 >: Int <: Any](x$1: A1, default: A1 => B1): B1 = (x$1: A1 @unchecked) match { + final def isDefinedAt(x$1: Int): Boolean = (x$1: Int @unchecked) match {
| | * Merge pull request #1519 from paulp/no-product-nJosh Suereth2012-10-244-71/+72
| | |\ | | | | | | | | Disabled generation of _1, _2, etc. methods.
| | | * Disabled generation of _1, _2, etc. methods.Paul Phillips2012-10-224-71/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was part of the introduction of ProductN, which had to go back into pandora's box because of issues with cycles during typing. These should have been reverted along with it.
| | * | Merge pull request #1507 from retronym/ticket/6526Josh Suereth2012-10-242-0/+57
| | |\ \ | | | | | | | | | | SI-6526 Tail call elimination should descend deeper.
| | | * | SI-6526 Additional test case.Jason Zaugg2012-10-222-1/+9
| | | | |
| | | * | SI-6526 Tail call elimination should descend deeper.Jason Zaugg2012-10-172-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | It wasn't traversing into Select nodes nor into the receiver of a tail call.
| | * | | Fix SI-6552, regression with self types.Paul Phillips2012-10-211-0/+8
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 6eb55d4b7a we put in a remedy for an old issue SI-4560 which had accumulated a number of sketchy partial remedies which carried no tests to illustrate their necessity. Looks like at least one of those was doing something useful. Here's to reversion-reversion. This reverts commit c8bdf199, which itself reverted cb4fd6582.
| | * | Merge pull request #1509 from paulp/issue/6537Josh Suereth2012-10-204-3/+25
| | |\ \ | | | | | | | | | | Fix for SI-6537, inaccurate unchecked warning.
| | | * | Fix for SI-6537, inaccurate unchecked warning.Paul Phillips2012-10-184-3/+25
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found a more direct expression of the unchecked logic, which should be much easier for others to verify. But the bug being fixed here is that the unchecked checking happens too early, and the sealed children of a symbol are not yet visible if it is being simultaneously compiled.
| | * / avoid single-art assert where harmful in duration-tckRoland2012-10-181-4/+7
| | |/
* | | Merge pull request #1522 from possiblywrong/2.10.xJosh Suereth2012-10-312-0/+12
|\ \ \ | | | | | | | | SI-6488: Fix for race with open I/O fds
| * | | SI-6488: Stop I/O threads prior to Process destructionDeclan Conlon2012-10-262-0/+12
| |/ /
* / / Fixes SI-6559 - StringContext not using passed in escape function.Josh Suereth2012-10-301-0/+17
|/ / | | | | | | | | As reported by Curtis Stanford, with indication of what to fix. standardInterpolator was not correctly calling the passed in process function, so raw strings were not really raw.
* | Merge pull request #1479 from vigdorchik/2.10.xJosh Suereth2012-10-204-0/+149
|\ \ | | | | | | Scaladoc knows the package structure of the libraries,
| * | Scaladoc knows the package structure of the libraries,Eugene Vigdorchik2012-10-114-0/+149
| | | | | | | | | | | | so don't include them in external documentation setting.
* | | Added one more test for SI-6358Hubert Plociniczak2012-10-181-0/+6
| | |
* | | Closes SI-6358. Move accessor generation for lazy vals to typers.Hubert Plociniczak2012-10-186-14/+29
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | Until now lazy accessors were handled somehow special because their symbol was created in typers but the corresponding tree was only added in Refchecks. This irregularity caused serious problems for value classes. Also it now looks just better when lazy value is treated in a similar way as other fields. I needed to adapt reifier so that it handles the new implementation correctly. Previously it had to recreate lazy val only by removing defdef and renaming. Now we basically need to recreate lazy val from scratch. There is one minor change to cps plugin but that is still fine because lazy vals were never really part of the transformation. Some range positions needed to be fixed manually. We could do it at the creation time but that would require a lot more "if (symbol.isLazy)" conditions for MethodSyntheis and Symbol/Tree creation and would just unnecessary complicate api. If someone has a better idea, please speak up. Range positions changes were necessary because previously accessors were created at refchecks and they weren't checked by validator (even though they were wrong). This commit removes lazy val implementation restriction introduced for 2.10.0. (cherry-picked from 981424b)
* | SI-6509 Correct @template ownersVlad Ureche2012-10-113-0/+55
| |
* | SI-6155 Scaladoc @template diagrmsVlad Ureche2012-10-113-0/+47
| |
* | SI-6501 Scaladoc will correctly link to @templatedVlad Ureche2012-10-112-1/+7
| | | | | | | | members
* | SI-6495 Scaladoc will pick up group from ownerVlad Ureche2012-10-111-43/+51
| |
* | SI-6487 Scaladoc can link to inner classesVlad Ureche2012-10-112-2/+11
| |
* | Merge pull request #1487 from dragos/issue/fix-6505Josh Suereth2012-10-111-0/+33
|\ \ | | | | | | Fixed SI-6505. Respond to ask calls by immediate failure after compiler shutdown.
| * | Fixed SI-6505. Respond to ask calls by immediate failure even after compiler ↵Iulian Dragos2012-10-101-0/+33
| | | | | | | | | | | | | | | | | | | | | shutdown. When the compiler is asked to shutdown, it may still have items on the working queue, and more can be added by clients in other thread that don't *know* the compiler is down yet. These requests were never serviced, leading to deadlocks or timeouts. review by @odersky, @hubertp
* | | Fix for SI-6499, regression in type inference.Paul Phillips2012-10-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't do any better than a reproduced comment: For some reason which is still a bit fuzzy, we must let Nothing through as a lower bound despite the fact that Nothing is always a lower bound. My current supposition is that the side-effecting type constraint accumulation mechanism depends on these subtype tests being performed to make forward progress when there are mutally recursive type vars. See pos/t6367 and pos/t6499 for the competing test cases.
* | | Merge pull request #1483 from gkossakowski/SI-6440Josh Suereth2012-10-102-0/+8
|\ \ \ | | | | | | | | SI-6440: Revert change to `TraversableLike.filterNot`
| * | | SI-6440: Revert change to `TraversableLike.filterNot`Grzegorz Kossakowski2012-10-092-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit df9f470f14262b9b1002f022c2620d8c38835805 introduced a change to `TraversableLike.filterNot` which broke Stream implementation that does override `filter` implementation but does not override `filterNot` implementation. This shows clearly that reusing code for strict and non-strict collections is very problematic. Added a test-case covering this problem. Closes SI-6440. Review by @retronym.
* | | Merge pull request #1471 from retronym/ticket/6483Josh Suereth2012-10-092-0/+33
|\ \ \ | | | | | | | | SI-6483 Prohibit super[T] references in value classes.