summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Modification to SI-6534 patch.Paul Phillips2012-10-301-9/+11
| | | | | | | | | | | | | | | | | | 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-241-1/+16
| | | | | | | | | | | | | | | 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-2/+4
| |\ \ | | | | | | | | Fixes SI-6500 by making erasure more regular.
| | * | Fixes SI-6500 by making erasure more regular.Martin Odersky2012-10-301-2/+4
| | |/ | | | | | | | | | | | | | | | 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-1/+13
| |\ \ | | | | | | | | SI-6556 no assert for surprising ctor result type
| | * | SI-6556 no assert for surprising ctor result typeMartin Odersky2012-10-301-1/+13
| | |/ | | | | | | | | | | | | | | | | | | 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-011-74/+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-0110-35/+77
| |\ \
| | * \ 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-312-6/+6
| | |\ \ | | | | | | | | | | SI-6581 fixed by inlining `Actor.self`.
| | | * | SI-6581 fixed by inlining `Actor.self`.Vojin Jovanovic2012-10-302-6/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | 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-312-3/+7
| | |\ \ | | | | | | | | | | Fixes SI-5031 for separate compilation scenario.
| | | * | Fixes SI-5031 for separate compilation scenario.Hubert Plociniczak2012-10-282-3/+7
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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-3016-501/+3
| | |/ | |/| | | | | | | | | | | | | | | | * 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-311-1/+1
| | | | | | | | | | | | | | | | | | | | | 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-741/+211
|\ \ \ | | | | | | | | 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-741/+211
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | 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-281-1/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-3/+4
| | |\ | | | | | | | | Disabled generation of _1, _2, etc. methods.
| | | * Disabled generation of _1, _2, etc. methods.Paul Phillips2012-10-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-3/+5
| | |\ \ | | | | | | | | | | SI-6526 Tail call elimination should descend deeper.
| | | * | SI-6526 Tail call elimination should descend deeper.Jason Zaugg2012-10-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | 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-212-3/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-34/+33
| | |\ \ | | | | | | | | | | Fix for SI-6537, inaccurate unchecked warning.
| | | * | Fix for SI-6537, inaccurate unchecked warning.Paul Phillips2012-10-181-34/+33
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Merge pull request #1480 from ingoem/topic/scaladocAdriaan Moors2012-10-192-563/+9
| | |\ \ | | | | | | | | | | Fixes SI-6170: issue with dragging scaladoc splitter over central iframe
| | | * | Fixes SI-6170: issue with dragging scaladoc splitter over central iframeingoem2012-10-092-563/+9
| | | | |
| | * | | Changes Tree and Type members from vals to defs.Paul Phillips2012-10-132-115/+115
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explanatory email: The reflection API defines a great many abstract vals. I would like these all to be defs. I'm sending a pull request to that end. Reasons: for starters, they should default to being defs. It's a decision to use vals for which one should have to supply reasons. The reason for THAT is that defs can be implemented with vals, but not vice versa. Why does this matter? I can't find my long writing on the subject of TypeRef. In short, we waste a huge amount of memory on its fields, because given the way TypeRef is defined, each one demands a pre, a sym, and an args. Except that somewhere between 1/3 and 1/2 have prefix "NoPrefix", and somewhere between 1/3 and 1/2 have args "Nil". We know it at creation time, but we give every typeref the whole field anyway. At present there's no way to fix this which has acceptable performance - i.e. custom subclasses save us lots of memory, but are too much slower for having to use an extractor - but there's no reason we should have to choose, and I fully expect to fix it eventually. Let's not make that fix into a breaking change by abstractly defining "pre" and "args" as field-requiring vals.
* | | | Merge pull request #1522 from possiblywrong/2.10.xJosh Suereth2012-10-311-1/+4
|\ \ \ \ | | | | | | | | | | SI-6488: Fix for race with open I/O fds
| * | | | SI-6488: Stop I/O threads prior to Process destructionDeclan Conlon2012-10-261-1/+4
| |/ / /
* / / / Fixes SI-6559 - StringContext not using passed in escape function.Josh Suereth2012-10-301-1/+1
|/ / / | | | | | | | | | | | | 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.
* | | Remove compiler phases that don't influence scaladoc generation.Eugene Vigdorchik2012-10-231-3/+0
| | |
* | | Merge pull request #1479 from vigdorchik/2.10.xJosh Suereth2012-10-205-22/+50
|\ \ \ | | | | | | | | Scaladoc knows the package structure of the libraries,
| * | | Scaladoc knows the package structure of the libraries,Eugene Vigdorchik2012-10-115-22/+50
| | | | | | | | | | | | | | | | so don't include them in external documentation setting.
* | | | Merge pull request #1508 from hubertp/2.10.x-issue/6358Josh Suereth2012-10-2012-95/+171
|\ \ \ \ | | | | | | | | | | Backport commits that fix SI-6358 from master
| * | | | Crash on missing accessor (internal bug in the lazy vals implementation) ↵Hubert Plociniczak2012-10-182-2/+6
| | | | | | | | | | | | | | | | | | | | instead of trying to recover from the bug
| * | | | Incorporated changes suggested in code reviewHubert Plociniczak2012-10-184-35/+38
| | | | |
| * | | | Closes SI-6358. Move accessor generation for lazy vals to typers.Hubert Plociniczak2012-10-1810-81/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | Merge pull request #1501 from vigdorchik/doc_stringsAdriaan Moors2012-10-191-12/+14
|\ \ \ \ \ | | | | | | | | | | | | Remove unneeded calls to substring()
| * | | | | Remove unneeded calls to substring()Eugene Vigdorchik2012-10-151-12/+14
| | |/ / / | |/| | |
* | | | | Merge pull request #1403 from ingoem/topic/swingAdriaan Moors2012-10-194-0/+142
|\ \ \ \ \ | |_|/ / / |/| | | | Adds Swing wrappers for ColorChooser and PopupMenu
| * | | | Added a Swing ColorChooser wrapperingoem2012-09-262-0/+59
| | | | |
| * | | | Added a Swing PopupMenu wrapperingoem2012-09-262-0/+83
| | | | |
* | | | | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-210-wip-210Paul Phillips2012-10-1693-1666/+10325
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Eugene Burmako (23) and others # Via Josh Suereth (12) and others * origin/2.10.0-wip: (54 commits) JavaUniverse Moved @contentDiagram in Symbols Adds lots of new documentation for TypeTags, Mirrors, Universes and more runtime.JavaUniverse - put ungrouped members at the top Forgotten annotation in Annotations Diagram tweaking Grouping for reflection and macros fixes a typo scala.reflect.api.Symbols documentation Symbols docs cleanup, mostly moved to guide scala.reflect.api.Position documentation scala.reflect.api.StandardNames documentation scala.reflect.api.Constants documentation removed docs for internal TypeCreator and TreeCreator simplified reflection docs for trees Rearranged some reflection docs, moving things to the guide reflection docs improvements and moves to doc page docs for reflection and macros SI-6509 Correct @template owners SI-6155 Scaladoc @template diagrms ...
| * | | | Merge pull request #1492 from scalamacros/pullrequest/reflection-docsv2.10.0-RC1Josh Suereth2012-10-1145-786/+3943
| |\ \ \ \ | | | | | | | | | | | | Pullrequest/reflection docs
| | * | | | JavaUniverseVlad Ureche2012-10-111-2/+1
| | | | | |
| | * | | | Moved @contentDiagram in SymbolsVlad Ureche2012-10-111-2/+2
| | | | | |