summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Statistics reorganizationMartin Odersky2012-06-1916-497/+546
| | | | | Statistics were broken since the move to reflect.internal. They are now re-organized, made more robost and modular.
* Merge pull request #697 from retronym/ticket/4270-3Adriaan Moors2012-06-197-56/+125
|\ | | | | SI-4270 Disqualify in scope implicits that are shadowed.
| * SI-4270 Refactor for efficiency and clarity.Jason Zaugg2012-06-141-6/+24
| | | | | | | | | | | | Avoids allocation of the hashset used by shadowing checks when searching in the implicit scope, and replaces three checks for `if (isLocal)` with a sprinkling of polymorphism.
| * SI-4270 Disqualify in scope implicits that are shadowed.Jason Zaugg2012-06-106-49/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | If an expression wouldn't type check explicitly, it shouldn't be allowed implicitly. Employs typedIdent, which already does this sort of thing rather well, instead of continuing to reimplement it in Implicits. Remove check for non-implicit synonym, which is subsumed by typing an Ident. Workaround Scaladoc oddity, by using an attributed select when the context is deficient.
| * SI-4270 Rename implicits to avoid name clashes.Jason Zaugg2012-06-091-4/+4
| | | | | | | | This will fail implicit search in the next commit.
* | Merge pull request #728 from scalamacros/topic/reflection-meetingJosh Suereth2012-06-181-0/+17
|\ \ | | | | | | exposes extra tests for symbols as discussed on reflection meeting
| * | exposes extra tests for symbols as discussed on reflection meetingEugene Burmako2012-06-151-0/+17
| | | | | | | | | | | | review by @odersky
* | | Merge pull request #739 from jsuereth/feature/collection-conversionsJosh Suereth2012-06-1810-5/+219
|\ \ \ | | | | | | | | 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-187-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | * 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-185-14/+14
| | | |
| * | | Fixes from review.Josh Suereth2012-06-185-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | * Fixed typo * Renamed copyInto to copyTo * Added tparam doc.
| * | | Adding copyInto and toVector methods to collections.Josh Suereth2012-06-188-0/+209
| | | | | | | | | | | | | | | | | | | | * 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-183-13/+81
|\ \ \ \ \ | | | | | | | | | | | | Fix SI-4954.
| * | | | | Fix SI-4954.Aleksandar Prokopec2012-06-183-13/+81
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-5/+12
|\ \ \ \ \ | | | | | | | | | | | | Use `ThreadLocalRandom` in `TrieMap.size`.
| * | | | | Use `ThreadLocalRandom` in `TrieMap.size`.Aleksandar Prokopec2012-06-182-5/+12
| |/ / / /
* | | | | Merge pull request #720 from phaller/cps-ticket-1681Josh Suereth2012-06-1813-3/+208
|\ \ \ \ \ | | | | | | | | | | | | 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-157-32/+43
| | | | | |
| * | | | | Remove stray commentphaller2012-06-141-1/+0
| | | | | |
| * | | | | CPS: enable return expressions in CPS code if they are in tail positionphaller2012-06-1411-2/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1848-2962/+252
|\ \ \ \ \ | |_|_|/ / |/| | | | Reverting the diagrams
| * | | | Revert "Scaladoc class diagrams part 1"Vlad Ureche2012-06-1835-1649/+224
| | | | | | | | | | | | | | | | | | | | 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-1748-252/+2962
|\| | | | | | | | | | | | | | 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-1435-224/+1649
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
* | | | | | Merge pull request #724 from scalamacros/ticket/5912Josh Suereth2012-06-152-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixes SI-5912
| * | | | | | fixes SI-5912Eugene Burmako2012-06-152-1/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #719 from jsuereth/jdk7-friendly-buildJosh Suereth2012-06-151-40/+83
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding JDK7 friendly build with new partialdist(-opt) tasks.
| * | | | | | Adding JDK7 friendly build with new partialdist(-opt) tasks.Josh Suereth2012-06-141-40/+83
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * When running in JDK 7 issues a warning. * New partialdist, partialdist-opt tasks allow creating a distribution with no source/docs.
* | | | | | Merge pull request #708 from scalamacros/topic/fastlockerJosh Suereth2012-06-151-29/+64
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | fastlocker target for ant
| * | | | | fastlocker target for antEugene Burmako2012-06-151-29/+64
| | |/ / / | |/| | | | | | | | | | | | | doesn't build msil in locker.comp
* | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 08:46:05 +0000