summaryrefslogtreecommitdiff
path: root/src/library
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'merge-2.10-wip' into merge-2.10Paul Phillips2012-12-052-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722. Asserts about Tree qualifiers. Fix for SI-6731, dropped trees in selectDynamic. neg test added SI-5753 macros cannot be loaded when inherited from a class or a trait Take advantage of the margin stripping interpolator. Adds a margin stripping string interpolator. SI-6718 fixes a volatile test Mark pattern matcher synthetics as SYNTHETIC. Set symbol flags at creation. Fix for SI-6687, wrong isVar logic. Fix for SI-6706, Symbol breakage under GC. findEntry implementation code more concise and DRYer. Fix for SI-6357, cycle with value classes. Refactoring of adaptMethod SI-6677 Insert required cast in `new qual.foo.T` Conflicts: src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/internal/SymbolTable.scala src/reflect/scala/reflect/internal/util/package.scala test/files/neg/gadts1.check
| * Merge pull request #1663 from paulp/merge-2.10.wip-xAdriaan Moors2012-11-2510-62/+22
| |\ | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ Merge pull request #1652 from jedesah/FlatHashTableAdriaan Moors2012-11-251-7/+6
| |\ \ | | | | | | | | findEntry implementation code more concise and DRYer.
| | * | findEntry implementation code more concise and DRYer.Jean-Remi Desjardins2012-11-201-7/+6
| | | |
| * | | Fix for SI-6706, Symbol breakage under GC.Paul Phillips2012-11-231-0/+5
| |/ / | | | | | | | | | | | | | | | Ensure the map key and the String in the Symbol are the same reference by removing the old key before updating the map with the new key -> symbol relation.
* | | Fix for SerialVersionUID instability.Paul Phillips2012-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can hardly believe this has been broken for a decade or so, but there it is - see test case. Four classes attempt to set their SerialVersionUID to 13. One succeeds. No warnings or errors. The output before this patch (for me anyway - your random numbers may differ) was: 860336111422349646 13 8409527228024057943 -7852527872932878365 There was already code in place for rejecting annotations with non-constant args when constant args are required, but that check is only performed on ClassfileAnnotations, and SerialVersionUID was a StaticAnnotation. Maybe people don't reach for ClassfileAnnotation because of this giant warning which I see no way to suppress: warning: Implementation restriction: subclassing Classfile does not make your annotation visible at runtime. If that is what you want, you must write the annotation class in Java. Why did I change the name of the field from uid to value? If you don't use the name 'value', you have to name the argument every time you use it, even if it's the only parameter. I didn't relish breaking every usage of scala's @SerialVersionUID in the known universe.
* | | Merge branch 'merge-2.10.wip-x' into merge-2.10.x-masterPaul Phillips2012-11-2314-98/+87
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10.wip-x: (24 commits) SI-6023 reify abstract vals Removing controversial `either` method from Futures API. SI-6695 Test case for fixed Array match bug adds comments to standard attachments SI-6673 fixes macro problems with eta expansions Restore the opimization apparently lost after merge. SI-6624 set info of case pattern binder to help find case field accessors Scaladoc update for collection.mutable.MultiMap SI-6663: don't ignore type parameter on selectDynamic invocation SI-6551: don't insert apply call in polymorphic expression. SI-6634 Fixes data corruption issue in ListBuffer#remove Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6150 - backport to 2.10.x branch. SI-5330, SI-6014 deal with existential self-type Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped sane printing of renamed imports SI-6440 Address regressions around MissingRequirementError ... Conflicts: src/library/scala/collection/generic/IndexedSeqFactory.scala src/library/scala/collection/mutable/ListBuffer.scala src/reflect/scala/reflect/internal/Symbols.scala src/reflect/scala/reflect/internal/Types.scala test/files/run/t6150.scala
| * | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-xPaul Phillips2012-11-2310-62/+22
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jason Zaugg (8) and others # Via Adriaan Moors (6) and Josh Suereth (5) * origin/2.10.0-wip: Removing controversial `either` method from Futures API. SI-6624 set info of case pattern binder to help find case field accessors Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped Update comment. SI-6646 `ident` or Ident is always new binding. SI-6440 Address regressions around MissingRequirementError Refine the message and triggering of MissingRequirementError. SI-6640 Better reporting of deficient classpaths. SI-6644 Account for varargs in extmethod forwarder SI-6646 Fix regression in for desugaring. Update tools/epfl-publish
| | * Removing controversial `either` method from Futures API.Josh Suereth2012-11-211-23/+0
| | | | | | | | | | | | | | | * Removes `either` from Future * No tests need to change, since this was an untested method.
| | * Merge pull request #1636 from paulp/issue/6628Adriaan Moors2012-11-168-36/+20
| | |\ | | | | | | | | Fixes SI-6628, Revert "Fix for view isEmpty."
| | | * Fixes SI-6628, Revert "Fix for view isEmpty."Paul Phillips2012-11-158-36/+20
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit caf7eb6b56817fd1e1fbc1cf017f30e6f94c6bea. I don't have a better idea right now than wholesale reversion.
| | * | Merge pull request #1616 from retronym/backport/6559Adriaan Moors2012-11-161-1/+1
| | |\ \ | | | | | | | | | | SI-6559 Fix raw string interpolator: string parts which were after the first argument were still escaped
| | | * | Fix raw string interpolator: string parts which were after the first ↵Julien Richard-Foy2012-11-131-1/+1
| | | |/ | | | | | | | | | | | | argument were still escaped
| | * / SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise methodphaller2012-11-151-3/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | Clarification of @heathermiller: This is an inconsistency introduced after refactoring implicit ExecutionContexts. In commit 1dfce90246f7d334 the implicit ExecutionContexts were removed from everything else in Promise.scala, but it appears that method promise was missed in the scala.concurrent package object, which would've made sense to remove back then.
| * | Merge pull request #1596 from soc/SI-6632+SI-6633Josh Suereth2012-11-201-49/+44
| |\ \ | | | | | | | | SI-6632 SI-6633 Fixes issues and data corruption in ListBuffer
| | * | SI-6632 SI-6633 Fixes issues and data corruption in ListBufferSimon Ochsenreither2012-11-091-49/+44
| | | | | | | | | | | | | | | | | | | | - Disallow negative positions for ListBuffer#insert/insertAll/update - Fix data corruption issue in ListBuffer#insert
| * | | Merge pull request #1597 from soc/SI-6634Josh Suereth2012-11-201-0/+5
| |\ \ \ | | | | | | | | | | SI-6634 Fixes data corruption issue in ListBuffer#remove
| | * | | SI-6634 Fixes data corruption issue in ListBuffer#removeSimon Ochsenreither2012-11-161-0/+5
| | |/ / | | | | | | | | | | | | | | | | This is the cut-down version with minimally invasive changes, e. g. keeping the "auto-correcting" bounds algorithm.
| * | | Merge pull request #1641 from sschaef/doc-update/multimapJosh Suereth2012-11-201-3/+32
| |\ \ \ | | | | | | | | | | Scaladoc update for collection.mutable.MultiMap
| | * | | Scaladoc update for collection.mutable.MultiMapSimon Schaefer2012-11-171-3/+32
| | |/ / | | | | | | | | | | | | | | | | | | | | Addition of source code example on how to use a MultiMap and its defined methods. Minor correction in documentation for method `removeBinding`.
| * / / Fixes SI-6150 - backport to 2.10.x branch.Aleksandar Prokopec2012-11-145-31/+47
| |/ /
* | | Merge pull request #1570 from retronym/ticket/6448Adriaan Moors2012-11-216-12/+17
|\ \ \ | | | | | | | | SI-6448 Collecting the spoils of PartialFun#runWith
| * | | SI-6448 Collecting the spoils of PartialFun#runWithJason Zaugg2012-11-046-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids calling both `isDefinedAt` and `apply`. This pathological case that would benefit the most looks like: xs collect { case x if {expensive(); true} => x } The typical change looks like: - for (x <- this) if (pf.isDefinedAt(x)) b += pf(x) + foreach(pf.runWith(b += _)) Incorporates feedback provided by Pavel Pavlov: https://github.com/retronym/scala/commit/ef5430 A few more opportunities for optimization are noted in the `Pending` section of the enclosed test. `Iterator.collect` would be nice, but a solution eludes me. Calling the guard less frequently does change the behaviour of these functions in an obervable way, but not contravene the documented semantics. That said, there is an alternative opinion on the comment of the ticket: https://issues.scala-lang.org/browse/SI-6448
* | | | Removing ancient comments and pointless comments.Paul Phillips2012-11-194-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translating <code></code> into backticks. Removed the "@param tree ..." blocks which have been taunting me for half a decade now. Removed commented-out blocks of code which had been sitting there for two years or more.
* | | | Remove unused imports in library.Paul Phillips2012-11-1970-185/+13
| | | |
* | | | Merge pull request #1586 from retronym/ticket/6247Adriaan Moors2012-11-161-0/+10
|\ \ \ \ | | | | | | | | | | Optimize primitive Array(e1, ..., en)
| * | | | Optimize primitive Array(e1, ..., en)Jason Zaugg2012-11-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expands an existing optimization for reference arrays to apply to primitives, as well. Fixes one aspect of SI-6247.
* | | | | 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 commit 'refs/pull/1574/head' into merge-210Paul Phillips2012-11-05626-644/+683
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-05638-655/+691
| |\|
| | * Merge pull request #1559 from heathermiller/copyright-updateJosh Suereth2012-11-04638-643/+643
| | |\ | | | | | | | | Updated copyright dates throughout compiler and stdlib for upcoming release
| | | * Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-02638-643/+643
| | | |
| | * | 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.
| | * | Typo-fix in scala.concurrent.Future, thanks to @pavelpavlovHeather Miller2012-11-021-1/+1
| | | |
| | * | SI-6399 Adds API docs for Any and AnyValHeather Miller2012-11-021-5/+32
| | |/ | | | | | | | | | | | | - Updates AnyVal docs to address value classes. - Updates Any docs to address universal traits.
| * | 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.
* | | Removing unused locals and making vars into vals.Paul Phillips2012-11-0320-46/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Remove unused private members.Paul Phillips2012-11-0118-96/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Implementation of Stream#dropRight.Paul Phillips2012-11-011-6/+26
| | | | | | | | | | | | | | | "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-011-3/+10
| | | | | | | | | | | | Nesting recursive calls in Stream is always a dicey business.
* | | Merge pull request #1512 from paulp/merge-210Adriaan Moors2012-10-227-74/+100
|\ \ \ | | | | | | | | Merge 2.10.x into master.
| * | | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2012-10-197-74/+100
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/2.10.x: (52 commits) JavaUniverse Moved @contentDiagram in Symbols Adds lots of new documentation for TypeTags, Mirrors, Universes and more runtime.JavaUniverse - put ungrouped members at the top Forgotten annotation in Annotations Diagram tweaking Grouping for reflection and macros fixes a typo scala.reflect.api.Symbols documentation Symbols docs cleanup, mostly moved to guide scala.reflect.api.Position documentation scala.reflect.api.StandardNames documentation scala.reflect.api.Constants documentation removed docs for internal TypeCreator and TreeCreator simplified reflection docs for trees Rearranged some reflection docs, moving things to the guide reflection docs improvements and moves to doc page docs for reflection and macros SI-6509 Correct @template owners SI-6155 Scaladoc @template diagrms ... Conflicts: src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/api/Trees.scala test/scaladoc/run/links.scala
| | * | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-210-wip-210Paul Phillips2012-10-1611-85/+119
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Eugene Burmako (23) and others # Via Josh Suereth (12) and others * origin/2.10.0-wip: (54 commits) JavaUniverse Moved @contentDiagram in Symbols Adds lots of new documentation for TypeTags, Mirrors, Universes and more runtime.JavaUniverse - put ungrouped members at the top Forgotten annotation in Annotations Diagram tweaking Grouping for reflection and macros fixes a typo scala.reflect.api.Symbols documentation Symbols docs cleanup, mostly moved to guide scala.reflect.api.Position documentation scala.reflect.api.StandardNames documentation scala.reflect.api.Constants documentation removed docs for internal TypeCreator and TreeCreator simplified reflection docs for trees Rearranged some reflection docs, moving things to the guide reflection docs improvements and moves to doc page docs for reflection and macros SI-6509 Correct @template owners SI-6155 Scaladoc @template diagrms ...
| | | * Merge pull request #1492 from scalamacros/pullrequest/reflection-docsv2.10.0-RC1Josh Suereth2012-10-111-10/+25
| | | |\ | | | | | | | | | | Pullrequest/reflection docs
| | | | * Adds lots of new documentation for TypeTags, Mirrors, Universes and moreHeather Miller2012-10-111-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Additionally includes improvements, formatting fixes, and link additions and fixes.
| | | * | Merge pull request #1489 from heathermiller/issue/6453Josh Suereth2012-10-111-2/+1
| | | |\ \ | | | | |/ | | | |/| SI-6453 Documentation links for @switch are broken
| | | | * SI-6453 Documentation links for @switch are brokenHeather Miller2012-10-101-2/+1
| | | | |
| | | * | Merge pull request #1486 from heathermiller/issue/6099Josh Suereth2012-10-102-56/+69
| | | |\ \ | | | | |/ | | | |/| SI-6099 - Scaladoc for scala.concurrent incomplete
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-09 01:46:24 +0000