summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1548 from paulp/fix-checkinitJosh Suereth2012-10-314-5/+16
|\ | | | | Fix for -Xcheckinit failures.
| * Fix for -Xcheckinit failures.Paul Phillips2012-10-314-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GenASM phase had an eager val which required loading a bunch of symbols, which meant an earlier call to isPastTyper could lead to a cycle of the form: new Run new GenASM rootMirror.getRequiredClass findMember defineBaseClassesOfCompoundType isPastTyper currentRun.typerPhase and the opening "new Run" hasn't yet caught up to where currentRun.typerPhase is set. This was remedied by making the eager val lazy, and substantially hardened against recurrence via a method on global "isGlobalInitialized" which verifies that both the definitions object and the root mirror have completed their init methods.
* | Merge pull request #1547 from paulp/merge-2.10.xJosh Suereth2012-10-3145-855/+858
|\ \ | |/ |/| Merge 2.10.x into master.
| * Merge branch 'merge-2.10.0-wip' into merge-2.10.xPaul Phillips2012-10-3145-855/+858
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-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.
| | | * Disabled generation of _1, _2, etc. methods.Paul Phillips2012-10-225-74/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-3/+62
| | |\ \ | | | | | | | | | | 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-173-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | It wasn't traversing into Select nodes nor into the receiver of a tail call.
| | * | | Merge pull request #1515 from paulp/issue/6552Josh Suereth2012-10-233-3/+14
| | |\ \ \ | | | |_|/ | | |/| | Fix SI-6552, regression with self types.
| | | * | Fix SI-6552, regression with self types.Paul Phillips2012-10-213-3/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-205-37/+58
| | |\ \ | | | | | | | | | | Fix for SI-6537, inaccurate unchecked warning.
| | | * | Fix for SI-6537, inaccurate unchecked warning.Paul Phillips2012-10-185-37/+58
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1510 from rkuhn/wip-duration-tck-one-arg-assertJosh Suereth2012-10-201-4/+7
| | |\ \ | | | | | | | | | | avoid single-arg assert where harmful in duration-tck
| | | * | avoid single-art assert where harmful in duration-tckRoland2012-10-181-4/+7
| | | |/
| | * | 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
| | | | |
| | * | | Merge pull request #1498 from paulp/defs-not-valsPaul Phillips2012-10-192-115/+115
| | |\ \ \ | | | |_|/ | | |/| | Changes Tree and Type members from vals to defs.
| | | * | 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 #1520 from vigdorchik/drop.phasesAdriaan Moors2012-10-231-3/+0
| |\ \ \ | | | | | | | | | | Remove compiler phases that don't influence scaladoc generation.
| | * | | 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-209-22/+199
| |\ \ \ | | | | | | | | | | Scaladoc knows the package structure of the libraries,
| | * | | Scaladoc knows the package structure of the libraries,Eugene Vigdorchik2012-10-119-22/+199
| | | | | | | | | | | | | | | | | | | | so don't include them in external documentation setting.
| * | | | Merge pull request #1508 from hubertp/2.10.x-issue/6358Josh Suereth2012-10-2019-109/+206
| |\ \ \ \ | | | | | | | | | | | | 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
| | | | | |
| | * | | | 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-1816-95/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-196-0/+236
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Adds Swing wrappers for ColorChooser and PopupMenu
| | * | | | Added a Swing ColorChooser wrapperingoem2012-09-263-0/+120
| | | | | |
| | * | | | Added a Swing PopupMenu wrapperingoem2012-09-263-0/+116
| | | | | |
* | | | | | Merge pull request #1518 from retronym/ticket/2968Josh Suereth2012-10-235-0/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-2968 Fix brace healing for `^case (class|object) {`
| * | | | | | SI-2968 Fix brace healing for `^case (class|object) {`Jason Zaugg2012-10-225-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scanner coalesces the pair of tokens into CASEOBJECT or CASECLASS, but fails to set `offset` back to the start of `case`. Brace healing is then unable to correctly guess the location of the missing brace. This commit resets `offset` and `lastOffset`, as though caseobject were a single keyword. Only the former was neccessary to fix this bug; I haven't found a test that shows the need for the latter.
* | | | | | | Merge pull request #1469 from rssh/printwriter-in-uncaught-exceptionAdriaan Moors2012-10-221-6/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | print stacktrace properly when -verbose
| * | | | | | | using existing scala.tools.nsc.util.stackTraceStringRuslan Shevchenko2012-10-071-8/+5
| | | | | | | |
| * | | | | | | fixed trivial error with printing of exception stack trace in verbose mode.Ruslan Shevchenko2012-10-071-2/+4
| | | | | | | |
* | | | | | | | Merge pull request #1468 from paulp/issue/6482Adriaan Moors2012-10-224-65/+150
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6482 preserve bounds on tparams of value class
| * | | | | | | | A little more housecleaning in ExtensionMethods.Paul Phillips2012-10-062-52/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only real contribution is readability.
| * | | | | | | | Incorporated pull request feedback.Paul Phillips2012-10-062-7/+11
| | | | | | | | |
| * | | | | | | | Fix for SI-6482, lost bounds in extension methods.Paul Phillips2012-10-062-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was a good one. How to create a new method with type parameters from multiple sources, herein.
| * | | | | | | | Responded to comment about how many isCoercibles there are.Paul Phillips2012-10-061-0/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | I make the case that there is only one.
* | | | | | | | Merge pull request #1512 from paulp/merge-210Adriaan Moors2012-10-22112-1147/+4566
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Merge 2.10.x into master.
| * | | | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2012-10-19112-1147/+4566
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/2.10.x: (52 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 ... Conflicts: src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/api/Trees.scala test/scaladoc/run/links.scala
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-20 04:49:35 +0000