summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1521 from paulp/whats-in-a-nameAdriaan Moors2012-11-0117-438/+588
|\ | | | | Saving symbol lookup from typedIdent.
| * Make LookupNotFound a case object.Paul Phillips2012-10-293-13/+10
| | | | | | | | | | | | | | Turns out putting a group of case classes at what feels like the top level might not be top-level enough, like if your "top" is Analyzer and you wind up with different outer pointers in every instance of Typer. Moved the whole bundle to SymbolTable.
| * Tests for SI-3160, SI-4537, import precedence.Paul Phillips2012-10-2312-16/+134
| |
| * Adding some comments and clearer naming.Paul Phillips2012-10-231-3/+6
| |
| * Switch typedIdent to use Context's lookupSymbol.Paul Phillips2012-10-231-232/+49
| | | | | | | | | | | | | | | | This completes the transition. Typer's bevy of special cases to influence symbol lookup are encoded in its local "qualifies" method, which it passes to lookupSymbol. This allows access to be done correctly without infecting Typer with such pedestrian concerns.
| * Simplifying Typer.Paul Phillips2012-10-231-175/+111
| | | | | | | | Apply convenience methods to strip away complications.
| * Added some symbol lookup convenience methods.Paul Phillips2012-10-233-9/+28
| | | | | | | | Greasing the wheels for Typer's well-being.
| * Made SilentResult more monadic.Paul Phillips2012-10-231-1/+14
| | | | | | | | | | | | Given that it's just a reimplementation of Option, we may as well not also reimplement methods like map and getOrElse at every call site.
| * Adds the core symbol lookup logic to Typers.Paul Phillips2012-10-231-3/+235
| | | | | | | | | | | | | | | | | | | | | | | | This unifies several disparate/ad-hoc mechanisms for excluding symbols from eligibility in a single predicate. This is the method on Context: def lookupSymbol(name: Name, qualifies: Symbol => Boolean) The logic is largely that which was buried in typedIdent, except that I fixed SI-3160 so that import foo._ does not inject foo's private members into your namespace.
| * Introduces some structure for name lookups.Paul Phillips2012-10-231-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too many unrelated things are intermingled. If you want to know what symbol corresponds to a particular name in a particular context, you shouldn't have to involve either a Tree or a Typer to find that out. I toiled line by line over typedIdent until it had shed its redundancies and freed itself from the bowels of typed1. The mechanism of name lookup is such that adding a qualifier when the occasion calls for it is inseperable without a lot more effort. So to preserve a sane interface I devised this small partitioning of outcomes. case class LookupSucceeded(qualifier, symbol) case class LookupAmbiguous(msg) case class LookupInaccessible(symbol, msg) case class LookupNotFound(msg)
* | Merge pull request #1550 from paulp/issue/6597Adriaan 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 #1535 from paulp/stream-distinctPaul Phillips2012-11-015-10/+65
|\ \ \ | | | | | | | | Fix SI-6584, Stream#distinct uses too much memory.
| * | | Implementation of Stream#dropRight.Paul Phillips2012-11-013-7/+31
| | | | | | | | | | | | | | | | | | | | "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-013-3/+34
| | | | | | | | | | | | | | | | Nesting recursive calls in Stream is always a dicey business.
* | | | Merge pull request #1534 from paulp/repl-outdirPaul Phillips2012-11-017-27/+133
|\ \ \ \ | |/ / / |/| | | An option for real repl output.
| * | | An option for real repl output.Paul Phillips2012-10-297-27/+133
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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 pull request #1549 from paulp/genasm-hurts-replAdriaan Moors2012-10-313-13/+16
|\ \ \ | |_|/ |/| | Fix performance bug in GenASM.
| * | Fix performance bug in GenASM.Paul Phillips2012-10-312-11/+13
| | | | | | | | | | | | | | | | | | It was going through missingHook looking for android classes every time something was compiled, which means four failing missingHook calls for every line in the repl.
| * | Minor tweaks to logging approach.Paul Phillips2012-10-311-2/+3
| | |
| * | silences optional logs in reflectionEugene Burmako2012-10-311-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some parts of the compiler call `SymbolTable.log` to dump information about the progress of compilation, type inference, etc. In Global.scala, `log` checks the -Ylog configuration setting to approve or reject incoming messages. However in runtime reflection (scala.reflect.runtime.JavaUniverse) `log` always prints its argument, which is annoying. Here's why this is happening. In runtime reflection -Ylog is inapplicable, because this is a phase-based setting, whereas reflection does not have a notion of phases. Moreover reflection doesn't expose `settings` to the programmers (the corresponding `def settings` definition is declared in scala.reflect.internal.Required). Therefore there's no obvious solution to conditional printing in `log` when invoked in reflective setting. The situation is tough and needs to be addressed in a principled manner. However we're in between RC1 and RC2 at the moment, so I don't fancy significant changes right now. Nevertheless we need to fix the annoyance right away, therefore I change reflective `log` to use -Ydebug. This is inconsistent w.r.t how Global works, and also there's no way to enable logging short of casting to `scala.reflect.runtime.SymbolTable`, but it looks like a decent temporary measure.
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 03:45:11 +0000