summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adding the Actor Migration Kit.Vojin Jovanovic2012-05-1844-16/+1996
| | | | | | | | | | | | Kit consists of: 1) The StashingActor which adopts an interface similar to Akka. 2) Props mockup for creating Akka like code 3) Pattern mockup 4) Test cases for every step in the migration. 5) MigrationSystem which will paired on the Akka side. Review of the code : @phaller Review of the build: @jsuereth
* Merge pull request #566 from lrytz/wip/t4928Adriaan Moors2012-05-185-18/+36
|\ | | | | Fix SI-4928
| * Fix SI-4928Lukas Rytz2012-05-165-18/+36
| | | | | | | | better error message when a parameter is first defined positionally, then with a named argument.
* | Merge pull request #564 from scalamacros/topic/assertinresetattrsJosh Suereth2012-05-176-22/+17
|\ \ | | | | | | fixes resetAttrs
| * | fixes resetAttrsEugene Burmako2012-05-176-22/+17
| | |
* | | Merge pull request #563 from milessabin/feature/enrich-gentraversablesJosh Suereth2012-05-175-0/+105
|\ \ \ | |/ / |/| | Added infrastructure to enable easy enrichment of GenTraversables.
| * | Added infrastructure to enable easy enrichment of GenTraversables.Miles Sabin2012-05-175-0/+105
| | |
* | | Merge pull request #562 from retronym/ticket/5803Josh Suereth2012-05-173-1/+10
|\ \ \ | |/ / |/| | A band-aid solution for SI-5803.
| * | A band-aid solution for SI-5803.Jason Zaugg2012-05-173-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Since ae5ff662, resetAttrs duplicates trees, which doesn't preserve ApplyConstructor. My attempt to modify TreeCopier to do so proved trickier than expected. In any case, ApplyConstructor is not long for this world, and is only used in tree printing to distinguish `new X` from regular Apply trees, so this should suffice pending full surgery.
* | | Merge pull request #560 from heathermiller/issue/5623Adriaan Moors2012-05-171-7/+43
|\ \ \ | | | | | | | | | | | | | | | | Fixes SI-5623 on SyncVar. Deprecates set & unset. Review by @phaller.
| * | | Missed a stashHeather Miller2012-05-171-1/+1
| | | |
| * | | Merge branch 'master' of git://github.com/scala/scala into issue/5623Heather Miller2012-05-1622-41/+123
| |\| |
| * | | Fixes SI-5623 on SyncVar and deprecates set & unset.Heather Miller2012-05-161-7/+43
| | |/ | |/|
* | | Merge pull request #561 from retronym/topic/intellij-test-moduleAdriaan Moors2012-05-173-20/+17
|\ \ \ | |_|/ |/| | An IntelliJ module for test files.
| * | An IntelliJ module for test files.Jason Zaugg2012-05-173-20/+17
|/ / | | | | | | | | | | | | This enables resolve, autocompletion and the usual goodness when editing tests. Also removes the sample configuration for the defunct dbc module.
* | Merge pull request #558 from lrytz/wip/t5259Josh Suereth2012-05-162-6/+27
|\ \ | | | | | | Fix SI-5259
| * | Fix SI-5259Lukas Rytz2012-05-152-6/+27
| | | | | | | | | | | | Calling the type checker on an Ident tree instead of using gen.mkAttributedRef assigns a SingleType to the tree.
* | | Merge pull request #557 from lrytz/wip/t5610Josh Suereth2012-05-163-5/+47
|\ \ \ | | | | | | | | Fix for SI-5610
| * | | Fix for SI-5610Lukas Rytz2012-05-153-5/+47
| |/ /
* | | Merge pull request #555 from srp/masterJosh Suereth2012-05-161-0/+22
|\ \ \ | | | | | | | | mutable.MapLike: override $mapNote to reflect actual require mutable api
| * | | mutable.MapLike: override $mapNote to reflect actual require mutable apiScott R. Parish2012-05-151-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The api needed to define a mutable.Map is different then the one needed to define an immutable.Map. Prior to this patch the mutable one reflected the api needed for the immutable one causing confusion about what really needed to be defined.
* | | | Merge pull request #553 from heathermiller/doc/linksJosh Suereth2012-05-1616-30/+27
|\ \ \ \ | |_|_|/ |/| | | Small documentation fixes & small fix to Scaladoc @see formatting
| * | | Corrects links in API documentationHeather Miller2012-05-1611-18/+16
| | | |
| * | | Missed a straggling doc comment.Heather Miller2012-05-151-1/+1
| | | |
| * | | Small documentation fixes & small fix to Scaladoc @see formattingHeather Miller2012-05-155-11/+10
| | | |
* | | | Putting back things sbt noticed were gone.Paul Phillips2012-05-153-0/+30
| | | |
* | | | Removing more unneeded code.Paul Phillips2012-05-1544-1432/+128
| |/ / |/| |
* | | Test adjustments.Paul Phillips2012-05-152-1/+4
| | |
* | | Removing extraneous files.Paul Phillips2012-05-1593-6478/+56
| | | | | | | | | | | | Culling accumulated unnecessary code.
* | | Merge pull request #554 from srp/masterJosh Suereth2012-05-151-2/+2
|\ \ \ | | | | | | | | Enumeration#maxId: fix documentation to reflect reality
| * | | Enumeration#maxId: fix documentation to reflect realityScott R. Parish2012-05-151-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maxId is not really the "maximum id", but rather one past the max: scala> object Foo extends Enumeration { | val x = Value | val y = Value | } defined module Foo scala> Foo.maxId res0: Int = 2 scala> Foo(2) java.util.NoSuchElementException: key not found: 2 at scala.collection.MapLike$class.default(MapLike.scala:225) ... scala> Foo(1) res2: Foo.Value = y
* / / Fixed positions for `AnnotationInfo.original`.Iulian Dragos2012-05-151-1/+5
|/ /
* | Tweak to avoid value classes in modifier check.Paul Phillips2012-05-141-1/+1
| |
* | New starr with adriaan's fix from 1b198fadd1 .Paul Phillips2012-05-143-3/+3
| | | | | | | | Since we still fail in locker.comp.
* | Debugging output tweaks.Paul Phillips2012-05-146-27/+36
|/ | | | And undeprecated Positional.
* No-op changes.Paul Phillips2012-05-143-6/+3
| | | | | Fixed a comment and simplified a mysterious "if (x) y else y" method thanks to the helpful jibe received in comments.
*-------. Merge commit 'refs/pull/547/head'; commit 'refs/pull/548/head'; commit ↵Paul Phillips2012-05-1415-49/+122
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'refs/pull/549/head'; commit 'refs/pull/550/head'; commit 'refs/pull/551/head' into develop
| | | | | * Better fix for SI-5676. Review by @paulpHubert Plociniczak2012-05-146-30/+35
| | | | | |
| | | | * | Closes SI-5796.Hubert Plociniczak2012-05-142-2/+11
| | | | |/
| | | * | fix SI-5384Lukas Rytz2012-05-142-2/+29
| | | | | | | | | | | | | | | | | | | | make TreeInfo recognize constructor calls after named arguments transformation.
| | * | | suspend type vars in SubTypePair's equalsAdriaan Moors2012-05-141-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SubTypePair's equals method calls =:= on the involved types, which mutates the TypeVars contained in them this is undesirable since we're simply checking whether a subtype test is pending in addition to making subtyping "more correct" for type vars, it should avoid the stackoverflow that's been plaguing us (https://groups.google.com/d/topic/scala-internals/2gHzNjtB4xA/discussion) SubTypePair's equals method method is only called when subtype checking hits a recursion threshold (subsametypeRecursions >= LogPendingSubTypesThreshold)
| * | | | Added test case for commit f7d5f45 (re SI-5552)Erik Osheim2012-05-142-0/+12
| | | | |
| * | | | Specialize lazy vals (closes SI-5552)Erik Osheim2012-05-142-11/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, specialized lazy vals would not work at all when used in specialized classes, and would just return an uninitialized value. After this patch, they work in the same way as other specialized fields do (i.e. a new specialized field is created, and the specialized class uses that instead of the base class' field). Note that there are still known problems with specialized lazy vals (for instance SI-4717) but it seemed to me that this was better than nothing.
* / / / Removed an unnecessary self type.Paul Phillips2012-05-141-2/+0
|/ / /
| | |
| \ \
*-. \ \ Merge commit 'refs/pull/543/head'; commit 'refs/pull/544/head'; commit ↵Paul Phillips2012-05-13135-514/+640
|\ \ \ \ | | | | | | | | | | | | | | | 'refs/pull/546/head' into develop
| | * | | Test case closes SI-5137.Jason Zaugg2012-05-131-0/+17
| | | | | | | | | | | | | | | | | | | | virtpatmat strikes again.
| * | | | Address doc comment rot in the standard library.Jason Zaugg2012-05-1394-370/+204
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Match @param/@tparam names to the actual parameter name - Use @tparam for type parameters - Whitespace is required between `*` and `@` - Fix incorrect references to @define macros. - Use of monospace `` and {{{}}} (much more needed) - Remove `@param p1 ...` stubs, which appear in the generated docss. - But, retainsed `@param p1` stubs, assuming they will be filtered from the generated docs by SI-5795. - Avoid use of the shorthand `@param doc for the solitary param` (which works, but isn't recognized by the code inspection in IntelliJ I used to sweep through the problems) The remaining warnings from `ant docs` seem spurious, I suspect they are an unintended consequence of documenting extension methods. [scaladoc] /Users/jason/code/scala/src/library/scala/collection/TraversableOnce.scala:181: warning: Variable coll undefined in comment for method reduceOption in class Tuple2Zipped [scaladoc] def reduceOption[A1 >: A](op: (A1, A1) => A1): Option[A1] = reduceLeftOption(op) [scaladoc] ^
| * | | Tweak to the runner to deal with the big bad world.Paul Phillips2012-05-131-2/+11
| | | | | | | | | | | | | | | | | | | | Relative symlinks which start with .. are then run with an absolute path. It's robustness city.
| * | | Deprecated some classes.Paul Phillips2012-05-1218-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All this stuff. I believe most of this is uncontroversial. scala/util/Marshal.scala scala/util/automata/BaseBerrySethi.scala scala/util/automata/DetWordAutom.scala scala/util/automata/Inclusion.scala scala/util/automata/NondetWordAutom.scala scala/util/automata/SubsetConstruction.scala scala/util/automata/WordBerrySethi.scala scala/util/grammar/HedgeRHS.scala scala/util/grammar/TreeRHS.scala scala/util/parsing/ast/AbstractSyntax.scala scala/util/parsing/ast/Binders.scala scala/util/parsing/combinator/testing/RegexTest.scala scala/util/parsing/combinator/testing/Tester.scala scala/util/parsing/input/Positional.scala scala/util/regexp/Base.scala scala/util/regexp/PointedHedgeExp.scala scala/util/regexp/SyntaxError.scala scala/util/regexp/WordExp.scala I'd have deprecated much of it long ago if the compiler didn't still depend on it due to xml/dtd/something. And it still does, but it's time to deprecate them anyway.
| * | | Merge branch 'master' of https://github.com/scala/scalaPaul Phillips2012-05-125-4/+47
| |\| |