summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #1609 from scalamacros/topic/showraw-nodeprintersEugene Burmako2012-11-121-1/+1
|\ \ \ \ | | | | | | | | | | -Yshow-trees-compact respects other options
| * | | | -Yshow-trees-compact respects other optionsEugene Burmako2012-11-111-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The aforementioned tree printer now respects other tree printing options such as -uniqid and -Xprint-types. This helps debugging reify, which uses `nodePrinters`, not `showRaw` to print its trees, because back then `showRaw` didn't exist yet.
* | | | Merge pull request #1602 from gkossakowski/wrong-implicit-classTagAdriaan Moors2012-11-121-3/+3
|\ \ \ \ | |/ / / |/| | | Fix type of the custom `ClassTag` in `PatternMatching.scala`
| * | | Fix type of the custom `ClassTag` in `PatternMatching.scala`Grzegorz Kossakowski2012-11-091-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In fb315772 custom ClassTags were introduced to optimize array creation in hot places. The idea was that if `Array[T]` is allocated through `ClassTag[T]` (which is essentially a factory for Array[T]) we would introduce a custom class implementing `ClassTag[T]` interface and would have specialized array allocation instruction instead of having reflective call as it's being done with default (compiler synthesized) implementation of `ClassTag[T]`. In case of `PatternMatching.scala` I made a mistake of providing `ClassTag[Array[Clause]]` instead of `ClassTag[Clause]` so that value would never be used and compiler still would resolve implicit through default mechanism. This has been discovered thanks to @paulp's work on unused value detection. Review by @paulp.
* | | Merge pull request #1574 from jsuereth/merge-2.10.0Adriaan Moors2012-11-051332-3797/+1970
|\ \ \ | |/ / |/| | Merge 2.10.0-RC2 into 2.10.x
| * | Merge branch '2.10.0-wip' into merge-2.10.0Josh Suereth2012-11-051332-3797/+1970
|/| | | |/
| * Merge pull request #1569 from jsuereth/fix/osgi-manifestsv2.10.0-RC2Adriaan Moors2012-11-041-1/+2
| |\ | | | | | | Fixing issue where OSGi bundles weren't getting used for distribution.
| | * Fixing issue where OSGi bundles weren't getting used for distribution.Josh Suereth2012-11-041-1/+2
| | |
| * | Merge pull request #1566 from densh/topic/asSeenFrom-exampleJosh Suereth2012-11-041-4/+20
| |\ \ | | | | | | | | Fixes example in Type.asSeenFrom
| | * | Fixes example in Type.asSeenFromDen Shabalin2012-11-031-4/+20
| | |/ | | | | | | | | | | | | | | | It was written in some form of non-executable pseudo-code before and that might be quite confusing for people who are not familiar with scala reflection.
| * | Merge pull request #1559 from heathermiller/copyright-updateJosh Suereth2012-11-041240-1249/+1248
| |\ \ | | |/ | |/| Updated copyright dates throughout compiler and stdlib for upcoming release
| | * Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to ↵Heather Miller2012-11-022-2/+2
| | | | | | | | | | | | 2013
| | * Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-021240-1247/+1246
| | |
| * | Merge pull request #1562 from paulp/issue/6600Josh Suereth2012-11-023-6/+23
| |\ \ | | | | | | | | Fix for SI-6600, regression with ScalaNumber.
| | * | Fix for SI-6600, regression with ScalaNumber.Paul Phillips2012-11-023-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #1561 from gkossakowski/ticket/6562Adriaan Moors2012-11-024-8/+31
| |\ \ \ | | |/ / | |/| | SI-6562 Fix crash with class nested in @inline method
| | * | SI-6562 Fix crash with class nested in @inline methodJason Zaugg2012-11-024-8/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1558 from heathermiller/doc/reflection-errataJosh Suereth2012-11-0248-279/+459
| |\ \ | | |/ | |/| API docs: reflection fixes, AnyVal/Any documentation additions, errata
| | * SI-6606 Drops new icons in, replaces abstract types placeholder iconsHeather Miller2012-11-024-0/+0
| | |
| | * SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordingsHeather Miller2012-11-0226-194/+227
| | |
| | * Labeling scala.reflect and scala.reflect.macros experimental in the API docsHeather Miller2012-11-0238-56/+184
| | | | | | | | | | | | | | | - Added the labels across scala.reflect and scala.reflect.macros - Added the styling in template.css that is used by all labels
| | * Typo-fix in scala.concurrent.Future, thanks to @pavelpavlovHeather Miller2012-11-021-1/+1
| | |
| | * Remove implementation details from Position (they are still under ↵Hubert Plociniczak2012-11-021-29/+2
| | | | | | | | | | | | 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 AnyValHeather Miller2012-11-022-5/+51
| |/ | | | | | | | | - Updates AnyVal docs to address value classes. - Updates Any docs to address universal traits.
| * Merge pull request #1526 from paulp/value-classes/6534-equalsAdriaan Moors2012-11-015-1/+60
| |\ | | | | | | New take on SI-6534, value classes.
| | * Modification to SI-6534 patch.Paul Phillips2012-10-303-10/+18
| | | | | | | | | | | | | | | | | | 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-245-1/+52
| | | | | | | | | | | | | | | 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-012-2/+17
| |\ \ | | | | | | | | Fixes SI-6500 by making erasure more regular.
| | * | Fixes SI-6500 by making erasure more regular.Martin Odersky2012-10-302-2/+17
| | |/ | | | | | | | | | | | | | | | 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-012-1/+45
| |\ \ | | | | | | | | SI-6556 no assert for surprising ctor result type
| | * | SI-6556 no assert for surprising ctor result typeMartin Odersky2012-10-302-1/+45
| | |/ | | | | | | | | | | | | | | | | | | 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
| * | Merge pull request #1541 from jsuereth/fix/SI-6577-actors-migrationJosh Suereth2012-11-0148-2267/+11
| |\ \ | | | | | | | | SI-6577 Make actors-migration an external module
| | * | Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-11-014-111/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0117-35/+161
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1543 from adriaanm/paulp-add-synthetics-onceJosh Suereth2012-10-311-6/+25
| |\ \ \ | | | | | | | | | | SI-6578 Harden against synthetics being added more than once.
| | * | | SI-6578 Harden against synthetics being added more than once.Paul Phillips2012-10-301-6/+25
| | | |/ | | |/| | | | | | | | | | | | | Don't add synthetic methods if they already contain synthetic methods from the set we're about to add.
| * | | Merge pull request #1536 from vjovanov/issues/SI-6581Josh Suereth2012-10-314-6/+41
| |\ \ \ | | | | | | | | | | SI-6581 fixed by inlining `Actor.self`.
| | * | | SI-6581 fixed by inlining `Actor.self`.Vojin Jovanovic2012-10-304-6/+41
| | |/ / | | | | | | | | | | | | | | | | | | | | 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-315-3/+24
| |\ \ \ | | | | | | | | | | Fixes SI-5031 for separate compilation scenario.
| | * | | Fixes SI-5031 for separate compilation scenario.Hubert Plociniczak2012-10-285-3/+24
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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-3044-2156/+9
| | |/ | | | | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
* | | Merge pull request #1551 from adriaanm/paulp-issue-6597-2.10.xAdriaan Moors2012-11-013-1/+10
|\ \ \ | | | | | | | | Fix for SI-6597, implicit case class crasher.
| * | | Fix for SI-6597, implicit case class crasher.Paul Phillips2012-10-313-1/+10
|/ / / | | | | | | | | | | | | | | | | | | 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-3128-819/+412
|\ \ \ | | | | | | | | 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-3128-819/+412
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | Merge pull request #1530 from retronym/ticket/6575-2Adriaan Moors2012-10-307-20/+71
| | |\ \ | | | |/ | | |/| SI-6575 Plug inference leak of AbstractPartialFunction
| | | * Use Typed rather than .setTypeJason Zaugg2012-10-291-1/+3
| | | | | | | | | | | | | | | | In response to pull request feedback.
| | | * Wider use and a new variant of typedPos.Jason Zaugg2012-10-285-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | It's safe to replace `localTyper.typed(atPos(pos)(tree))` with `localTyper.typedPos(pos)(tree)` given that we're all in the same cake and we'll get to the same `atPos`.
| | | * SI-6575 Plug inference leak of AbstractPartialFunJason Zaugg2012-10-283-1/+41
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-245-74/+76
| | |\ | | | | | | | | Disabled generation of _1, _2, etc. methods.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 20:12:06 +0000