summaryrefslogtreecommitdiff
path: root/src/library
Commit message (Collapse)AuthorAgeFilesLines
...
| * changed applyDynamic explanation in trait DynamicDominik Gruntz2012-04-111-1/+1
|/
*-. Merge commit 'refs/pull/365/head'; commit 'refs/pull/366/head' into developPaul Phillips2012-04-102-2/+6
|\ \
| | * SI-5571: adds @volatile to field Enumeration.vsetDefinedDominik Gruntz2012-04-101-1/+1
| |/ |/|
| * fix field init problem in NoStackTraceAdriaan Moors2012-04-101-1/+5
|/
* SI-4540 Fix [RichDouble|RichFloat|RichLong].isValid[Byte|Short|Char|Int].Dmitry Nadezhin2012-04-083-0/+32
| | | | | | | | | | This commit fixes test cases mentioned in comment 03/Apr/12 to SI-4540. Methods are fixed in leaf classes RichDouble|RichFloat|RichLong. Their superclasses are not modified. File is-valid-num.scala contains commented tests of isValidLong|isValidFloat|isValidLong, but they are not added anywhere now.
* Small simplification of commit 87c9fc0df0f0e74d3a07f95634356d6425877091.Dmitry Nadezhin2012-04-071-11/+3
| | | | | eqTypeCode(Number) is equivalent to typeCode(Number). CHAR code is impossible because java.lang.Character is not subclass of java.lang.Number.
* Merge commit 'pull/358/head' into developPaul Phillips2012-04-061-0/+9
|\
| * Merge branch 'master' into topic/reflectMartin Odersky2012-04-0519-178/+411
| |\
| * | Added overloading resolution to reflect.api.SymbolMartin Odersky2012-04-051-0/+9
| | |
* | | fix memory leak in Iterator.++David Andrzejewski2012-04-061-1/+3
| | |
* | | Make NumericRange# O(1) instead of O(n).Simon Ochsenreither2012-04-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes me a bit nervous that NumericRange[Int] will get different wrong values in overflow situations compared to Range due to the missing toLong though. It could probably need some investigation if reordering the operations can rule out wrong values, e. g. only fail when the fold also fails. Apart from that, it might make sense to just throw an exception if an overflow happens instead of silent overflow.
* | | A little BoxesRunTime fix.Paul Phillips2012-04-061-2/+2
| | | | | | | | | | | | That's why we have those nice test cases.
* | | Giving HotSpot a better chance at BoxesRunTime.Paul Phillips2012-04-061-202/+163
| | | | | | | | | | | | Reusing small, simple methods rather than lots of cut and paste.
* | | Merge commit 'refs/pull/355/head^'Paul Phillips2012-04-051-1/+1
|\ \ \
| * | | avoid field init prob: make NoTreeAnnotation a defAdriaan Moors2012-04-051-1/+1
| | |/ | |/|
* | | Merge branch 'develop'Paul Phillips2012-04-057-34/+46
|\ \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-----. \ \ Merge commit 'refs/pull/353/head'; commit 'refs/pull/354/head'; commit ↵Paul Phillips2012-04-057-34/+46
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | 'refs/pull/356/head'; commit 'refs/pull/337/head'; commit 'refs/pull/339/head' into develop
| | | | | * | SIP-11 String Interpolation SimplificationDominik Gruntz2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed StringContext.f which implements the formatted string interpolator. Any '%' not in formatting position is left in the resulting string literally. However, instead of adding '%s' format holders and extending the args with "%" expressions, these '%' are replaced by '%%'. The formatter then converts '%%' (percent formatter) to the literal % (\u0025). The interpolation tests still pass.
| | | | | * | SIP-11 String Interpolation SimplificationDominik Gruntz2012-03-281-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed StringContext.f which implements the formatted string interpolator. Any '%' not in formatting position is left in the resulting string literally. However, instead of adding %s format holders and extending the args with "%" expressions, these '%' are replaced by '%%'. The formatter then converts '%%' (percent formatter) to the literal '%' (\u0025). This also simplifies the spec. The interpolation tests still pass.
| | | | | * | String interpolation bug fixDominik Gruntz2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug in class StringContext.scala. Parts were not correctly added to the resulting string. This commit includes a test case which covers the example reported in the bug. Closes SI-5614.
| | | | * | | Fixed broken links in sources of scala/annotationDominik Gruntz2012-04-052-3/+3
| | | | |/ /
| | | * / / Add some ExecutionContext factories.Aleksandar Prokopec2012-04-044-16/+30
| | |/ / /
* | / / / A boatload of work on Symbols and Flags.Paul Phillips2012-04-052-2/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Finally my dream of orderliness is within sight. It's all pretty self-explanatory. More polymorphism, more immutable identity, more invariants.
* / / / Added Option#fold.Paul Phillips2012-04-041-0/+12
|/ / /
* | | Remedies Try/Either signature disparity for source compat. w/ AkkaHeather Miller2012-04-038-115/+120
| | |
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge remote-tracking branches 'axel22/feature/future-compat', ↵Paul Phillips2012-04-0224-90/+373
|\ \ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | 'dlwh/issues/5632', 'jsuereth/feature/import-jars-from-maven', 'nadezhin/master' and 'axel22/feature/collection-concurrent' into develop
| | | | * | Merge branch 'master' into feature/collection-concurrentAleksandar Prokopec2012-04-0266-2528/+3154
| | | | |\ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/JavaConversions.scala src/library/scala/collection/JavaConverters.scala Add one test for concurrent map conversion.
| | | | * | Add JavaConversions and JavaConverters concurrent.Map support.Aleksandar Prokopec2012-03-282-24/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required deprecating several old methods for converting ConcurrentMap. Also, several new wrappers were introduced for concurrent.Map. Once we remove ConcurrentMap in 2.11, we can remove its corresponding wrappers and conversions in JavaConversions and JavaConverters.
| | | * | | SI-5627 BigInt.equals(Number) and BigDecimal.equals(Number) should implement ↵Dmitry Nadezhin2012-04-022-1/+52
| | |/ / / | | | | | | | | | | | | | | | equality in mathematical sense
| | * | | Merge remote-tracking branch 'adriaanm/topic/partialfun' into developPaul Phillips2012-03-304-76/+154
| | |\ \ \
| | | * | | a fast, functional PartialFunction implementationPavel Pavlov2012-03-304-76/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runtime.AbstractPartialFunction provides a default implementation for the new-style partial function. In principle this class is only subclassed by compiler-generated partial functions arising from matches. Either - the apply method (old-style partialfun) or - the applyOrElse method (current scheme) must be overridden, and the isDefinedAt method implemented. The applyOrElse method implementation is provided to ease the transition from the old scheme, since starr still generates old-style PartialFunctions, but locker's library has the new AbstractPartialFunction. Thus, this implementation is intended as a drop-in replacement for the old partial function, and does not require changes to the compiler. (compiler patches, both for old and new-style pattern matching, follow) - runtime.AbstractPartialFunction is based on PartialFunction.WithDefault Original version of FunctionWithDefault by Odersky (http://article.gmane.org/gmane.comp.lang.scala.internals/4032) - better performance for OrElse#applyOrElse, OrElse#lift, PF.cond - new combinator methods: PF#run, PF#runWith, PF.apply authored by @pavelpavlov, refactored by @adriaanm, review by @paulp
| * | | | | Fixes SI-5632 (serialization of large HashTables)David Hall2012-03-301-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converts HashTable threshold to long before multiplying by a large value. Test is very slow and requires giving partest more RAM. Rather than committing it, I'm attaching it as a gist. Whoever does the merge is more than welcome to commit it along with this patch… Test: https://gist.github.com/2257703
| | | | |
| | \ \ \
| *-. \ \ \ Merge remote-tracking branches 'heathermiller/doc/linking' and ↵Paul Phillips2012-03-3019-241/+258
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | 'axel22/feature/future-compat' into develop
| | * | | | Adds links to parallel collections overview in API docsHeather Miller2012-03-2910-4/+22
| |/ / / / | | | | | | | | | | | | | | | Now that there's an extensive parallel collections overview on http://docs.scala-lang.org, API comments should link to it ("see also" field). This commit also fixes a couple of broken links on some sequential collection types.
* | | | | Remove blocking from execution contexts.Aleksandar Prokopec2012-03-304-26/+54
| | | | |
* | | | | Add withFilter and mapTo to futures.Aleksandar Prokopec2012-03-292-31/+32
| |/ / / |/| | |
* | | | Add methods in the Future companion object.Aleksandar Prokopec2012-03-291-2/+107
| | | |
* | | | Work on source compatibility between akka and scala futures.Aleksandar Prokopec2012-03-289-241/+135
|/ / / | | | | | | | | | | | | Removed some methods from execution contexts. Changed Awaitable interface.
* | / Merge remote-tracking branch 'axel22/feature/collection-concurrent' into developPaul Phillips2012-03-279-98/+187
|\| | | |/ |/|
| * Rename ConcurrentTrieMap to concurrent.TrieMap.Aleksandar Prokopec2012-03-279-98/+187
| | | | | | | | | | | | | | | | Introduced the collection.concurrent package and introduced the concurrent.Map trait there. Deprecated the mutable.ConcurrentMap trait. Pending work - introduce the appropriate changes to JavaConversions and JavaConverters.
| |
| \
| \
| \
*---. \ Merge remote-tracking branches 'manojo/issue/4488', 'leifwickland/patch-3', ↵Paul Phillips2012-03-274-9/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'non/si-5609', 'adriaanm/topic/virtpatmat' and 'VladUreche/issue/5373' into develop Conflicts: test/scaladoc/scala/model/CommentFactoryTest.scala
| | | * | Fix .empty and add .ofDim factory method.Erik Osheim2012-03-251-2/+9
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the (unused and unnecessary) elems* parameter from the 'empty' method. It also adds 'ofDim' which allows the user to allocate a FlatArray of a given size without providing actual elements. This fixes SI-5609.
| | * | Slight comment tweak for more colloquial English.Leif Wickland2012-03-251-1/+1
| |/ / |/| |
| * | Close issue #SI-4488Manohar Jonnalagedda2012-03-242-6/+6
| | | | | | | | | | | | | | | | | | The issue is closed as won't fix, but there are a few test cases with respect to the model relevant to the issue. Also, correct some typos.
* | | Scaladoc is now pointing to sources in githubVlad Ureche2012-03-251-1/+1
|/ / | | | | | | | | | | | | | | | | | | For snapshots, it points to the exact commit, for releases it points to the tag ("v" + maven version). The link now opens in a different tab, as opening in the same frame is not compatible with github (the page doesn't load for some reason). Left the repo url in test/review untouched because it points to the root of all LAMP repos. But... is anyone still using that script?!?
* | Document regex replacement strings behavior.Daniel C. Sobral2012-03-231-2/+33
| | | | | | | | | | | | | | | | | | All replacement methods use dolar signs to identify groups in the matched string, and backslashes to escape characters. Document this behavior, and provide a method that can be used to properly quote replacement strings when this behavior is not desired. Closes SI-4750.
* | Regex improvementsDaniel C. Sobral2012-03-232-4/+34
| | | | | | | | | | | | | | | | | | | | | | This adds findAllMatchIn to Regex to mirror other similar methods. It also overloads StringLike's "r", adding a version that accepts group names. It includes test cases for both methods. Closes SI-2460.
| |
| \
| \
| \
*---. \ Merge remote-tracking branches 'axel22/feature/pc-execution-contexts', ↵Paul Phillips2012-03-2246-2125/+2524
|\ \ \ \ | |_|_|/ |/| | | | | | | 'VladUreche/issue/5593', 'dragos/master', 'VladUreche/issue/5599', 'adriaanm/ticket/treeannot' and 'heathermiller/issue/5291' into develop
| | | * minimalist refactoring to allow annotating treesAdriaan Moors2012-03-222-9/+28
| | |/ | | | | | | | | | | | | | | | not tested for performance, but shouldn't add any memory overhead see https://github.com/adriaanm/scala/commit/44362c557f for an example usage
| | * Overhaul of JavaConver{sions,ters}.Paul Phillips2012-03-2110-1303/+1489
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially motivated by SI-5580, then just motivated. I broke up the opaquely named JavaConversions and JavaConverters into the following traits encapsulating some permutation of { to java, to scala, bidirectional } { wrappers, decorators } I named everything consistently in terms of either Wrappers or Decorators. Decorators install those asJava/asScala methods onto collections of the right kind; Wrappers hide the process. JavaConversions then reduces to an object which (ill-advisedly) extends both WrapAsJava and WrapAsScala. And JavaConverters is an object extending DecorateAsScala and DecorateAsJava. However other more clearly named vals exist in the newly created scala.collection.convert package object. val decorateAsJava = new DecorateAsJava { } val decorateAsScala = new DecorateAsScala { } val decorateAll = new DecorateAsJava with DecorateAsScala { } val wrapAsJava = new WrapAsJava { } val wrapAsScala = new WrapAsScala { } val wrapAll = new WrapAsJava with WrapAsScala { } So for instance to import asScala decorators, and only those: scala> import scala.collection.convert.decorateAsScala._ import scala.collection.convert.decorateAsScala._ scala> new java.util.ArrayList[String].asScala groupBy (x => x) res0: scala.collection.immutable.Map[String,scala.collection.mutable.Buffer[String]] = Map() I propose we put those vals or a subset of them in the scala package object rather than way down in scala.collection.convert.