Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 20, 2011
  1. Fixing an incomplete svnmerge; second, merge ag...

    Antonio Cunei authored
    Fixing an incomplete svnmerge; second, merge again from trunk.
  2. Fixing an incomplete svnmerge; first, revert to...

    Antonio Cunei authored
    Fixing an incomplete svnmerge; first, revert to r24726.
Commits on Apr 19, 2011
  1. Merged revisions 24749-24771,24773-24774,24776-...

    Antonio Cunei authored
    Merged revisions 24749-24771,24773-24774,24776-24779 via svnmerge from
    https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
    
    ........
      r24749 | odersky | 2011-04-13 17:07:21 +0200 (Wed, 13 Apr 2011) | 1 line
    
      Fixes my part of #4283 by inserting another cast pre-emptively when an
    IllegalAccess error is possible in an erasure-inserted cast. Review by
    extempore. ........ r24750 | dragos | 2011-04-13 18:15:37 +0200 (Wed, 13
    Apr 2011) | 1 line
    
      Warn when the jar file cannot be found when loading a plugin. no
    review. ........ r24751 | dragos | 2011-04-13 18:15:43 +0200 (Wed, 13
    Apr 2011) | 1 line
    
      Closes #4283. no review.
    ........
      r24752 | prokopec | 2011-04-13 18:31:42 +0200 (Wed, 13 Apr 2011) | 45 lines
    
      Refactoring the collections api to support differentiation between
    referring to a sequential collection and a parallel collection, and to
    support referring to both types of collections.
    
      New set of traits Gen* are now superclasses of both their * and Par* subclasses. For example, GenIterable is a superclass of both Iterable and ParIterable. Iterable and ParIterable are not in a subclassing relation. The new class hierarchy is illustrated below (simplified, not all relations and classes are shown):
    
      TraversableOnce --> GenTraversableOnce
        ^                    ^
        |                    |
      Traversable     --> GenTraversable
        ^                    ^
        |                    |
      Iterable        --> GenIterable        <-- ParIterable
        ^                    ^                      ^
        |                    |                      |
      Seq             --> GenSeq             <-- ParSeq
    
      (the *Like, *View and *ViewLike traits have a similar hierarchy)
    
      General views extract common view functionality from parallel and
    sequential collections.
    
      This design also allows for more flexible extensions to the
    collections framework. It also allows slowly factoring out common
    functionality up into Gen* traits.
    
      From now on, it is possible to write this:
    
      import collection._
    
      val p = parallel.ParSeq(1, 2, 3)
      val g: GenSeq[Int] = p // meaning a General Sequence
      val s = g.seq // type of s is Seq[Int]
    
      for (elem <- g) {
        // do something without guarantees on sequentiality of foreach
        // this foreach may be executed in parallel
      }
    
      for (elem <- s) {
        // do something with a guarantee that foreach is executed in order, sequentially
      }
    
      for (elem <- p) {
        // do something concurrently, in parallel
      }
    
      This also means that some signatures had to be changed. For example,
    method `flatMap` now takes `A => GenTraversableOnce[B]`, and `zip` takes
    a `GenIterable[B]`.
    
      Also, there are mutable & immutable Gen* trait variants. They have
    generic companion functionality. ........ r24753 | prokopec | 2011-04-13
    18:31:58 +0200 (Wed, 13 Apr 2011) | 3 lines
    
      Fixes and closes #4405.
    
      No review.
    ........
      r24754 | prokopec | 2011-04-13 18:32:01 +0200 (Wed, 13 Apr 2011) | 3 lines
    
      Fixed some tests, renamed from Any to Gen.
    
      No review.
    ........
      r24755 | prokopec | 2011-04-13 18:32:04 +0200 (Wed, 13 Apr 2011) | 3 lines
    
      Further fixes #4405.
    
      No review.
    ........
      r24756 | prokopec | 2011-04-13 18:32:09 +0200 (Wed, 13 Apr 2011) | 3 lines
    
      Added test case for #4459.
    
      No review.
    ........
      r24757 | extempore | 2011-04-13 21:00:56 +0200 (Wed, 13 Apr 2011) | 1 line
    
      New starr based on r24749.  No review.
    ........
      r24758 | dragos | 2011-04-13 21:12:57 +0200 (Wed, 13 Apr 2011) | 1 line
    
      Revert "Closes #4283. no review." because of failing tests. ........
    r24759 | extempore | 2011-04-14 06:15:50 +0200 (Thu, 14 Apr 2011) | 2
    lines
    
      Tests which run have to be called "Test". Fixes failing test and
    renames file to avoid ant's brainlessness, no review. ........ r24760 |
    extempore | 2011-04-14 08:38:35 +0200 (Thu, 14 Apr 2011) | 9 lines
    
      Doing a little polishing on the parallel collections refactor (which
      overall looks like a big improvement.) I went for some simpler wording
      and moved a number of scaladoc tags around because the rug had been
      pulled out from under their feet.
    
      This leaves a lot undone, but since many of the docs need to be
    reworded before they can move from e.g. SeqLike to GenSeqLike, and I'm
    not well informed on exactly how these abstractions are being presented,
    I stayed in the safe zone. Review by prokopec. ........ r24761 | phaller
    | 2011-04-14 11:11:10 +0200 (Thu, 14 Apr 2011) | 1 line
    
      Closed #4454. Applied patch provided in ticket. No review. ........
    r24762 | dragos | 2011-04-14 15:48:00 +0200 (Thu, 14 Apr 2011) | 1 line
    
      This time, fixed #4283. no review.
    ........
      r24763 | extempore | 2011-04-14 16:25:46 +0200 (Thu, 14 Apr 2011) | 4 lines
    
      Of late the test which fires up the window server, which has already
    been the source of undue quantities of inconvenience, has taken to
    hanging indefinitely when I run the test suite on a remote machine. Rope
    at end, goodbye test, no review. ........ r24764 | prokopec | 2011-04-14
    18:09:33 +0200 (Thu, 14 Apr 2011) | 4 lines
    
      Adding some docs refactorings.
      Also, added some docs variables to Gen* traits that were missing.
    
      No review.
    ........
      r24765 | extempore | 2011-04-14 21:33:39 +0200 (Thu, 14 Apr 2011) | 2 lines
    
      Some patches to jline, and new jar. Thanks to Kenji Matsuoka for
    improving the keybindings. No review. ........ r24766 | extempore |
    2011-04-14 23:05:12 +0200 (Thu, 14 Apr 2011) | 3 lines
    
      Adds "since" field to @deprecated. Thanks to Simon Ochsenreither
    for the patch, as it's a change I've always wanted. Moving up in the
    glamorous world of scala commits! No review. ........ r24767 | extempore
    | 2011-04-14 23:06:14 +0200 (Thu, 14 Apr 2011) | 3 lines
    
      Various addenda to soc's patch: regenerating Product/Tuple/Function
    classes and AnyVal sources, making versioning consistent, etc. Closes
    #4477, no review. ........ r24768 | extempore | 2011-04-15 04:39:32
    +0200 (Fri, 15 Apr 2011) | 3 lines
    
      Some mopping up having to do with deprecated gaining an argument,
    which may or may not cure scaladoc of its current assertion failure. No
    review. ........ r24769 | extempore | 2011-04-15 07:05:53 +0200 (Fri, 15
    Apr 2011) | 1 line
    
      Fixing a couple more tests, no review.
    ........
      r24770 | extempore | 2011-04-15 08:55:32 +0200 (Fri, 15 Apr 2011) | 6 lines
    
      Having been tortured by remorse ever since tiark told me that r23934
    had made the hashmap slower, I crushed my previous efforts under the
    heel of my boot, threw all the types out the window, poured acid on
    them, and turned all the dials to the far other extreme. Pity the man
    who will sell his soul for a few CPU cycles. (I am that man.) Review by
    rompf. ........ r24771 | prokopec | 2011-04-15 09:54:54 +0200 (Fri, 15
    Apr 2011) | 3 lines
    
      Couple of fixes to the usecases in docs.
    
      No review.
    ........
      r24773 | kzys | 2011-04-15 18:12:22 +0200 (Fri, 15 Apr 2011) | 2 lines
    
      [scaladoc] Strike-through for deprecated symbols on the reference
    index. Closes #4471. Review by dubochet. ........ r24774 | extempore |
    2011-04-15 23:03:44 +0200 (Fri, 15 Apr 2011) | 3 lines
    
      Added a script in tools for deploying maven artifacts locally, since
    it always takes me an eternity to figure out slash remember how to do
    it. No review. ........ r24776 | extempore | 2011-04-17 21:58:15 +0200
    (Sun, 17 Apr 2011) | 2 lines
    
      Added releaseVersion and developmentVersion to Properties so people
    don't all have to parse the versionString. No review. ........ r24777 |
    extempore | 2011-04-17 23:28:03 +0200 (Sun, 17 Apr 2011) | 1 line
    
      Revised that last botched commit.  No review.
    ........
      r24778 | odersky | 2011-04-19 11:52:59 +0200 (Tue, 19 Apr 2011) | 1 line
    
      Trying to get build times down by refining implicit searches. Implicit
    infos associated with toplevel classes are cached now. Review by rompf.
    ........ r24779 | odersky | 2011-04-19 12:56:58 +0200 (Tue, 19 Apr 2011)
    | 1 line
    
      Further optimizations of implicits. Now, improves checks between
    static members are cached as well. Review by rompf. ........
Commits on Jun 18, 2010
  1. @axel22

    Moved parallel collections to library dir, chan...

    axel22 authored
    Moved parallel collections to library dir, changed sabbus script. Added
    `par` to some of the classes. No review.
Something went wrong with that request. Please try again.