summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Diagram tweaks #1Vlad Ureche2012-07-023-4/+74
| | | | | | | | | | | | | | | | | | | | - relaxed the restrictions on nodes - nodes can be classes, traits and objects, both stand-alone and companion objects -- all are added to the diagram, but usually companion objects are filtered out as they don't have any superclasses - changed the rules for default diagram creation: - classes and traits (and AnyRef) get inheritance diagrams - packages and objects get content diagrams (can be overridden by @contentDiagram [hideDiagram] and @inheritanceDiagram [hideDiagram]) - tweaked the model to register subclasses of Any - hardcoded the scala package diagram to show all relations - enabled @contentDiagram showInheritedNodes by default and changed the setting to hideInheritedNodes (and added a test for this) - better node selection (can select nodes that don't have a corresponding trait) - fixed the docsite link in member selection, which was broken since the first commit :))
* Scaladoc class diagrams part 1Vlad Ureche2012-07-0217-62/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Adapted to the new model and fixed a couple of problems: - duplicate implicit conversions in StringAdd/StringFormat - incorrect implicit conversion signature (from X to X) Conflicts: src/compiler/scala/tools/nsc/doc/Settings.scala src/compiler/scala/tools/nsc/doc/html/page/Template.scala src/compiler/scala/tools/nsc/doc/model/Entity.scala src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala src/compiler/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
* Reorganized scaladoc modelVlad Ureche2012-07-023-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the old model was "interruptible", it was prone to something similar to race conditions -- where the model was creating a template, that template creating was interrupted to creat another template, and so on until a cycle was hit -- then, the loop would be broken by returning the originally not-yet-finished template. Now everything happens in a depth-first order, starting from root, traversing packages and classes all the way to members. The previously interrupting operations are now grouped in two categories: - those that were meant to add entities, like inheriting a class from a template to the other (e.g. trait T { class C }; trait U extends T) => those were moved right after the core model creation - those that were meant to do lookups - like finding the companion object -- those were moved after the model creation and inheritance and are not allowed to create new documentable templates. Now, for the documentable templates we have: DocTemplateImpl - the main documentable template, it represents a Scala template (class, trait, object or package). It may only be created when modelFinished=false by methods in the modelCreation object NoDocTemplateMemberImpl - a non-documented (source not present) template that was inherited. May be used as a member, but does not get its own page NoDocTemplateImpl - a non-documented (source not present) template that may not be used as a member and does not get its own page For model users: you can use anything in the ModelFactory trait at will, but not from the modelCreation object -- that is reserved for the core model creation and using those functions may lead to duplicate templates, invalid links and other ugly problems.
* Merge pull request #798 from retronym/ticket/2807-4Adriaan Moors2012-07-022-15/+27
|\ | | | | SI-2807 Avoid catch all warning for Stable Id patterns
| * SI-2807 Avoid catch all warning for Stable Id patternsJason Zaugg2012-06-302-15/+27
| |
* | Merge pull request #802 from retronym/ticket/5489Adriaan Moors2012-07-023-0/+20
|\ \ | | | | | | SI-5489 Avoid accidentally adding members to Object in erasure.
| * | SI-5489 Avoid accidentally adding members to Object in erasure.Jason Zaugg2012-07-013-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Symbol#classBound` assumed that `refinedType` would return a a type based on new refinement class symbol; but that isn't so during erasure. Instead, it returns the first super class, into which we entered new members. Needless to say, the next run of the resident compiler didn't take kindly to these hijinks. To remedy the situation, I've added (yet another) condition on `phase.erasedTypes`.
* | | Merge pull request #771 from retronym/ticket/4176-2Adriaan Moors2012-07-022-0/+11
|\ \ \ | | | | | | | | SI-4176 A repeat dose of repeated parameter type sanitization.
| * | | SI-4176 A repeat dose of repeated parameter type sanitization.Jason Zaugg2012-06-302-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - During eta expansion, treat parameters of type A* as Seq[A] - Do the same for method/class parameters as referred to by an Ident. Also fixes SI-5967, which shows up during pattern matching.
* | | | SI-5932 Tone down non-sensible == warning with refinements.Jason Zaugg2012-07-012-0/+16
| |/ / |/| | | | | | | | Errs on the side of avoiding false positives.
* | | Merge pull request #792 from jsuereth/fixup/from-reprJosh Suereth2012-06-292-22/+63
|\ \ \ | |_|/ |/| | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike t...
| * | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike type ↵Josh Suereth2012-06-272-22/+63
| | | | | | | | | | | | class-ish things.
* | | Merge pull request #793 from jsuereth/fix/convert-toJosh Suereth2012-06-293-10/+10
|\ \ \ | | | | | | | | Renaming convertTo to to on GenTraversableOnce.
| * | | Renaming convertTo to to on GenTraversableOnce.Josh Suereth2012-06-283-10/+10
| | | |
* | | | Merge branch 'master' into issue/5846,4597,4027,4112Aleksandar Prokopec2012-06-28124-506/+2247
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/MapLike.scala src/library/scala/collection/SortedMapLike.scala
| * \ \ \ Merge pull request #790 from axel22/issue/3326Josh Suereth2012-06-282-0/+82
| |\ \ \ \ | | |/ / / | |/| | | Fix SI-3326.
| | * | | Fix SI-3326.Aleksandar Prokopec2012-06-272-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The heart of the problem - we want to retain the ordering when using `++` on sorted maps. There are 2 `++` overloads - a generic one in traversables and a map-specific one in `MapLike` - which knows about the ordering. The problem here is that the expected return type for the expression in which `++` appears drives the decision of the overload that needs to be taken. The `collection.SortedMap` does not have `++` overridden to return `SortedMap`, but `immutable.Map` instead. This is why `collection.SortedMap` used to resort to the generic `TraversableLike.++` which knows nothing about the ordering. To avoid `collection.SortedMap`s resort to the more generic `TraverableLike.++`, we override the `MapLike.++` overload in `collection.SortedMap` to return the proper type `SortedMap`.
| * | | | Merge pull request #783 from phaller/topic/cps-return-revertAdriaan Moors2012-06-288-134/+0
| |\ \ \ \ | | | | | | | | | | | | Revert pull request #720 (CPS: enable return expressions in CPS code if ...
| | * | | | Revert pull request #720 (CPS: enable return expressions in CPS code if they ↵phaller2012-06-278-134/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are in tail position) Reverts commit 0ada0706746c9c603bf5bc8a0e6780e5783297cf. Reverts commit 51c92f02229098d0b402a65a72267f7a17984022. Reverts commit cdfbe8e39fbbec00c969cd74f117ae410b98b40b. Reverts commit 796024c7429a03e974a7d8e1dc5c80b84f82467d.
| * | | | | Merge pull request #786 from axel22/issue/5986-cherryJosh Suereth2012-06-273-2/+53
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5986.
| | * | | | | Fix SI-5986.Aleksandar Prokopec2012-06-273-2/+53
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here we had an issue that RedBlack does not work the same way for sets - which are not supposed to replace an element if it is the same (wrt equals) and maps - which should replace the corresponding values. Adding an overwrite parameter which decides whether to overwrite added keys if they are the same in the ordering. Fix tests.
| * | | | | Merge pull request #785 from axel22/feature/to-parJosh Suereth2012-06-272-1/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Parallelize convertTo in parallel collection.
| | * | | | Parallelize convertTo in parallel collection.Aleksandar Prokopec2012-06-272-1/+27
| | | |/ / | | |/| |
| * | | | Merge pull request #787 from axel22/issue/5971Josh Suereth2012-06-272-0/+27
| |\ \ \ \ | | | | | | | | | | | | Fix SI-5971.
| | * | | | Fix SI-5971.Aleksandar Prokopec2012-06-272-0/+27
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `AbstractTransformed` abstract inner class in views in order to force generating bridges, one must take care to push the corresponding collection trait (such as `Iterable` or `Seq`) as far as possible to the left in the linearization order -- otherwise, overridden methods from these traits can override the already overridden methods in view. This was the case with `takeWhile`.
| * | | | Merge pull request #782 from hubertp/issue/5839Adriaan Moors2012-06-272-0/+13
| |\ \ \ \ | | | | | | | | | | | | Test that closes SI-5839. Bug itself most probably fixed by #602
| | * | | | Test that closes SI-5839. Bug itself most probably fixed by #602Hubert Plociniczak2012-06-272-0/+13
| | | | | |
| * | | | | Merge pull request #754 from scalamacros/topic/removereflectcompatAdriaan Moors2012-06-273-4/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | removes pre-M4 compatibility stubs for the IDE
| | * | | | | removes pre-M4 compatibility stubs for the IDEEugene Burmako2012-06-213-4/+3
| | | | | | |
| * | | | | | Merge pull request #780 from hubertp/topic/fix-rangepos-buildAdriaan Moors2012-06-272-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix range positions when applying anonymous classes.
| | * | | | | | Fix range positions when applying anonymous classes. Review by @dragos or ↵Hubert Plociniczak2012-06-262-0/+10
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | @odersky
| * | | | | | Merge pull request #778 from adriaanm/topic-virtpatmatAdriaan Moors2012-06-279-0/+78
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | patmat bugfixes and minor clean ups
| | * | | | | | make tests independent of compiler apiAdriaan Moors2012-06-274-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: t5899 should also be refactored, but I couldn't figure out how I tried the obvious Cake Light pattern with abstract types etc, but that didn't trigger it there must be something with indirection through paths as well
| | * | | | | | SI-5899 exhaustiveness for non-class typesAdriaan Moors2012-06-262-0/+20
| | | | | | | |
| | * | | | | | SI-5914 handle null in classtag extractorAdriaan Moors2012-06-262-0/+10
| | | | | | | |
| | * | | | | | SI-2442 fixed by virtpatmat -- test files onlyAdriaan Moors2012-06-264-0/+18
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #779 from hubertp/issue/5148Adriaan Moors2012-06-274-4/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Closes SI-5148.
| | * | | | | Closes SI-5148.Hubert Plociniczak2012-06-274-4/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately we have to wrap transform to catch all the MissingRequirementErrors exceptions (wrapped in TypeErrors). This is because we force the info of the symbol in a couple of places and we would have to catch all/some of them (and remove the duplicates as well which really becomes messy). Review by @axel22.
| * | | | | SI-5761: fix up #774 (missing check file)Adriaan Moors2012-06-261-0/+16
| | | | | |
| * | | | | Merge pull request #774 from hubertp/issue/5761Adriaan Moors2012-06-261-0/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | Added test for SI-5761.
| | * | | | | Added test for SI-5761.Hubert Plociniczak2012-06-261-0/+16
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Seems that my cleanup of SI-4842 also fixed that one. Review by @paulp or @retronym.
| * / / / / fix for SI-4935Miguel Garcia2012-06-263-0/+11
| |/ / / /
| * | | | Merge pull request #769 from hubertp/topic/t4842-followupAdriaan Moors2012-06-265-11/+11
| |\ \ \ \ | | | | | | | | | | | | Minor followup on SI-4842: remove awkward condition. Review by @retronym
| | * | | | Minor followup on SI-4842: remove awkward condition. Review by @retronym.Hubert Plociniczak2012-06-255-11/+11
| | | | | |
| * | | | | Merge pull request #760 from retronym/ticket/5966-3Adriaan Moors2012-06-252-0/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | SI-5966 Fix eta expansion for repeated parameters with zero arguments.
| | * | | | | SI-5966 Fix eta expansion for repeated parameters with zero arguments.Jason Zaugg2012-06-232-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworks part of e33901 / SI-5610, which was inserting an <empty> tree as an argument in this case, which turns into a null in icode.
| * | | | | | Merge pull request #767 from retronym/ticket/5968Adriaan Moors2012-06-252-0/+9
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | SI-5968 Eliminate spurious exhaustiveness warning with singleton types.
| | * | | | | SI-5968 Eliminate spurious exhaustiveness warning with singleton types.Jason Zaugg2012-06-232-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A singleton type is a type ripe for enumeration.
| * | | | | | Merge pull request #733 from retronym/ticket/4989-3Adriaan Moors2012-06-242-0/+75
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | SI-4989 Reject super.x if an intermediate class declares x abstract.
| | * | | | | SI-4989 Reject super.x if an intermediate class declares x abstract.Jason Zaugg2012-06-172-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in line with Java's treatment. Without this, an AbstractMethodError is thrown at runtime.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-16 02:05:55 +0000