summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-051279-2122/+1819
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-051292-2139/+1834
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge pull request #1566 from densh/topic/asSeenFrom-exampleJosh Suereth2012-11-041-4/+20
| | | |\ | | | | | | | | | | Fixes example in Type.asSeenFrom
| | | | * Fixes example in Type.asSeenFromDen Shabalin2012-11-031-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was written in some form of non-executable pseudo-code before and that might be quite confusing for people who are not familiar with scala reflection.
| | | * | Merge pull request #1559 from heathermiller/copyright-updateJosh Suereth2012-11-041240-1249/+1248
| | | |\ \ | | | | |/ | | | |/| 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-022-2/+2
| | | | | | | | | | | | | | | | | | | | 2013
| | | | * Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-021240-1247/+1246
| | | | |
| | | * | Merge pull request #1562 from paulp/issue/6600Josh Suereth2012-11-022-6/+15
| | | |\ \ | | | | | | | | | | | | Fix for SI-6600, regression with ScalaNumber.
| | | | * | Fix for SI-6600, regression with ScalaNumber.Paul Phillips2012-11-022-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not much in the end; I divided ScalaNumericConversions into two traits such that the ScalaNumericAnyConversions can be used in value classes, and ScalaNumericConversions can override methods in ScalaNumber (since one trait cannot do both those things.) The fact that ScalaNumber is privileged for equality but a) extends java.lang.Number and therefore b) cannot be a value class is something we will want to revisit real soon.
| | | * | | SI-6562 Fix crash with class nested in @inline methodJason Zaugg2012-11-023-8/+17
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| | | * | SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordingsHeather Miller2012-11-0226-194/+227
| | | | |
| | | * | Labeling scala.reflect and scala.reflect.macros experimental in the API docsHeather Miller2012-11-0238-56/+184
| | | | | | | | | | | | | | | | | | | | | | | | | - Added the labels across scala.reflect and scala.reflect.macros - Added the styling in template.css that is used by all labels
| | | * | Typo-fix in scala.concurrent.Future, thanks to @pavelpavlovHeather Miller2012-11-021-1/+1
| | | | |
| | | * | Remove implementation details from Position (they are still under ↵Hubert Plociniczak2012-11-021-29/+2
| | | | | | | | | | | | | | | | | | | | 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 AnyValHeather Miller2012-11-022-5/+51
| | | |/ | | | | | | | | | | | | | | | | - Updates AnyVal docs to address value classes. - Updates Any docs to address universal traits.
| | | * 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 #1542 from adriaanm/odersky-ticket/6556v2Adriaan Moors2012-11-011-1/+13
| | | |\ \ | | | | | | | | | | | | SI-6556 no assert for surprising ctor result type
| | | | * | SI-6556 no assert for surprising ctor result typeMartin Odersky2012-10-301-1/+13
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous fix to value classes uncovered some questionable cases in the backend where result types of constructor signatures are surprising. It's not a big deal because these types will be ignored afterwards anyway. But the method uncovered some questionable situations which we should follow up on. However, breaking 2.9 code because of this is way too harsh. That's why the asserts were converted to warnings. review by @paulp, @adriaanm
| | | * | Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-11-011-74/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
| | | * | Merge branch '2.10.0-wip' of github.com:scala/scala into 2.10.0-wipJosh Suereth2012-11-0110-35/+77
| | | |\ \
| | | | * \ 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 #1536 from vjovanov/issues/SI-6581Josh Suereth2012-10-312-6/+6
| | | | |\ \ | | | | | | | | | | | | | | SI-6581 fixed by inlining `Actor.self`.
| | | | | * | SI-6581 fixed by inlining `Actor.self`.Vojin Jovanovic2012-10-302-6/+6
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the necessary type cast that was preventing leakage of internal migration classes. Review by @phaller
| | | | * | 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.
| | | * | / Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-3016-501/+3
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
| | * | | 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 #1546 from paulp/merge-2.10.0-wipJosh Suereth2012-10-3114-741/+211
| | |\ \ \ | | | | | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| | * \ \ \ Merge pull request #1522 from possiblywrong/2.10.xJosh Suereth2012-10-311-1/+4
| | |\ \ \ \ | | | | | | | | | | | | | | SI-6488: Fix for race with open I/O fds
| | | * | | | SI-6488: Stop I/O threads prior to Process destructionDeclan Conlon2012-10-261-1/+4
| | | | | | |
| | * | | | | Fixes SI-6559 - StringContext not using passed in escape function.Josh Suereth2012-10-301-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | As reported by Curtis Stanford, with indication of what to fix. standardInterpolator was not correctly calling the passed in process function, so raw strings were not really raw.
* | | | | | Revert "Expand optimization of Array(e1, ..., en) to primitive arrays."Jason Zaugg2012-11-063-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8265175ecc42293997d59049f430396c77a2b891.
* | | | | | Revert "Refactor guards checking for a particular overload of Array.apply."Jason Zaugg2012-11-062-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 092345a24c22a821204fb358d33272ae8f7353be.
* | | | | | Merge pull request #1568 from retronym/ticket/6611Paul Phillips2012-11-054-14/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | SI-6611 Tighten up an unsafe array optimization
| * | | | | Refactor guards checking for a particular overload of Array.apply.Jason Zaugg2012-11-042-9/+4
| | | | | |
| * | | | | Expand optimization of Array(e1, ..., en) to primitive arrays.Jason Zaugg2012-11-043-6/+24
| | | | | |
| * | | | | SI-6611 Tighten up an unsafe array optimizationJason Zaugg2012-11-032-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The net was cast too wide and was unsafely optimizing away array copies.
* | | | | | Merge pull request #1554 from paulp/scope-lookupPaul Phillips2012-11-046-92/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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-024-47/+25
| | | | | | |
| * | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-26 00:17:44 +0000