summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #1576 from paulp/merge-210Adriaan Moors2012-11-06317-334/+398
|\ \ \ \ \ | |_|_|_|/ |/| | | | Merge 2.10.x/2.10.0-RC2 into master
| * | | | Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-05317-334/+398
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'refs/pull/1574/head': (24 commits) Fixing issue where OSGi bundles weren't getting used for distribution. Fixes example in Type.asSeenFrom Fix for SI-6600, regression with ScalaNumber. SI-6562 Fix crash with class nested in @inline method Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013 Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013 SI-6606 Drops new icons in, replaces abstract types placeholder icons SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings Labeling scala.reflect and scala.reflect.macros experimental in the API docs Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later SI-6399 Adds API docs for Any and AnyVal Removing actors-migration from main repository so it can live on elsewhere. Fix for SI-6597, implicit case class crasher. SI-6578 Harden against synthetics being added more than once. SI-6556 no assert for surprising ctor result type Removing actors-migration from main repository so it can live on elsewhere. Fixes SI-6500 by making erasure more regular. Modification to SI-6534 patch. Fixes SI-6559 - StringContext not using passed in escape function. ... Conflicts: src/actors-migration/scala/actors/migration/StashingActor.scala src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala src/compiler/scala/tools/nsc/settings/AestheticSettings.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/library/scala/Application.scala src/library/scala/collection/immutable/GenIterable.scala.disabled src/library/scala/collection/immutable/GenMap.scala.disabled src/library/scala/collection/immutable/GenSeq.scala.disabled src/library/scala/collection/immutable/GenSet.scala.disabled src/library/scala/collection/immutable/GenTraversable.scala.disabled src/library/scala/collection/mutable/GenIterable.scala.disabled src/library/scala/collection/mutable/GenMap.scala.disabled src/library/scala/collection/mutable/GenSeq.scala.disabled src/library/scala/collection/mutable/GenSet.scala.disabled src/library/scala/collection/mutable/GenTraversable.scala.disabled src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled
| | * | | Merge branch '2.10.0-wip' into merge-2.10.0Josh Suereth2012-11-05318-335/+400
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * 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.
| | * | | 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.)
* | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-11 01:31:41 +0000