summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1554 from paulp/scope-lookupPaul Phillips2012-11-047-95/+122
|\ | | | | Improvements to scope lookup.
| * Revert "Convenience method commonSymbolOwner."Paul Phillips2012-11-041-18/+0
| | | | | | | | | | | | I'm reverting 14704da1b8 because it isn't yet used anywhere, but leaving it in the history because I or someone is going to put it to work.
| * 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-025-50/+26
| |
| * Convenience method commonSymbolOwner.Paul Phillips2012-11-021-0/+18
| |
| * Hardening scope lookup against wrongness.Paul Phillips2012-11-021-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to scope.lookup have until this commit discarded any symbols after the first, even at the same nesting depth. Some call sites which did this were innocuous, because they were only checking if lookup(name) != NoSymbol. To make this clearer in the future, I added a method which communicates the intent: containsName. And I added an even more relevant one, which falls between "lookup" and "lookupAll". def lookupUnshadowedEntries(name: Name) That method will be put to work in symbol lookup, allowing us to put to bed methods like "correctForPackageObject".
| * Fixed bug in Symbol filtering.Paul Phillips2012-11-021-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you called filter on an overloaded symbol, it tried to return itself if no alternatives were filtered out. The test being performed, however, would only ever be true if the list call was to the (non-existent) "filterConserve", which is to say that in general, xs ne xs.filter(_ => true) The upshot is that we were creating a new symbol on every filter call to an overloaded symbol. To make completely sure this would be a performance winner, I also eliminated the closure and perform the filtering locally.
* | Merge pull request #1565 from retronym/ticket/6567Josh Suereth2012-11-045-5/+37
|\ \ | | | | | | SI-6567 Warning for Option(implicitView(foo))
| * | SI-6567 Warning for Option(implicitView(foo))Jason Zaugg2012-11-035-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-04108-382/+452
|\ \ \ | | | | | | | | Expanded unused warnings.
| * | | Pull request feedback.Paul Phillips2012-11-041-8/+10
| | | | | | | | | | | | | | | | Factor out 8x duplicated bit of UnPicklers.
| * | | Restored a scaladoc val body.Paul Phillips2012-11-032-1/+5
| | | | | | | | | | | | | | | | | | | | 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-03106-355/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-033-24/+165
| |/ / | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #1567 from paulp/issue/6426Paul Phillips2012-11-034-6/+18
|\ \ \ | |/ / |/| | Fix for SI-6426, importable _.
| * | Fix for SI-6426, importable _.Paul Phillips2012-11-034-6/+18
|/ / | | | | | | Prohibit `_` as an identifier, it can only bring badness.
* | Merge pull request #1563 from retronym/ticket/6609Paul Phillips2012-11-031-0/+2
|\ \ | |/ |/| Comment to link code to a relevant JIRA ticket
| * Comment to link code to a relevant JIRA ticketJason Zaugg2012-11-031-0/+2
|/
* Merge pull request #1553 from adriaanm/paulp-unused-privatesPaul Phillips2012-11-0192-617/+234
|\ | | | | Warn about unused private members. Get rid of warnings (and their privates).
| * Remove unused private members.Paul Phillips2012-11-0187-613/+80
| | | | | | | | | | | | | | | | | | 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-016-4/+154
|/ | | | | | | | 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-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`.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 22:23:16 +0000