summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Expand optimization of Array(e1, ..., en) to primitive arrays."Jason Zaugg2012-11-061-7/+0
| | | | This reverts commit 8265175ecc42293997d59049f430396c77a2b891.
* Revert "Refactor guards checking for a particular overload of Array.apply."Jason Zaugg2012-11-061-2/+9
| | | | This reverts commit 092345a24c22a821204fb358d33272ae8f7353be.
* Merge pull request #1568 from retronym/ticket/6611Paul Phillips2012-11-051-8/+11
|\ | | | | SI-6611 Tighten up an unsafe array optimization
| * Refactor guards checking for a particular overload of Array.apply.Jason Zaugg2012-11-041-9/+2
| |
| * Expand optimization of Array(e1, ..., en) to primitive arrays.Jason Zaugg2012-11-041-0/+7
| |
| * SI-6611 Tighten up an unsafe array optimizationJason Zaugg2012-11-031-5/+8
| | | | | | | | | | The net was cast too wide and was unsafely optimizing away array copies.
* | Merge pull request #1554 from paulp/scope-lookupPaul Phillips2012-11-044-81/+53
|\ \ | | | | | | Improvements to scope lookup.
| * | Revamp import ambiguity logic.Paul Phillips2012-11-021-48/+42
| | | | | | | | | | | | | | | | | | Code reviewer prodded me into figuring out where my earlier attempts to simplify the import logic broke down. Now it should be much easier to follow.
| * | The improvements made possible by the scope changes.Paul Phillips2012-11-024-47/+25
| | |
* | | Merge pull request #1565 from retronym/ticket/6567Josh Suereth2012-11-041-1/+10
|\ \ \ | | | | | | | | SI-6567 Warning for Option(implicitView(foo))
| * | | SI-6567 Warning for Option(implicitView(foo))Jason Zaugg2012-11-031-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've seen the reported problem before in the wild. It seems worthy of a special warning, so long as we advocate Option.apply as an alternative to `if (x == null) Some(x) else None`. It is behind -Xlint at the moment, an option that could do with some promotion.
* | | | Merge pull request #1564 from paulp/issue/441Paul Phillips2012-11-0461-250/+261
|\ \ \ \ | |_|_|/ |/| | | Expanded unused warnings.
| * | | Restored a scaladoc val body.Paul Phillips2012-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | Sometimes unused vals have side effecting right hand sides, and it looks like one or maybe two slipped through my net.
| * | | Removing unused locals and making vars into vals.Paul Phillips2012-11-0360-237/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to "git diff" the difference from master to this commit includes: Minus: 112 vals, 135 vars Plus: 165 vals, 2 vars Assuming all the removed ones were vals, which is true from 10K feet, it suggests I removed 80 unused vals and turned 133 vars into vals. There are a few other -Xlint driven improvements bundled with this, like putting double-parentheses around Some((x, y)) so it doesn't trigger the "adapting argument list" warning.
| * | | Expanded unused warnings.Paul Phillips2012-11-031-13/+74
| |/ / | | | | | | | | | | | | | | | | | | | | | Now warns on unused private and local terms and types. In addition it warns when a local var is read-only past the point of its creation - something I never would have guessed would be such a gold mine. Over 100 vars in trunk turn into vals.
* / / Fix for SI-6426, importable _.Paul Phillips2012-11-032-6/+6
|/ / | | | | | | Prohibit `_` as an identifier, it can only bring badness.
* / Comment to link code to a relevant JIRA ticketJason Zaugg2012-11-031-0/+2
|/
* Remove unused private members.Paul Phillips2012-11-0154-436/+31
| | | | | | | | | That's a lot of unused code. Most of this is pure cruft; a small amount is debugging code which somebody might want to keep around, but we should not be using trunk as a repository of our personal snippets of undocumented, unused, unintegrated debugging code. So let's make the easy decision to err in the removing direction. If it isn't built to last, it shouldn't be checked into master.
* Warn about unused private members.Paul Phillips2012-11-012-3/+63
| | | | | | | | Warnings enabled via -Xlint. It's one of the most requested features. And it is hard to argue we don't need it: see the 99 methods removed in the next commit. This should close SI-440.
* Merge pull request #1521 from paulp/whats-in-a-nameAdriaan Moors2012-11-014-422/+446
|\ | | | | Saving symbol lookup from typedIdent.
| * Make LookupNotFound a case object.Paul Phillips2012-10-292-13/+2
| | | | | | | | | | | | | | 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.
| * 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-011-1/+1
|\ \ | | | | | | Fix for SI-6597, implicit case class crasher.
| * | 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 #1534 from paulp/repl-outdirPaul Phillips2012-11-013-25/+65
|\ \ \ | | | | | | | | An option for real repl output.
| * | | An option for real repl output.Paul Phillips2012-10-293-25/+65
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix performance bug in GenASM.Paul Phillips2012-10-311-10/+10
| |/ |/| | | | | | | | | 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.
* | Merge pull request #1548 from paulp/fix-checkinitJosh Suereth2012-10-312-4/+10
|\ \ | | | | | | Fix for -Xcheckinit failures.
| * | Fix for -Xcheckinit failures.Paul Phillips2012-10-312-4/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'merge-2.10.0-wip' into merge-2.10.xPaul Phillips2012-10-3116-646/+136
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-3110-612/+80
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-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
| | | |
| * | | Remove compiler phases that don't influence scaladoc generation.Eugene Vigdorchik2012-10-231-3/+0
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 09:12:56 +0000