summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #739 from jsuereth/feature/collection-conversionsJosh Suereth2012-06-187-4/+52
|\ | | | | Adding copyInto and toVector methods to collections.
| * Fixing embarassing typo.Josh Suereth2012-06-181-1/+1
| |
| * Migrate build to @odersky's suggestion of convertTo.Josh Suereth2012-06-185-16/+19
| | | | | | | | | | | | * Move method into TraversableOnce from Iterator and Traversable to make the build pass. * Udpate IDE tests with new collection methods. * Rewire default toXYZ methods to use convertTo.
| * Rename copyTo to build based on consensus of 3Josh Suereth2012-06-184-7/+7
| |
| * Fixes from review.Josh Suereth2012-06-184-9/+9
| | | | | | | | | | | | * Fixed typo * Renamed copyInto to copyTo * Added tparam doc.
| * Adding copyInto and toVector methods to collections.Josh Suereth2012-06-186-0/+45
| | | | | | | | | | * Added generic copyInto method for collections. For any collection with a CanBuildFrom, can convert a generic collection into it using the builder. * Added specifici toVector method for collections. This is more efficient than copyInto if the collection is a Vector.
* | Merge pull request #738 from scalamacros/topic/checkinitJosh Suereth2012-06-182-9/+1
|\ \ | | | | | | fixes checkinit, now it's for real
| * | fixes checkinit, now it's for realEugene Burmako2012-06-182-9/+1
| | |
* | | Merge pull request #741 from axel22/issue/4954Josh Suereth2012-06-182-13/+36
|\ \ \ | | | | | | | | Fix SI-4954.
| * | | Fix SI-4954.Aleksandar Prokopec2012-06-182-13/+36
| |/ / | | | | | | | | | | | | | | | Override inner classes in `LinkedHashMap` that correspond to `filterKeys`, `mapValues` and `keys` to retain a proper ordering of elements when they are transformed.
* | | Merge pull request #742 from axel22/feature/pc-ctrieJosh Suereth2012-06-181-1/+5
|\ \ \ | | | | | | | | Use `ThreadLocalRandom` in `TrieMap.size`.
| * | | Use `ThreadLocalRandom` in `TrieMap.size`.Aleksandar Prokopec2012-06-181-1/+5
| |/ /
* | | Merge pull request #720 from phaller/cps-ticket-1681Josh Suereth2012-06-185-3/+74
|\ \ \ | | | | | | | | CPS: enable return expressions in CPS code if they are in tail position
| * | | Remove unneeded use of Tree#idphaller2012-06-152-16/+16
| | | |
| * | | Replace context stack of AnnotationChecker with new mode for typing returnsphaller2012-06-155-32/+12
| | | |
| * | | Remove stray commentphaller2012-06-141-1/+0
| | | |
| * | | CPS: enable return expressions in CPS code if they are in tail positionphaller2012-06-145-2/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a stack of context trees to AnnotationChecker(s). Here, it is used to enforce that adaptAnnotations will only adapt the annotation of a return expression if the expected type is a CPS type. The remove-tail-return transform is reasonably general, covering cases such as try-catch-finally. Moreover, an error is thrown if, in a CPS method, a return is encountered which is not in a tail position such that it will be removed subsequently.
* | | | Merge pull request #725 from paulp/issue/arrayopsJosh Suereth2012-06-181-1/+1
|\ \ \ \ | |_|_|/ |/| | | Remove unused type parameter.
| * | | Remove unused type parameter.Paul Phillips2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | There should probably be a warning about non-overriding methods which have unreferenced type parameters.
* | | | Merge pull request #736 from damienobrist/feature/diagrams-dev-revertJosh Suereth2012-06-1833-2486/+190
|\ \ \ \ | |_|_|/ |/| | | Reverting the diagrams
| * | | Revert "Scaladoc class diagrams part 1"Vlad Ureche2012-06-1820-1173/+162
| | | | | | | | | | | | | | | | This reverts commit 831f09bb6d00c152bd8aef3ce8bf9e200080fe36.
| * | | Revert "Scaladoc class diagrams part 2"Vlad Ureche2012-06-1814-1301/+22
| | | | | | | | | | | | | | | | This reverts commit fba4098ca592bdd7d6609017daa4a08f274f35ec.
| * | | Revert "Documented SyncVar"Vlad Ureche2012-06-181-13/+7
| | | | | | | | | | | | | | | | This reverts commit 556065151c10685240dd907691dab5e094c87efc.
* | | | Merge pull request #718 from damienobrist/feature/diagrams-dev-finalJosh Suereth2012-06-1733-190/+2486
|\| | | | | | | | | | | Diagrams in Scaladoc
| * | | Documented SyncVarVlad Ureche2012-06-141-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we used it in the DocRunner and noticed it could have better documentation. Review by @heathermiller.
| * | | Scaladoc class diagrams part 2Damien2012-06-1414-22/+1301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains the svg diagram generation using the graphviz package, the template changes, the css styling and javascript code that enables displaying and interacting with the diagrams. The full history is located at: https://github.com/damienobrist/scala/tree/feature/diagrams-dev The diagrams are included as svg markup inside the html code. This enables interacting with the image beyond what would be possible with a static image (highlighting, scaling, tooltips, links to nodes, etc). The svg generation has four main phases: model => dot, dot => svg (using the graphviz package), svg postprocessing, inclusion in the html page. This commit also fixes SI-5212 - links to individual pages automatically load the left navigation panel of the website. Commit summary: - diagram generation - model => dot (DotDiagramGenerator.scala, DiagramGenerator.scala) - dot => svg (DotRunner.scala) - svg post-processing (DotDiagramGenerator.scala) - svg inclusion in the html (Template.scala) - diagram interaction - css, js and image files Review by @heathermiller, @kzys.
| * | | Scaladoc class diagrams part 1Vlad Ureche2012-06-1420-162/+1173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains model changes required for adding class diagrams to scaladoc. It also contains an improved implicit shadowing computation, which hides the shadowed implicitly inherited members from the main view and gives instructions on how to access them. This is joint work with Damien Obrist (@damienobrist) on supporting diagram generation in scaladoc, as part of Damien's semester project in the LAMP laborarory at EPFL. The full history is located at: https://github.com/damienobrist/scala/tree/feature/diagrams-dev Commit summary: - diagrams model - diagram settings (Settings.scala, ScalaDoc.scala) - diagram model object (Entity.scala, Diagram.scala) - model: tracking direct superclasses and subclasses, implicit conversions from and to (ModelFactory.scala) - diagram object computation (DiagramFactory.scala, DocFactory.scala) - capacity to filter diagrams (CommentFactory.scala, DiagramDirectiveParser.scala) - diagram statistics object (DiagramStats.scala) - delayed link evaluation (Body.scala, Comment.scala) - tests - improved implicits shadowing information - model shadowing computation (ModelFactoryImplicitSupport.scala, Entity.scala) - html generation for shadowing information (Template.scala) - tests Also fixes an issue reported by @dragos, where single-line comment expansion would lead to the comment disappearing. Review by @kzys, @pedrofurla.
* | | | Merge pull request #727 from scalamacros/topic/classtag-to-classmanifestJosh Suereth2012-06-151-1/+1
|\ \ \ \ | | | | | | | | | | classtag => classmanifest conversion no longer requires runtime universe
| * | | | classtag => classmanifest conversion no longer requires runtime universeEugene Burmako2012-06-151-1/+1
| | |/ / | |/| |
* | | | Merge pull request #721 from viktorklang/wip-sensible-deprecation-msgs-√Josh Suereth2012-06-151-26/+26
|\ \ \ \ | | | | | | | | | | Wip sensible deprecation msgs √
| * | | | Removing erronous quoting of implicitNotFoundViktor Klang2012-06-141-2/+2
| | | | |
| * | | | Adding backticks to code in deprecation messages in PredefViktor Klang2012-06-141-28/+28
| | | | |
| * | | | Clarifying deprecation for implicit and explicit usage of the x2y's in PredefViktor Klang2012-06-131-24/+24
| | | | |
| * | | | Clarifying deprecation messages for numeric conversions in PredefViktor Klang2012-06-131-24/+24
| | |/ / | |/| |
* | | | fixes SI-5912Eugene Burmako2012-06-151-1/+4
| |/ / |/| |
* | | Fix for broken forwarder.Paul Phillips2012-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Wow, I wonder what the upper bound is on how long I might have chased my tail before finding this. I know what the lower bound is, unfortunately. It's just that usually the answer to a mystery is not "the empty package class has magically become the root class, but only sometimes."
* | | Merge pull request #713 from havocp/havocp-task-stackAdriaan Moors2012-06-142-49/+82
|\ \ \ | |_|/ |/| | Fixups to Future task stack
| * | rework Future.dispatchFuture a bit to fix bugs / optimizeHavoc Pennington2012-06-132-49/+82
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where _taskStack could batch a task into the wrong executor, as previously commented in the code. It now uses the _taskStack machinery for the Future.apply dispatch in addition to callback dispatch, so we can batch Future(body) as well. Less significantly, it micro-optimizes by combining some different closures and Runnable into a Task object, so there aren't as many objects created when storing and dispatching a callback. So it saves a bit of memory and runtime perhaps.
* | Merge pull request #706 from scalamacros/topic/fixcheckinitJosh Suereth2012-06-131-0/+2
|\ \ | |/ |/| fixes a checkinit problem
| * fixes a checkinit problemEugene Burmako2012-06-131-0/+2
| |
* | Merge pull request #705 from paulp/topic/uncheckedAdriaan Moors2012-06-131-1/+2
|\ \ | | | | | | Suppress non-local return unchecked warnings.
| * | Suppress non-local return unchecked warnings.Paul Phillips2012-06-121-1/+2
| | | | | | | | | | | | | | | There doesn't seem to be any way to do that by adding a synthetic annotation.
* | | Breaks.break should return Nothing, not UnitDan Brown2012-06-121-1/+1
|/ /
* | Forkjoin and fjbg are now always compiled in the build.Josh Suereth2012-06-111-0/+0
| | | | | | | | | | * forkjoin.done/forkjoine.clean can test forkjoin source * fjbg.done/fjbg.clean can test fjbg source.
* | Merge pull request #698 from retronym/ticket/5696Adriaan Moors2012-06-112-0/+7
|\ \ | | | | | | SI-5696 Detect excess constructor argument lists.
| * | SI-5696 Detect excess constructor argument lists.Jason Zaugg2012-06-102-0/+7
| | | | | | | | | | | | An apply method fooled the usual mechanism.
* | | SI-5162 Exclude super.foo from the erasure cast of SI-4283Jason Zaugg2012-06-111-9/+18
|/ / | | | | | | | | | | | | | | | | If the target method is defined in Java, treat the super reference as an error, otherwise allow it in the knowledge that Scala loosens the access restrictions on its generated classes. Moves the test for that bug out of pending-ville. It's sufficient to place Test in the empty package to exercise the right code paths.
* | Merge pull request #694 from retronym/ticket/4831-2Adriaan Moors2012-06-091-3/+3
|\ \ | | | | | | SI-4831 Fix ambiguous import detection for renamed imports.
| * | SI-4831 Fix ambiguous import detection for renamed imports.Jason Zaugg2012-06-091-3/+3
| |/
* | Merge pull request #696 from retronym/topic/intellij-reflect-module3Adriaan Moors2012-06-093-1/+27
|\ \ | | | | | | An IntelliJ module for reflect.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 00:23:48 +0000