summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #861 from dragos/revert-genasm-bg-threadv2.10.0-M5Adriaan Moors2012-07-103-91/+35
|\ | | | | Revert "GenASM: pipeline disk-write with building of classfiles"
| * Revert "GenASM: pipeline disk-write with building of classfiles"Iulian Dragos2012-07-103-91/+35
| | | | | | | | This reverts commit 5d12fa4b791e73d5c99a0e145d28cbaba12823d2.
* | Merge pull request #864 from jsuereth/fix/critical-build-fixinsJosh Suereth2012-07-101-1/+1
|\ \ | | | | | | FIXING THE SAME MISTAKE BUT IN STRAP. Yay for copy-paste ant-magic
| * | FIXING THE SAME MISTAKE BUT IN STRAP. Yay for copy-paste ant-magicJosh Suereth2012-07-101-1/+1
|/ /
* | Merge pull request #860 from jsuereth/fix/critical-build-fixinsAdriaan Moors2012-07-101-1/+2
|\ \ | |/ |/| Fixed very bad build.xml issue and quick.bin missing ASM.
| * Fixed very bad build.xml issue and quick.bin missing ASM.Josh Suereth2012-07-101-1/+2
|/
* Merge pull request #840 from jsuereth/fix/newstarr-with-sourceLukas Rytz2012-07-101-37/+31
|\ | | | | STARR now includes source
| * Added opt variant to replacestarrwinJosh Suereth2012-07-061-0/+6
| |
| * Fixed replacestarr to use packed libraries and also include source files.Josh Suereth2012-07-061-37/+25
| |
* | Merge pull request #856 from havocp/sip14-execution-changesAdriaan Moors2012-07-1015-321/+478
|\ \ | | | | | | Collection of updates to SIP-14 (scala.concurrent)
| * | Collection of updates to SIP-14 (scala.concurrent)Havoc Pennington2012-07-0915-321/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developed by Viktor Klang and Havoc Pennington - add Promise.isCompleted - add Future.successful and Future.failed - add ExecutionContextExecutor and ExecutionContextExecutorService for Java interop - remove defaultExecutionContext as default parameter value from promise and future - add ExecutionContext.Implicits.global which must be explicitly imported, rather than the previous always-available value for the implicit EC - remove currentExecutionContext, since it could create bugs by being out of sync with the implicit ExecutionContext - remove Future task batching (_taskStack) and Future.releaseStack This optimization should instead be implemented either in a specific thread pool or in a specific ExecutionContext. Some pools or ExecutionContexts may not want or need it. In this patch, the defaultExecutionContext does not keep the batching optimization. Whether it should have it should perhaps be determined through benchmarking. - move internalBlockingCall to BlockContext and remove currentExecutionContext In this patch, BlockContext must be implemented by Thread.currentThread, so the thread pool is the only place you can add custom hooks to be run when blocking. We implement BlockContext for the default ForkJoinWorkerThread in terms of ForkJoinPool.ManagedBlocker. - add public BlockContext.current and BlockContext.withBlockContext These allow an ExecutionContext or other code to override the BlockContext for the current thread. With this API, the BlockContext is customizable without creating a new pool of threads. BlockContext.current is needed to obtain the previous BlockContext before you push, so you can "chain up" to it if desired. BlockContext.withBlockContext is used to override the context for a given piece of code. - move isFutureThrowable into impl.Future - add implicitNotFound to ExecutionContext - remove default global EC from future {} and promise {} - add ExecutionContext.global for explicit use of the global default EC, replaces defaultExecutionContext - add a timeout to scala-concurrent-tck tests that block on SyncVar (so tests time out rather than hang) - insert blocking{} calls into concurrent tck to fix deadlocking - add NonFatal.apply and tests for NonFatal - add OnCompleteRunnable marker trait This would allow an ExecutionContext to distinguish a Runnable originating from Future.onComplete (all callbacks on Future end up going through onComplete). - rename ListenerRunnable to CallbackRunnable and use for KeptPromise too Just adds some clarity and consistency.
* | | Merge pull request #857 from vjovanov/masterAdriaan Moors2012-07-091-188/+0
|\ \ \ | |/ / |/| | Removing the non-deterministic actor migration test.
| * | Removing the actor migration undeterministic test.Vojin Jovanovic2012-07-091-188/+0
|/ /
* | Merge pull request #854 from ↵Adriaan Moors2012-07-0911-60/+610
|\ \ | | | | | | | | | | | | clhodapp/feature/reflection-overload-resolution-improvements2 New TermSymbol.resolveOverloaded
| * | improved resolveOverloaded docs cvogt2012-07-091-17/+17
| | | | | | | | | fixed few mistakes, easier explanation of prefix type, more regular argument descriptions
| * | Added scaladoc for resolveOverloaded.clhodapp2012-07-091-0/+18
| | |
| * | New logic for TermSymbol.resolveOverloadedclhodapp2012-07-0811-60/+592
| | |
* | | Merge pull request #841 from magarciaEPFL/fixesAdriaan Moors2012-07-094-13/+28
|\ \ \ | |/ / |/| | final touches to GenASM to become default JVM backend in M5
| * | scalac ant task now supports all GenASM targetsMiguel Garcia2012-07-081-1/+1
| | |
| * | raise compile time error about impending VerifyError due to unsorted ↵Miguel Garcia2012-07-071-0/+9
| | | | | | | | | | | | lookupswitch (SI-6011)
| * | SI-6025 fix for GenASM, GenJVM-based fix pendingMiguel Garcia2012-07-061-10/+14
| | |
| * | GenASM becomes default backend, 1.5 classfiles remain as defaultMiguel Garcia2012-07-063-3/+5
| |/
* | Merge pull request #843 from scalamacros/ticket/6036Adriaan Moors2012-07-089-56/+92
|\ \ | | | | | | SI-6036 yet again makes sense of magic symbols
| * | SI-6036 yet again makes sense of magic symbolsEugene Burmako2012-07-069-56/+92
| |/
* | Merge pull request #829 from ConnorDoyle/masterAdriaan Moors2012-07-081-3/+3
|\ \ | | | | | | Fixed an error in the documentation for MapLike
| * | Fixed the API documentation for scala.collection.MapLike.filterNot. The ↵Connor Doyle2012-07-051-3/+3
| | | | | | | | | | | | previous documentation erroneously indicated that filterNot retains elements for which the supplied predicate is true when in fact the opposite is the case, as verified in the REPL.
* | | Merge pull request #844 from paulp/topic/stop-admonishing-meAdriaan Moors2012-07-085-8/+12
|\ \ \ | | | | | | | | Knocking off a few catch _ => warnings.
| * | | Knocking off a few catch _ => warnings.Paul Phillips2012-07-065-8/+12
| | | |
* | | | Merge pull request #816 from VladUreche/feature/diagrams-dev-pullreq-newJosh Suereth2012-07-0766-607/+4146
|\ \ \ \ | | | | | | | | | | Scaladoc diagrams (again)
| * | | | Diagram tweaks #2Vlad Ureche2012-07-0212-59/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed the AnyRef linking (SI-5780) - added tooltips to implicit conversions in diagrams - fixed the intermittent dot error where node images would be left out (dot is not reliable at all -- with all the mechanisms in place to fail gracefully, we still get dot errors crawling their way into diagrams - and that usually means no diagram generated, which is the most appropriate way to fail, I think...)
| * | | | Diagram tweaks #1Vlad Ureche2012-07-0211-84/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 :))
| * | | | Documented SyncVarVlad Ureche2012-07-021-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we used it in the DocRunner and noticed it could have better documentation. Review by @heathermiller.
| * | | | Scaladoc class diagrams part 2Damien2012-07-0214-24/+1297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Also fixed the memory leak that was causing the testsuite to timeout.
| * | | | Scaladoc class diagrams part 1Vlad Ureche2012-07-0237-266/+1765
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0212-281/+466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Scaladoc diff-firendly outputVlad Ureche2012-07-027-25/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scaladoc can create raw content files that we can easily diff and spot any modifications. There is a cool project by Stefan Zeiger to export the scaladoc model in JSON, but with the language and scaladoc being so quick to evolve, it'll be a pain to properly maintain. In the long-run, the plan is to sample a couple of raw files on each build and email me the diff. If I spot anything that may be wrong I can fix it, revert the commit or at least file a bug. For now, .html.raw files are generated on-demand, using ant -Dscaladoc.raw.output="yes" <targets> Also added a script that will do the job of diff-ing. Review by @jsuereth. Conflicts: src/compiler/scala/tools/nsc/doc/Settings.scala
* | | | | Merge pull request #848 from paulp/topic/asSeenFrom-basePaul Phillips2012-07-071-14/+2
|\ \ \ \ \ | | | | | | | | | | | | Eliminated some code in asSeenFrom.
| * | | | | Eliminated some code in asSeenFrom.Paul Phillips2012-07-071-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paraphrasing martin, BaseTypeSeqs are now computed lazily so the cycle "asSeenFrom -> generates BaseTypeSeq -> generates Refinement of baseType -> needs asSeenFrom" no longer takes place. Review by @odersky.
* | | | | | Merge pull request #839 from jsuereth/starr-fixinsJosh Suereth2012-07-071-7/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix to push-jars to use same sha fixing that pull uses.
| * | | | | | Fix to push-jars to use same sha fixing that pull uses.Josh Suereth2012-07-061-7/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #838 from adriaanm/ticket-2442Adriaan Moors2012-07-072-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | SI-2442 sealedness for java enums non-experimental
| * | | | | SI-2442 sealedness for java enums non-experimentalAdriaan Moors2012-07-062-3/+3
| |/ / / /
* | | / / Tweak test to pass under java 7.Paul Phillips2012-07-061-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #834 from paulp/issue/3836-2Adriaan Moors2012-07-064-3/+81
|\ \ \ \ | |/ / / |/| | | Fix SI-3836 not-really-ambiguous import detection.
| * | | Fix SI-3836 not-really-ambiguous import detection.Paul Phillips2012-07-054-3/+81
| | | | | | | | | | | | | | | | | | | | Normalize types before declaring that two imports are ambiguous, because they might be the same thing. Review by @moors.
* | | | Merge pull request #830 from heathermiller/topic/tryeither-fixesAdriaan Moors2012-07-0612-173/+478
|\ \ \ \ | | | | | | | | | | SI-5981, SI-5979, SI-5973, SI-5890 Closed. Maintenance to Try.
| * | | | Updates scala.util.control.NonFatal documentation, as suggested in code reviewHeather Miller2012-07-061-6/+9
| | | | |
| * | | | SI-5981, SI-5979, SI-5973 Closed. Maintenance to Try.Heather Miller2012-07-0512-167/+469
| | |_|/ | |/| |
* | | | Merge pull request #824 from adriaanm/ticket-4691_6008Adriaan Moors2012-07-068-219/+273
|\ \ \ \ | | | | | | | | | | [SI-4691, SI-6008] improve patmat analyses: irrefutable user-defined extractors, no-op type tests
| * | | | refactor to implement @retronym's reviewAdriaan Moors2012-07-061-18/+20
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-21 18:18:40 +0000