summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Moved a bunch of passing tests out of pending.Paul Phillips2012-10-0455-100/+0
| | | | | | | | | | | | | | | | | | | | | | If the test names can be believed, this covers SI-294 SI-1751 SI-1782 SI-2318 SI-3897 SI-4649 SI-4786 SI-5293 SI-5399 SI-5418 SI-5606 SI-5610 SI-5639 Most of these were moved to pending in 1729b26500 due to failures of unknown cause. It was suggested they be brought back "as soon as possible" and that was three months ago; I suppose it's now possible. If they need to be disabled again, please move them to test/disabled, not to test/pending. "disabled" should mean a formerly passing test in limbo; "pending" tests document bugs which await fixing. I also removed some dead files in test/ - the files with a "cmds" extension are from a failed experiment and do not do anything.
* Moved some disabled test to the right place.Paul Phillips2012-10-046-0/+0
| | | | It's test/disabled/XXX, not test/files/disabled/XXX.
* Merge pull request #1369 from som-snytt/issue/6406-regextractPaul Phillips2012-10-046-34/+110
|\ | | | | Regex.unapplySeq should not take Any (Fixes SI-6406)
| * Regex.unapplySeq should not take Any (Fixes SI-6406)Som Snytt2012-09-206-34/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates unapplySeq(Any) and adds overloaded unapplySeq(CharSequence) and unapplySeq(Match), with the putative advantage that you can't try to extract the unextractable. Regex is massaged so that the underlying Pattern is primary, rather than the String-valued expression. Regex and its unanchored companion (I almost wrote unmoored) share a Pattern object, so that unapplySeq(Match) can easily test whether the Match was generated by this Regex; in that case, the match result is used immediately, instead of reapplying the regex to the matched string. The documentation is massaged to reflect unanchored and also to align with the underlying terminology, e.g., "subgroup" really just means "group."
* | Merge pull request #1429 from paulp/topic/shortClassPaul Phillips2012-10-046-13/+80
|\ \ | | | | | | Added utility function shortClass.
| * | Added utility function shortClass.Paul Phillips2012-09-296-13/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pretty sick of names like scala> typeOf[List[Int]].getClass.getName res0: String = scala.reflect.internal.Types$TypeRef$$anon$1 I wrote this so I can see what the class of some arbitrary thing is in a way which my little brain can understand. For the example above we get scala> shortClassOfInstance(typeOf[List[Int]]) res0: String = ArgsTypeRef with AliasTypeRef Let's pimp a "shortClassName" onto AnyRef and be happy.
* | | Merge pull request #1456 from paulp/has-symbol-fieldPaul Phillips2012-10-0418-51/+52
|\ \ \ | | | | | | | | Renamed hasSymbol to hasSymbolField.
| * | | Renamed hasSymbol to hasSymbolField.Paul Phillips2012-10-0318-51/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggestion by retronym that the obvious implementation of "hasSymbol" be called "hasSymbol" reminded me we have a method called "hasSymbol" which does not have that implementation, and which has burned us already with subtle bugginess. I think that "hasSymbolField" is self-documenting.
* | | | Merge pull request #1460 from axel22/issue/6467-cherry-masterJosh Suereth2012-10-046-10/+32
|\ \ \ \ | | | | | | | | | | SI-6467: Zero element in aggregate now by-name
| * | | | SI-6467: Zero element in aggregate now by-nameAleksandar Prokopec2012-10-046-10/+32
| | | | |
* | | | | Merge pull request #1438 from paulp/raw-type-fidelityGrzegorz Kossakowski2012-10-041-8/+10
|\ \ \ \ \ | |/ / / / |/| | | | Fix for gluttunous raw type creation.
| * | | | Fix for gluttunous raw type creation.Paul Phillips2012-10-041-8/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClassfileParser had a bug which led to it thinking pretty much anything might be a raw type, and thus creating extra symbols for no good reason. When compiling scala.collection, before this change it thought 1094 raw types had passed by; afterward it thought 237.
* | | | Merge pull request #1453 from vigdorchik/links_fixedPaul Phillips2012-10-032-3/+3
|\ \ \ \ | |/ / / |/| | | Fix scaladoc links in a couple of places.
| * | | Fix scaladoc links in a couple of places.Eugene Vigdorchik2012-10-032-3/+3
| | | |
* | | | Merge pull request #1452 from gkossakowski/masterGrzegorz Kossakowski2012-10-0356-241/+527
|\ \ \ \ | |/ / / |/| | | Merge remote-tracking branch 'scala/2.10.x' into master
| * | | Merge remote-tracking branch 'scala/2.10.x'Grzegorz Kossakowski2012-10-0356-241/+527
|/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.number src/reflect/scala/reflect/internal/Types.scala
| * | | Merge pull request #1444 from gkossakowski/2.10.xGrzegorz Kossakowski2012-10-0237-217/+249
| |\ \ \ | | | | | | | | | | Merge branch 'scala/2.10.0-wip' into 2.10.x
| | * | | Merge remote-tracking branch 'scala/2.10.0-wip' into 2.10.xGrzegorz Kossakowski2012-10-0237-217/+249
| |/| | |
| | * | | Merge pull request #1434 from jsuereth/fix/SI-6449Grzegorz Kossakowski2012-10-022-5/+5
| | |\ \ \ | | | | | | | | | | | | Fixes deprecation annotations for 2.10.0
| | | * | | Fixes deprecation annotations for 2.10.0Josh Suereth2012-09-303-7/+7
| | | | | |
| | * | | | Merge pull request #1440 from VladUreche/issue/language-docGrzegorz Kossakowski2012-10-024-27/+77
| | |\ \ \ \ | | | | | | | | | | | | | | Improved the `scala.language` documentation
| | | * | | | Improved the `scala.language` documentationVlad Ureche2012-10-024-27/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also corrected the links in the library rootdoc. **Note: We need to fast track this commit so it reaches master in the next 12 hours, before we generate the next nightly docs.** Review by @odersky
| | * | | | | Merge pull request #1425 from phaller/issue/6442Grzegorz Kossakowski2012-10-0214-120/+129
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | SI-6442 - Add ActorDSL object for actor migration kit
| | | * | | | SI-6442 - Add ActorDSL object for actor migration kitphaller2012-09-2914-120/+129
| | | |/ / / | | | | | | | | | | | | | | | | | | Removes MigrationSystem, since ActorDSL replaces it.
| | * | | | Merge pull request #1435 from paulp/stringcontext-docPaul Phillips2012-10-011-6/+6
| | |\ \ \ \ | | | | | | | | | | | | | | Fix StringContext documentation.
| | | * | | | Fix StringContext documentation.Paul Phillips2012-10-011-6/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | It doesn't call "new", as I discovered after some head scratching.
| | * | | | Merge pull request #1428 from paulp/issue/6311Paul Phillips2012-10-014-45/+11
| | |\ \ \ \ | | | | | | | | | | | | | | Issue/6311
| | | * | | | Test case for SI-6311.Paul Phillips2012-09-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This covers the situation which broke in 5c5e8d4dcd, reverted in the previous commit.
| | | * | | | Revert "SI-4881 infer variance from formals, then result"Paul Phillips2012-09-293-45/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | This reverts commit 5c5e8d4dcd151a6e2bf9e7c259c618b9b4eff00f.
| | * | | | Merge pull request #1424 from soc/SI-6449Paul Phillips2012-10-0113-15/+15
| | |\ \ \ \ | | | |/ / / | | |/| | | SI-6449 Adds version arg to @deprecated usages (non-compiler sources)
| | | * | | Fix incomplete version strings (2.10 -> 2.10.0)Simon Ochsenreither2012-09-2910-11/+11
| | | | | |
| | | * | | SI-6449 Adds version arg to @deprecated usages (non-compiler sources)Simon Ochsenreither2012-09-293-4/+4
| | | | | |
| | * | | | Merge remote-tracking branch 'scala/2.10.x' into 2.10.0-wipGrzegorz Kossakowski2012-09-2981-215/+1535
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #1416 from jsuereth/fix/string-context-scaladocGrzegorz Kossakowski2012-09-281-0/+7
| | |\ \ \ \ | | | | | | | | | | | | | | add a bit about unicode to scaladoc.
| | | * | | | add a bit about unicode to scaladoc.Josh Suereth2012-09-281-0/+7
| | |/ / / /
| * | | | | Merge pull request #1411 from jsuereth/fix/bump-versionGrzegorz Kossakowski2012-09-291-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Bump version number for next dev cycle.
| | * | | | Bump version number for next dev cycle.Josh Suereth2012-09-271-1/+1
| | |/ / /
| * | | | Merge pull request #1415 from scalamacros/is-value-typeEugene Burmako2012-09-2812-11/+224
| |\ \ \ \ | | | | | | | | | | | | a fork of isValueType and isNonValueType
| | * | | | fully initializes symbols on `typeSignature`Eugene Burmako2012-09-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only affects runtime reflection, because Symbol.typeSignature is only defined in the reflection API. the rest of the compiler uses Symbol.info instead.
| | * | | | Fix for failing test.Paul Phillips2012-09-282-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's some very sketchy behavior visible - I'm printing a method signature and getting this: [B <: <?>, That <: <?>](f: <?>)(implicit cbf: <?>)That But there's no exposed way to force the info. Am I supposed to call isSealed or something?
| | * | | | Implementations of isValueType and isNonValueType.Paul Phillips2012-09-285-13/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrictions regarding how non-value types can be used have generally not been enforced explicitly, depending instead on the fact that the compiler wouldn't attempt to use them in strange ways like offering a method type as a type argument. Since users can now create most types from scratch, it has become important to enforce the restrictions in a more direct fashion. This was a lot harder than it probably should have been because there are so many types which go unmentioned by the specification. Hopefully a useful exercise in any case.
| | * | | | SI-6417 correctly reifies non-value typesEugene Burmako2012-09-285-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're reifying non-value types (e.g. MethodTypes), we can't use them as type arguments for TypeTag/WeakTypeTag factory methods, otherwise the macro expansion won't typecheck: http://groups.google.com/group/scala-internals/browse_thread/thread/2d7bb85bfcdb2e2 This situation is impossible if one uses only reify and type tags, but c.reifyTree and c.reifyType exposes in the macro API let anyone feed anything into the reifier. Therefore I now check the tpe that is about to be used in TypeApply wrapping TypeTag/WeakTypeTag factory methods and replace it with AnyTpe if it doesn't fit.
| | * | | | showRaw no longer crashes on NoSymbolEugene Burmako2012-09-283-1/+8
| | | | | |
| * | | | | Merge pull request #1395 from odersky/topic/valueclass-cleanupGrzegorz Kossakowski2012-09-281-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Removes discrepancy between SIP 15 and compiler
| | * | | | | Removes discrepancy between SIP 15 and compilerMartin Odersky2012-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a discrepancy in that the compiler alternatively accepts a val parameter or an unbox method for a value class but SIP 15 does not mention the unbox method. I commented out the line in the compiler that does it.
| * | | | | | Merge pull request #1347 from soc/SI-6380Grzegorz Kossakowski2012-09-287-15/+57
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | SI-6380 Add @throws[Exception]
| | * | | | | SI-6380 #1 Add @throws[Exception]Simon Ochsenreither2012-09-217-15/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows an additional notation of the @throws annotation: Old-style: @throws(classOf[Exception]) New-style: @throws[Exception] The optional String argument moves @throws in line with @deprecated, @migration, etc. and prevents confusion caused by the default inheritance of ScalaDoc comments and the non-inheritance of annotations. Before: /** This method does ... * @throws IllegalArgumentException if `a` is less than 0. */ @throws(classOf[IllegalArgumentException]) def foo(a: Int) = ... Now: /** This method does ... */ @throws[IllegalArgumentException]("if `a` is less than 0") def foo(a: Int) = ... ScalaDoc @throws tags remain supported for cases where documentation of thrown exceptions is needed, but are not supposed to be added to the exception attribute of the class file. In this commit the necessary compiler support is added. The code to extract exceptions from annotations is now shared instead of being duplicated all over the place. The change is completely source and binary compatible, except that the code is now enforcing that the type thrown is a subtype of Throwable as mandated by the JVM spec instead of allowing something like @throws(classOf[String]). Not in this commit: - ScalaDoc support to add the String argument to ScalaDoc's exception list - Adaption of the library
* | | | | | | Merge pull request #1431 from vigdorchik/model_factory_cleanupGrzegorz Kossakowski2012-10-031-23/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | More retrofit of doc model factory.
| * | | | | | | More retrofit of scaladoc model factory.Eugene Vigdorchik2012-10-011-23/+14
| | | | | | | |
* | | | | | | | Merge pull request #1437 from paulp/typevar-suspensionGrzegorz Kossakowski2012-10-0211-214/+505
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Typevar suspension