summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1559 from heathermiller/copyright-updateJosh Suereth2012-11-04313-315/+315
|\ | | | | 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-021-1/+1
| | | | | | | | 2013
| * Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-02313-314/+314
| |
* | SI-6562 Fix crash with class nested in @inline methodJason Zaugg2012-11-022-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | SI-6606 Drops new icons in, replaces abstract types placeholder iconsHeather Miller2012-11-024-0/+0
| |
* | Labeling scala.reflect and scala.reflect.macros experimental in the API docsHeather Miller2012-11-021-0/+22
|/ | | | | - Added the labels across scala.reflect and scala.reflect.macros - Added the styling in template.css that is used by all labels
* Merge pull request #1526 from paulp/value-classes/6534-equalsAdriaan Moors2012-11-011-1/+18
|\ | | | | New take on SI-6534, value classes.
| * 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 #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 #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.
* | 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-284-10/+19
| | | | | | | | | | | | 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-211-0/+1
| |/ |/| | | | | | | | | | | | | | | 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
| |
* | reflection docs improvements and moves to doc pageChristopher Vogt2012-10-111-0/+3
| |
* | SI-6509 Correct @template ownersVlad Ureche2012-10-112-5/+6
| |
* | SI-6155 Scaladoc @template diagrmsVlad Ureche2012-10-111-1/+2
| |
* | SI-6501 Scaladoc will correctly link to @templatedVlad Ureche2012-10-111-6/+7
| | | | | | | | members
* | SI-6495 Scaladoc will pick up group from ownerVlad Ureche2012-10-111-9/+20
| |
* | SI-6487 Scaladoc can link to inner classesVlad Ureche2012-10-111-5/+2
| |
* | Merge pull request #1487 from dragos/issue/fix-6505Josh Suereth2012-10-112-1/+15
|\ \ | | | | | | 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-102-1/+15
| | | | | | | | | | | | | | | | | | | | | 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
* | | Deprecated instrumentation APIMirco Dotta2012-10-106-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The instrumentation logic needed by the Scala IDE Worksheet is currently part of the Scala project, but it doesn't need to be. I already have a PR ready for completely removing the instrumentation logic, but I considered it too risky at this point for 2.10.0 release (an oversight can lead to the impossibility of running the worksheet with Scala 2.10.0). For the moment, I believe it's better to deprecate the whole instrumentation API in 2.10.0, and the PR for removing the instrumentation logic will target 2.10.1 or 2.11.0. Besides deprecating the instrumentation API, this commit also raised visibility of `interruptsEnabled` member in `Global`. This change alone is sufficient for moving the instrumentation logic outside of the compiler, and it is needed because the Presentation Compiler thread should never be interrupted while instrumenting a source. This commit is related to SI-6458
* | | Merge pull request #1471 from retronym/ticket/6483Josh Suereth2012-10-091-0/+3
|\ \ \ | | | | | | | | SI-6483 Prohibit super[T] references in value classes.
| * | | SI-6483 Prohibit super[T] references in value classes.Jason Zaugg2012-10-071-0/+3
| | |/ | |/| | | | | | | This seems the safest course of action for 2.10.0.
* | | Proposed fix for SI-6490.Martin Odersky2012-10-091-0/+2
| | | | | | | | | | | | Issues a "companions must be in same file" error only if both class and module exist. This can certainly do no harm. I believe it should adress SI-6490, but, lacking a test case, I don't have evidence for that.
* | | Merge pull request #1458 from scalamacros/pullrequest/reflectionJosh Suereth2012-10-099-35/+29
|\ \ \ | |_|/ |/| | Another reflection bomb
| * | removes EmptyTermName and EmptyTypeNameEugene Burmako2012-10-031-1/+1
| | | | | | | | | | | | We have nme.EMPTY and tpnme.EMPTY for that.
| * | renames macros.ReificationError to ReificationExceptionEugene Burmako2012-10-036-23/+23
| | | | | | | | | | | | | | | And again, this is not a fatal error, so it should end with an Error, and it should subclass not Throwable, but Exception.
| * | renames macros.TypeError to TypecheckExceptionEugene Burmako2012-10-032-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Again, this is not a fatal error, so it should end with an Error, and it should subclass not Throwable, but Exception. Also moved the exception outside the cake to simplify error handling, along the same lines of what've been done for parsing and reification exceptions.
| * | renames macros.ParseError to ParseExceptionEugene Burmako2012-10-031-1/+1
| | | | | | | | | | | | Because it's not a fatal error. Neither it should subclass Throwable.
* | | Merge pull request #1442 from adriaanm/ticket-6215Grzegorz Kossakowski2012-10-081-4/+4
|\ \ \ | |_|/ |/| | SI-6215 Fix compiler crash on private method in value class
| * | SI-6215 Fix compiler crash on private method in value classMartin Odersky2012-10-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the problem with private defs in value classes by moving the $extension after the name proper rather than before. The previous scheme did not commute with makeNonPrivate: I.e. if -ext-> is "generate extension name" and -mnp-> is "make not private" we did get for method foo in value class Foo: foo -ext-> extension$foo -mnp-> Foo$$extension$foo but foo -mnp-> Foo$$foo -ext-> extension$Foo$$foo With the change both variations give the same name: foo -ext-> foo$extension -mnp-> Foo$$foo$extension but foo -mnp-> Foo$$foo -ext-> Foo$$foo$extension
* | | SI-6471 Update jquery from 1.4.2 to 1.8.2Vlad Ureche2012-10-043-557/+6035
| |/ |/| | | | | | | | | | | | | This reopens SI-6170 that was fixed by 1be1f760. I don't want to start a revert war, but I see two reasons we should stick to newer jquerys: - they provide better compatibility to new browsers - having diagrams not working is much more annoying than having the splitter not work
* | Merge pull request #1443 from gkossakowski/anyval-restrictionsGrzegorz Kossakowski2012-10-033-26/+69
|\ \ | | | | | | AnyVal/value classes restrictions
| * | Put more implementation restrictions on value classes.Grzegorz Kossakowski2012-10-031-10/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested objects, classes and lazy vals are disallowed at any nesting level in value classes; e.g. lazy vals local to a method defined in a value class. There are still allowed in universal traits. This is a temporary, implementation restriction that is planned to be addressed in future releases of Scala. Error messages has been updated to communicate that intent. Moved tests for SI-5582 and SI-6408 to pending folder. They have to stay there until implementation restrictions are addressed. Closes SI-6408 and SI-6432. Review by @odersky, @harrah and @adriaanm.
| * | Fixed problem in SI-6408Martin Odersky2012-10-031-1/+2
| | | | | | | | | | | | Fixed problem reported in comment, where inner classes of value classe caused a compiler crash.