summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | SI-6616 Check that unsafe operations are only called on the presentation ↵Iulian Dragos2012-11-064-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiler thread. The method that checks the actual constraint is @elidable, expecting it to be used for nightly builds but stripped-off in release builds. This way we don't lose any performance, but 'fail-fast' in IDE nightlies. This assumes that release builds will have at least `-Xelide-below ASSERTION`, but this pull request does not do that.
| | * | | | | | | | Merge pull request #1610 from scalamacros/topic/typetags-local-classesEugene Burmako2012-11-122-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | better error when typetagging local classes
| | | * | | | | | | | better error when typetagging local classesEugene Burmako2012-11-122-2/+2
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by https://issues.scala-lang.org/browse/SI-6649
| | * | | | | | | | Merge pull request #1609 from scalamacros/topic/showraw-nodeprintersEugene Burmako2012-11-121-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | -Yshow-trees-compact respects other options
| | | * | | | | | | | -Yshow-trees-compact respects other optionsEugene Burmako2012-11-111-1/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The aforementioned tree printer now respects other tree printing options such as -uniqid and -Xprint-types. This helps debugging reify, which uses `nodePrinters`, not `showRaw` to print its trees, because back then `showRaw` didn't exist yet.
| | * | | | | | | | Merge pull request #1602 from gkossakowski/wrong-implicit-classTagAdriaan Moors2012-11-121-3/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | Fix type of the custom `ClassTag` in `PatternMatching.scala`
| | | * | | | | | | Fix type of the custom `ClassTag` in `PatternMatching.scala`Grzegorz Kossakowski2012-11-091-3/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In fb315772 custom ClassTags were introduced to optimize array creation in hot places. The idea was that if `Array[T]` is allocated through `ClassTag[T]` (which is essentially a factory for Array[T]) we would introduce a custom class implementing `ClassTag[T]` interface and would have specialized array allocation instruction instead of having reflective call as it's being done with default (compiler synthesized) implementation of `ClassTag[T]`. In case of `PatternMatching.scala` I made a mistake of providing `ClassTag[Array[Clause]]` instead of `ClassTag[Clause]` so that value would never be used and compiler still would resolve implicit through default mechanism. This has been discovered thanks to @paulp's work on unused value detection. Review by @paulp.
| | * | | | | | | Merge pull request #1574 from jsuereth/merge-2.10.0Adriaan Moors2012-11-051332-3797/+1970
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | Merge 2.10.0-RC2 into 2.10.x
* | | | | | | | | Merge pull request #1592 from adriaanm/guidelines-masterAdriaan Moors2012-11-161-0/+66
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | show developer guidelines on opening pull request
| * | | | | | | | | show developer guidelines on opening pull requestAdriaan Moors2012-11-081-0/+66
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes "Improvements and typo fixes to CONTRIBUTING.md" by @heathercmiller as well as feedback from @retronym.
* | | | | | | | | Merge pull request #1622 from adriaanm/paulp-issue/5330-2Adriaan Moors2012-11-165-3/+61
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | SI-5330, SI-6014 deal with existential self-type
| * | | | | | | | SI-5330, SI-6014 deal with existential self-typePaul Phillips2012-11-145-3/+61
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been broken since https://github.com/scala/scala/commit/b7b81ca2#L0L567. The existential rash is treated in a similar manner as in fc24db4c. Conceptually, the fix would be `def selfTypeSkolemized = widen.skolemizeExistential.narrow`, but simply widening before narrowing achieves the same thing. Since we're in existential voodoo territory, let's go for the minimal fix: replacing `this.narrow` by `widen.narrow`. -- Original patch by @retronym in #1074, refined by @paulp to only perform widen.narrow incantation if there are existentials present in the widened type, as narrowing is expensive when the type is not a singleton. The result is that compiling the entirety of quick, that code path is hit only 143 times. All the other calls hit .narrow directly as before. It looks like the definition of negligible in the diff of -Ystatistics when compiling src/library/scala/collection: < #symbols : 306315 --- > #symbols : 306320 12c13 < #unique types : 293859 --- > #unique types : 293865 I'm assuming based on the 2/1000ths of a percent increase in symbol and type creation that wall clock is manageable, but I didn't measure it.
* | | | | | | | Merge pull request #1629 from paulp/issue/6355Paul Phillips2012-11-154-1/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Error for SI-6355, overloading of applyDynamic.
| * | | | | | | | Error for SI-6355, overloading of applyDynamic.Paul Phillips2012-11-144-1/+27
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as it can never be called anyway, seems like we'd be doing people a kindness to fail the compile rather than letting it be ambiguous at every use site.
* | | | | | | | Merge pull request #1627 from paulp/issue/6664Paul Phillips2012-11-154-7/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for SI-6664, cycle in case classes.
| * | | | | | | | Fix for SI-6664, cycle in case classes.Paul Phillips2012-11-144-7/+17
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1631 from paulp/typed-applyPaul Phillips2012-11-151-43/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Lower confusion levels in typedApply.
| * | | | | | | | Lower confusion levels in typedApply.Paul Phillips2012-11-141-43/+25
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's the usual thing, making logic more logical and removing comments which are incorrect and/or no longer useful.
* | | | | | | | Merge pull request #1632 from paulp/ack-flagPaul Phillips2012-11-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix bug in partest-ack.
| * | | | | | | | Fix bug in partest-ack.Paul Phillips2012-11-141-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunate bug was making it far less useful than it was supposed to be. Now it really does look in scala/check/flags files, here are examples of things which work: % tools/partest-ack "input ended while parsing XML" Found 6 tests matching 'ack input ended while parsing XML' % tools/partest-ack Xlint Found 11 tests matching 'ack Xlint' % tools/partest-ack -- -language:experimental.macros Found 143 tests matching 'ack -- -language:experimental.macros' % tools/partest-ack @unchecked Found 13 tests matching 'ack @unchecked'
* | | | | | | | Merge pull request #1630 from jedesah/masterPaul Phillips2012-11-141-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix Documentation Typo
| * | | | | | | Fix Documentation TypoJean-Remi Desjardins2012-11-141-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a typo on the if. I also thought it might be worth rephrasing the paragraph because it seemed a bit contrived. It's a trivial fix, but it would allow us to close a bug in the issue tracker which seems worthwhile to me.
* | | | | | | Merge pull request #1613 from paulp/mutable-settingsPaul Phillips2012-11-134-22/+608
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Address obvious bug in MutableSettings.
| * | | | | | | Address obvious bug in MutableSettings.Paul Phillips2012-11-134-22/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-133-11/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | SI-6637
| * | | | | | | Fix SI-6637 (misoptimization in erasure)Jan Niehusmann2012-11-093-11/+20
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the optimization one level deeper so the expression being tested with isInstanceOf is always evaluated.
* | | | | | | Merge pull request #1600 from jannic/t2318Paul Phillips2012-11-121-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix t2318.scala
| * | | | | | | fix t2318.scalaJan Niehusmann2012-11-091-1/+2
| |/ / / / / /
* | | | | | | Merge pull request #1604 from paulp/fix-mergePaul Phillips2012-11-092-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix merge error.
| * | | | | | | Fix merge error.Paul Phillips2012-11-092-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | I fixed that already and somehow it didn't appear in my push.
* | | | | | | Merge pull request #1573 from paulp/repl-checkinPaul Phillips2012-11-0916-607/+550
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revamp of some repl mechanisms.
| * | | | | | | 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-095-117/+97
| | | | | | | |
| * | | | | | | Moved IMain ops requiring stability into implicit class.Paul Phillips2012-11-093-110/+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-097-211/+241
| | | | | | | |
| * | | | | | | 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.
* | | | | | | Merge pull request #1595 from paulp/explicit-outer-fixPaul Phillips2012-11-091-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove hostile code from explicitouter.
| * | | | | | | 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.
* | | | | | | Merge pull request #1591 from paulp/new-starrPaul Phillips2012-11-096-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | New starr based on 4f98d50bc2 .
| * | | | | | New starr based on 4f98d50bc2 .Paul Phillips2012-11-086-6/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Contains the extension method naming change, in the interests of unbreaking the sbt build for a while.
* | | | | | Merge pull request #1587 from paulp/unused-importsPaul Phillips2012-11-07189-503/+449
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Warn about unused imports.
| * | | | | Warn about unused imports.Paul Phillips2012-11-075-58/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061322-3780/+1984
|\ \ \ \ \ | |_|_|_|/ |/| | | | Merge 2.10.x/2.10.0-RC2 into master
| * | | | Merge commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-051322-3780/+1984
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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