summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix for SI-6664, cycle in case classes.Paul Phillips2012-11-142-7/+8
| | | | | | | | | | Scope lookup of an overloaded symbol was accidentally forcing some lazy info. Since as usual the caller didn't even have any interest in the symbol, but only in whether the name existed at all, I changed it call the method I made for this exact purpose, containsName. Also I much reduced the number of checks being made in the quest for an inherited copy method.
* Merge pull request #1613 from paulp/mutable-settingsPaul Phillips2012-11-132-22/+15
|\ | | | | Address obvious bug in MutableSettings.
| * Address obvious bug in MutableSettings.Paul Phillips2012-11-132-22/+15
| | | | | | | | | | | | If x startsWith "-" it seems unlikely that x == "". Free with purchase: test case with 100 argument permutations. That's only a smidgen shy of infinity.
* | Merge pull request #1599 from jannic/SI-6637Paul Phillips2012-11-131-11/+11
|\ \ | |/ |/| SI-6637
| * Fix SI-6637 (misoptimization in erasure)Jan Niehusmann2012-11-091-11/+11
| | | | | | | | | | Move the optimization one level deeper so the expression being tested with isInstanceOf is always evaluated.
* | Fix merge error.Paul Phillips2012-11-092-1/+2
| | | | | | | | I fixed that already and somehow it didn't appear in my push.
* | Restore briefly awol // 3 in explicitouterPaul Phillips2012-11-091-1/+1
| |
* | A utility function to summarize an exception.Paul Phillips2012-11-092-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Now when I start the repl and trigger an exception during initialization, it offers a one line message like: uncaught exception during compilation: AssertionError("assertion failed: (14,13)") @ scala.reflect.internal.Symbols$Symbol.updateInfo(Symbols.scala:1309) Which is a marked debugging improvement from RC1: uncaught exception during compilation: java.lang.AssertionError
* | Cleanups to the previous repl commits.Paul Phillips2012-11-094-116/+96
| |
* | Moved IMain ops requiring stability into implicit class.Paul Phillips2012-11-092-108/+140
| | | | | | | | | | | | | | | | | | A long-standing annoyance of having IMain stored in a var is that you can't call a method on it which returns a dependent type and then pass that to any other method. I realized I could get around this by creating an implicit class around the var; in the class, it is a val, so the method can be written there, and we implicitly convert from the var on demand.
* | Massively simplified repl name resolution.Paul Phillips2012-11-095-209/+239
| |
* | Massively simplified repl initialization.Paul Phillips2012-11-092-183/+70
| |
* | Minor tweaks in Types/Scopes.Paul Phillips2012-11-094-32/+39
| | | | | | | | | | | | | | | | | | | | | | All methods to do with handling imports more uniformly and early filtering of symbols which cannot be imported. Also make TypeBounds treat a Wildcard in lower or upper bounds as an empty bound, so we don't see all these method signatures like def f[T >: ? <: ?] because that's not helpful.
* | Hardened JavaMirrors against linkage errors.Paul Phillips2012-11-091-7/+4
| | | | | | | | | | | | After running into a ClassCircularityError and following it back to this, I simplified the method to route all linkage errors the same way. And added logging.
* | Remove hostile code from explicitouter.Paul Phillips2012-11-081-3/+0
|/ | | | | If that's the $outer accessor, what's that being created in newOuterAccessor? Sketchy, sketchy business.
* Warn about unused imports.Paul Phillips2012-11-072-58/+149
| | | | | | | Hidden behind -Xlint as usual. This commit also includes further simplification of the symbol lookup logic which I unearthed on the way to reporting unused imports. Plus unusually comprehensive documentation of same.
* A few straggling unused imports.Paul Phillips2012-11-0711-12/+12
|
* Deprecation patrol.Paul Phillips2012-11-0619-41/+40
| | | | Threw in deprecation warning reduction in src/compiler.
* Removed unused imports.Paul Phillips2012-11-06174-393/+79
| | | | | | | | | A dizzying number of unused imports, limited to files in src/compiler. I especially like that the unused import option (not quite ready for checkin itself) finds places where feature implicits have been imported which are no longer necessary, e.g. this commit includes half a dozen removals of "import scala.language.implicitConversions".
* Merge pull request #1576 from paulp/merge-210Adriaan Moors2012-11-061279-2122/+1819
|\ | | | | Merge 2.10.x/2.10.0-RC2 into master
| * 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 04:49:33 +0000