summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* De-duplicate logic in maven deployment.Adriaan Moors2013-11-061-22/+47
|
* Enforce consistency of pack, docs, osgi, maven tasks.Adriaan Moors2013-11-061-141/+201
| | | | | | | | | | | | | Instead of scattering properties all over invocations of staged-docs, staged-pack, make-bundle, copy-bundle and mvn-package, these are now all fully determined by the project they act on. The varying arguments to these macros are all centralized. They are named like `project.prop`, where `prop` is one of: description, package, dir, name, namesuffix, version, targetdir, targetjar, jar, docroot, skipPackage, srcdir, src, srcjar. The defaults for these properties are computed using `init-project-prop`.
* Merge pull request #3086 from axel22/topic/pc-execution-contextAdriaan Moors2013-11-0511-74/+201
|\ | | | | - parallel collections should use default ExecutionContext
| * SI-7938 - parallel collections should use default ExecutionContextAleksandar Prokopec2013-10-2911-74/+201
| | | | | | | | | | | | | | | | | | | | Parallel collections now use `scala.concurrent.ExecutionContext` by default. The `ExecutionContextTaskSupport` is optimized to use the `ForkJoinPool` underlying the `ExecutionContext` if possible. Otherwise, a fallback `TaskSupport` that creates a reduction tree and execute an operation through `Future`s is used.
* | Merge pull request #3099 from yinxusen/patch-1Adriaan Moors2013-11-041-2/+2
|\ \ | | | | | | Fix typo in ParIterableLike
| * | from Issue #3098Xusen Yin2013-11-051-2/+2
|/ / | | | | from Issue #3098, some typos.
* | Merge pull request #3088 from retronym/ticket/7944Jason Zaugg2013-11-032-1/+29
|\ \ | | | | | | SI-7944 FOUND: stray undetermined type params in vicinity of implicits
| * | SI-7944 FOUND: stray undetermined type params in vicinity of implicitsJason Zaugg2013-10-312-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit search created a nested Context into which the results of its typechecking, namely, errors and undetermined type parameters (roughly: those inferred as Nothing) are stashed. The code the drives the process was checking for errors, but discarded those undetermined type parameters. This commit copies them from the child context to the parent, which lets `Typer#adapt` to get to: else if (hasUndetsInMonoMode) { // (9) assert(!context.inTypeConstructorAllowed, context) //@M instantiatePossiblyExpectingUnit(tree, mode, pt) } Our lost TypeVar has found its way home! The reward for which is being instantiated, based on another type inference session adapting the expression's type to the expected type.
* | | Merge pull request #3083 from retronym/topic/tools-autumn-cleanJason Zaugg2013-11-0320-790/+0
|\ \ \ | | | | | | | | Cleanup tools/*
| * | | Remove tools/*{cp, _scala, _scalac}, and tools/*pickledJason Zaugg2013-10-2814-159/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scripts to fire up a compiler or REPL from build products have bitrotted just enough to get rid of them. They do not include the correct JLine, nor the scala modules. I've also removed showPickled and diffPickled which were based on these, and were also based on some code in ShowPickled that no longer exists since 48cc8b4.
| * | | Remove tools/remotetestJason Zaugg2013-10-281-230/+0
| | | | | | | | | | | | | | | | I suggest using the scala-checkin-manual Jenkins job instead.
| * | | Remove tools/test-renamerJason Zaugg2013-10-281-82/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It delivered us the terser 't1234' naming convention for test cases. Its work is done. This commit does the bidding of the script's author: > Despite its shameful hackiness, checked in for posterity. > It'll live on forever in the git history; then I can remove it.
| * | | Remove tools/updatescalacheckJason Zaugg2013-10-281-130/+0
| | | | | | | | | | | | | | | | We no longer maintain a fork.
| * | | Remove outdated build scripts.Jason Zaugg2013-10-282-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only used on the 2.9.x series: /code/jenkins-config grep -R epfl-build . ./jobs/scala-nightly-checkinit-2.9.x/config.xml: <command>./tools/epfl-build 2.9.x -Xcheckinit</command> ./jobs/scala-nightly-main-2.9.x/config.xml:./tools/epfl-build 2.9.x &amp;&amp; ./tools/epfl-publish 2.9.x /code/jenkins-config grep -R epfl-publish . ./jobs/scala-nightly-main-2.9.x/config.xml:./tools/epfl-build 2.9.x &amp;&amp; ./tools/epfl-publish 2.9.x
| * | | Remove tools/make-release-notesJason Zaugg2013-10-281-129/+0
| | |/ | |/| | | | | | | This has lived in scala/make-release-notes for some time.
* | | Merge pull request #3089 from retronym/topic/opt-collections-seqJason Zaugg2013-11-039-13/+13
|\ \ \ | |_|/ |/| | Collections: remove redundant calls to .seq
| * | Collections: remove redundant calls to .seqJason Zaugg2013-10-319-13/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Students of Scala's history might recall that at introduction of parallel collections, GenIterable et al were *not* added; instead the parallel collections inherited from the existing interfaces. This of course was an invitation to widespread disaster as any existing code that foreach-ed over a collection might now experience unwanted concurrency. The first attempt to fix this was to add the `.seq` method to convert a parallel colleciton to a sequential one. This was added in e579152f732, and call sites in the standard library with side-effecting foreach calls were changed to use that. But this was (rightly) deemed inadequate, as we could hardly expect people to change existing code or remember to do this in new code. So later, in 3de96153e5b, GenIterable was sprouted, and parallel collections were re-parented. This commit removes residual needless calls to .seq when the static type of the receiver is already a plain Iterable, which are no-ops.
* | Merge pull request #3084 from retronym/topic/optJason Zaugg2013-10-302-2/+3
|\ \ | | | | | | Microoptimization in implicit search
| * | Microptimization in implicit searchJason Zaugg2013-10-282-2/+3
| |/ | | | | | | Avoid creating a throwaway list of parameter types.
* | Merge pull request #3076 from soc/SI-7605-deprecate-proceduresJames Iry2013-10-294-1/+27
|\ \ | | | | | | SI-7605 Deprecate procedure syntax
| * | SI-7605 Deprecate procedure syntaxSimon Ochsenreither2013-10-244-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit covers three cases: - constructor definitions (def this {...}) - concrete method definitions (def foo {...}) - abstract method declarations (def foo) The deprecation is currently hidden behind -Xfuture pending IDE support for migrating users from procedures to methods.
* | | Merge pull request #3082 from retronym/ticket/6385Grzegorz Kossakowski2013-10-2914-33/+102
|\ \ \ | | | | | | | | SI-6385 Avoid bridges to identical signatures over value classes
| * | | SI-6385 Avoid bridges to identical signatures over value classesJason Zaugg2013-10-2814-33/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Paul noted in the comments to SI-6260 (from which I mined some test cases) "there is no possible basis for conflict here": scala> class C[A](val a: Any) extends AnyVal defined class C scala> class B { def x[A](ca: C[A]) = () } defined class B scala> class D extends B { override def x[A](ca: C[A]) = () } <console>:8: error: bridge generated for member method x: [A](ca: C[A])Unit in class D which overrides method x: [A](ca: C[A])Unit in class B clashes with definition of the member itself; both have erased type (ca: Object)Unit class D extends B { override def x[A](ca: C[A]) = () } ^ What was happening? Bridge computation compares `B#x` and `D#x` exitingErasure, which results in comparing: ErasedValueType(C[A(in B#x)]) =:= ErasedValueType(C[A(in D#x)]) These types were considered distinct (on the grounds of the unique type hash consing), even though they have the same erasure and involve the same value class. That triggered creation of an bridge. After post-erasure eliminates the `ErasedValuedType`s, we find that this marvel of enginineering is bridges `(Object)Unit` right back onto itself. The previous resolution of SI-6385 (d435f72e5fb7fe) was a test case that confirmed that we detected the zero-length bridge and reported it nicely, which happened after related work in SI-6260. But we can simply avoid creating in it in the first place. That's what this commit does. It does so by reducing the amount of information carried in `ErasedValueType` to the bare minimum needed during the erasure -> posterasure transition. We need to know: 1. which value class wraps the value, so we can box and unbox as needed 2. the erasure of the underlying value, which will replace this type in post-erasure. This construction means that the bridge above computation now compares: ErasedValueType(C, Any) =:= ErasedValueType(C, Any]) I have included a test to show that: - we don't incur any linkage or other runtime errors in the reported case (run/t6385.scala) - a similar case compiles when the signatures align (pos/t6260a.scala), but does *not* compile when the just erasures align (neg/t6260c.scala) - polymorphic value classes continue to erase to the instantiated type of the unbox: (run/t6260b.scala) - other cases in SI-6260 remains unsolved and indeed unsolvable without an overhaul of value classes: (neg/t6260b.scala) In my travels I spotted a bug in corner case of null, asInstanceOf and value classes, which I have described in a pending test.
* | | | Merge pull request #3069 from adriaanm/build-maven-publishAdriaan Moors2013-10-2812-1033/+958
|\ \ \ \ | |_|_|/ |/| | | Rework build to allow publishing core to maven
| * | | Bundle source and class file bundling in osgi bundling.Adriaan Moors2013-10-251-85/+59
| | | | | | | | | | | | | | | | Fix oversight in not skipping scalap's ad-hoc published docs on docs.skip.
| * | | Tidy pom xml files.Adriaan Moors2013-10-257-366/+358
| | | |
| * | | Fail build on error in signed maven publish.Adriaan Moors2013-10-251-1/+1
| | | |
| * | | Build cleanup. Prepare for scaladoc module build.Adriaan Moors2013-10-222-49/+52
| | | |
| * | | Targets for publishing core to maven.Adriaan Moors2013-10-221-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ant publish-core-signed-opt-nodocs` creates and publishes the smallest possible set of jars (library/reflect/compiler) we can send to maven. It uploads jars with class files and sources, but no docs (so that we don't need to build scaladoc or any other modules). `ant publish-core-signed-opt` is similar, but also publishes docs. For local experimentation: `ant publish-core-local-nodocs`. With a little bit more work, this can be used instead of `replacestarr`.
| * | | Towards minimal build for publishing core to maven.Adriaan Moors2013-10-223-241/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `unless` attribute in targets so that `docs.skip` influences dependency graph. Create `scaladoc` task in `pack.core` so that we don't need `pack.done` for publishing the core. Move source bundle creation from `dist.src` to `osgi.core`/`osgi.done`. Split dependencies of maven publishing into core/all variants: `osgi.core` creates osgi bundles for just lib/reflect/comp.
| * | | Support publishing to maven from main buildAdriaan Moors2013-10-222-100/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Publish to maven with `ant publish.local`, `ant publish`, or `ant publish.signed`. For now, we must keep copying `src/build/maven/maven-deploy.xml` to `dists/maven/latest.build.xml`, along with its dependencies, as it's used by jenkins jobs and PR validation. TODO: `inline src/build/maven/maven-deploy.xml` into `build.xml`.
| * | | Simplify packing, align maven-deploy and pack-maven.Adriaan Moors2013-10-211-173/+101
| | | |
| * | | Inline src/build/pack.xml into build.xml.Adriaan Moors2013-10-212-273/+233
| | | | | | | | | | | | | | | | It tended too easily to get out of synch with build.xml.
| * | | Continuations plugin gets its own osgi source bundle.Adriaan Moors2013-10-211-9/+14
| | | |
| * | | Generate scaladoc for each subproject.Adriaan Moors2013-10-211-68/+63
| | | |
| * | | Untangle classpaths related to doc targets.Adriaan Moors2013-10-211-16/+26
| | | |
| * | | Remove dead target: locker.actorsAdriaan Moors2013-10-211-8/+0
| | | |
| * | | Clarify comment.Adriaan Moors2013-10-211-1/+2
| | | |
| * | | Correct license to 3-clause BSD in poms.Adriaan Moors2013-10-217-21/+14
| | | |
* | | | Merge pull request #3080 from retronym/topic/empty-checkJason Zaugg2013-10-2764-16/+0
|\ \ \ \ | |_|/ / |/| | | Check file maintainence
| * | | Remove orphaned check files and flags files.Jason Zaugg2013-10-275-16/+0
| | | | | | | | | | | | | | | | (for f in $(find test -name '*.check' -o -name '*.flags'); do bare=$(echo $f | sed -E 's/\.\w+$//'); ([[ -f "$bare" ]] || [[ -d "$bare" ]] || [[ -f "$bare.scala" ]] || [[ -f "$bare.test" ]] || echo $f) done;) | xargs rm
| * | | Remove empty check files and flags files.Jason Zaugg2013-10-2759-0/+0
|/ / / | | | | | | | | | for f in $(find test -name '*.check' -o -name '*.flags'); do [[ $(wc -c $f | sed -E 's/ *([0-9]+).*/\1/') == "0" ]] && rm $f; done
* | | Merge pull request #3073 from retronym/ticket/7928Jason Zaugg2013-10-252-1/+21
|\ \ \ | | | | | | | | Favour module accessors symbols in rebind
| * | | SI-7928 Favour module accessors symbols in rebindJason Zaugg2013-10-232-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Refchecks tree transformer transforms a nested modules that overrides a method into a pair of symbols: the module itself, and an module accessor that matches the overridden symbol. [[syntax trees at end of typer]] // test1.scala package <empty> { abstract trait C2 extends scala.AnyRef { def O1: Any }; class C1 extends AnyRef with C2 { object O1 extends scala.AnyRef } } [[syntax trees at end of refchecks]] // test1.scala package <empty> { abstract trait C2 extends scala.AnyRef { def O1: Any }; class C1 extends AnyRef with C2 { object O1 extends scala.AnyRef @volatile <synthetic> private[this] var O1$module: C1.this.O1.type = _; <stable> def O1: C1.this.O1.type = { C1.this.O1$module = new C1.this.O1.type(); C1.this.O1$module } } } When constructing a TypeRef or SingleType with a prefix and and a symbol, the factory methods internally use `rebind` to see if the provided symbol should be replaced with an overriding symbol that is available in that prefix. Trying this out in the REPL is a bit misleading, because even if you change phase to `refchecks`, you won't get the desired results because the transform is not done in an InfoTransformer. scala> val O1 = typeOf[C1].decl(TermName("O1")) O1: $r.intp.global.Symbol = object O1 scala> typeRef(typeOf[C2], O1, Nil) res13: $r.intp.global.Type = C2#O1 scala> res13.asInstanceOf[TypeRef].sym.owner res14: $r.intp.global.Symbol = class C1 But debugging the test case, we get into `rebind` during an AsSeenFrom which is where we crashed when `suchThat` encountered the overloaded module and module accessor symbols: typeOf[OuterObject.Inner.type].memberType(symbolOf[InnerTrait.Collection]) ... singleTypeAsSeen(OuterTrait.this.Inner.type) val SingleType(pre, sym) = tp // pre = OuterTrait.this.type // sym = OuterTrait.Inner val pre1 = this(pre) // OuterObject.type singleType(pre1, sym) rebind(pre1, sym) // was crashing, now OuterObject.Inner } This commit excludes the module symbol from symbol lookup in the prefix in rebind.
* | | | Merge pull request #3079 from jamesward/fix/ec-implicit-errorJames Iry2013-10-251-1/+1
|\ \ \ \ | | | | | | | | | | More clear implicitNotFound error for ExecutionContext
| * | | | More clear implicitNotFound error for ExecutionContextJames Ward2013-10-241-1/+1
| | | | |
* | | | | Merge pull request #3077 from retronym/topic/phase-descAdriaan Moors2013-10-246-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Update description of explicitouter phase.
| * | | | | Update description of explicitouter phase.Jason Zaugg2013-10-246-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Patern translation now happens earlier.
* | | | | | Merge pull request #3006 from ivmaykov/masterAdriaan Moors2013-10-242-0/+58
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | SI-7883 - don't iterate over all keys in MapWrapper.containsKey()
| * | | | | SI-7883: Added a comment per CR feedback from @adriaanm, @IchoranIlya Maykov2013-10-031-0/+3
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-06 14:58:52 +0000