summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-0540-1579/+155
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'refs/pull/1574/head': (24 commits) Fixing issue where OSGi bundles weren't getting used for distribution. Fixes example in Type.asSeenFrom Fix for SI-6600, regression with ScalaNumber. SI-6562 Fix crash with class nested in @inline method Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013 Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013 SI-6606 Drops new icons in, replaces abstract types placeholder icons SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings Labeling scala.reflect and scala.reflect.macros experimental in the API docs Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later SI-6399 Adds API docs for Any and AnyVal Removing actors-migration from main repository so it can live on elsewhere. Fix for SI-6597, implicit case class crasher. SI-6578 Harden against synthetics being added more than once. SI-6556 no assert for surprising ctor result type Removing actors-migration from main repository so it can live on elsewhere. Fixes SI-6500 by making erasure more regular. Modification to SI-6534 patch. Fixes SI-6559 - StringContext not using passed in escape function. ... Conflicts: src/actors-migration/scala/actors/migration/StashingActor.scala src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala src/compiler/scala/tools/nsc/settings/AestheticSettings.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/library/scala/Application.scala src/library/scala/collection/immutable/GenIterable.scala.disabled src/library/scala/collection/immutable/GenMap.scala.disabled src/library/scala/collection/immutable/GenSeq.scala.disabled src/library/scala/collection/immutable/GenSet.scala.disabled src/library/scala/collection/immutable/GenTraversable.scala.disabled src/library/scala/collection/mutable/GenIterable.scala.disabled src/library/scala/collection/mutable/GenMap.scala.disabled src/library/scala/collection/mutable/GenSeq.scala.disabled src/library/scala/collection/mutable/GenSet.scala.disabled src/library/scala/collection/mutable/GenTraversable.scala.disabled src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled
| * 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 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 #1554 from paulp/scope-lookupPaul Phillips2012-11-041-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Improvements to scope lookup.
| * | | | | The improvements made possible by the scope changes.Paul Phillips2012-11-021-3/+1
| | | | | |
* | | | | | Merge pull request #1565 from retronym/ticket/6567Josh Suereth2012-11-043-0/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6567 Warning for Option(implicitView(foo))
| * | | | | | SI-6567 Warning for Option(implicitView(foo))Jason Zaugg2012-11-033-0/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've seen the reported problem before in the wild. It seems worthy of a special warning, so long as we advocate Option.apply as an alternative to `if (x == null) Some(x) else None`. It is behind -Xlint at the moment, an option that could do with some promotion.
* | | | | | Merge pull request #1564 from paulp/issue/441Paul Phillips2012-11-045-17/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expanded unused warnings.
| * | | | | | Removing unused locals and making vars into vals.Paul Phillips2012-11-033-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to "git diff" the difference from master to this commit includes: Minus: 112 vals, 135 vars Plus: 165 vals, 2 vars Assuming all the removed ones were vals, which is true from 10K feet, it suggests I removed 80 unused vals and turned 133 vars into vals. There are a few other -Xlint driven improvements bundled with this, like putting double-parentheses around Some((x, y)) so it doesn't trigger the "adapting argument list" warning.
| * | | | | | Expanded unused warnings.Paul Phillips2012-11-032-11/+91
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now warns on unused private and local terms and types. In addition it warns when a local var is read-only past the point of its creation - something I never would have guessed would be such a gold mine. Over 100 vars in trunk turn into vals.
* / / / / / Fix for SI-6426, importable _.Paul Phillips2012-11-032-0/+12
|/ / / / / | | | | | | | | | | | | | | | Prohibit `_` as an identifier, it can only bring badness.
* | | | | Warn about unused private members.Paul Phillips2012-11-014-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warnings enabled via -Xlint. It's one of the most requested features. And it is hard to argue we don't need it: see the 99 methods removed in the next commit. This should close SI-440.
* | | | | Merge pull request #1521 from paulp/whats-in-a-nameAdriaan Moors2012-11-0112-16/+134
|\ \ \ \ \ | | | | | | | | | | | | Saving symbol lookup from typedIdent.
| * | | | | Tests for SI-3160, SI-4537, import precedence.Paul Phillips2012-10-2312-16/+134
| | | | | |
* | | | | | Merge pull request #1550 from paulp/issue/6597Adriaan Moors2012-11-012-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for SI-6597, implicit case class crasher.
| * | | | | | 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 #1535 from paulp/stream-distinctPaul Phillips2012-11-014-1/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix SI-6584, Stream#distinct uses too much memory.
| * | | | | | | Implementation of Stream#dropRight.Paul Phillips2012-11-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "There's nothing we can do about dropRight," you say? Oh but there is.
| * | | | | | | Fix SI-6584, Stream#distinct uses too much memory.Paul Phillips2012-11-012-0/+24
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Nesting recursive calls in Stream is always a dicey business.
* | | | | | | Merge pull request #1534 from paulp/repl-outdirPaul Phillips2012-11-014-2/+68
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | An option for real repl output.
| * | | | | | An option for real repl output.Paul Phillips2012-10-294-2/+68
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been many requests to expose the products of the repl in some way outside in-memory. This does that. scala # usual in-memory behavior scala -Yrepl-outdir "" # make up a temp dir scala -Yrepl-outdir /foo/bar # use /foo/bar
* | | | | | Merge branch 'merge-2.10.0-wip' into merge-2.10.xPaul Phillips2012-10-3118-78/+350
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10.0-wip: Use Typed rather than .setType Wider use and a new variant of typedPos. SI-6575 Plug inference leak of AbstractPartialFun Remove compiler phases that don't influence scaladoc generation. 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. Crash on missing accessor (internal bug in the lazy vals implementation) instead of trying to recover from the bug Incorporated changes suggested in code review Added one more test for SI-6358 Closes SI-6358. Move accessor generation for lazy vals to typers. SI-6526 Tail call elimination should descend deeper. Remove unneeded calls to substring() Changes Tree and Type members from vals to defs. Scaladoc knows the package structure of the libraries, so don't include them in external documentation setting. Fixes SI-6170: issue with dragging scaladoc splitter over central iframe Added a Swing ColorChooser wrapper Added a Swing PopupMenu wrapper Conflicts: src/compiler/scala/reflect/reify/phases/Reshape.scala src/compiler/scala/tools/nsc/typechecker/Duplicators.scala src/continuations/plugin/scala/tools/selectivecps/SelectiveCPSTransform.scala src/reflect/scala/reflect/internal/Types.scala test/files/neg/unchecked-knowable.check
| * | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 23:56:52 +0000