summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3499 from densh/topic/single-element-tupleEugene Burmako2014-02-168-11/+26
|\ | | | | Make handling of tuples more consistent in quasi-quotes
| * Make handling of tuples more consistent in quasi-quotesDenys Shabalin2014-02-108-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On one hand we know that q"($expr)" is the same as q"$expr". On the other if we wrap it into a list and splice as q"(..$expr)" we get a Tuple1 constructor call which is inconsistent. This pull request fixes this inconsistency by making q"(..$expr)" being equivalent q"(${expr.head})" for single-element list. We also add support for matching of expressions as single-element tuples (similarly to blocks) and remove liftables and unliftables for Tuple1 (which aren't clearly defined any longer due to q"(foo)" == q"foo" invariant).
* | Merge pull request #3521 from xeno-by/ticket/8270Jason Zaugg2014-02-1616-308/+454
|\ \ | | | | | | SI-8270 unconfuses bundles and vanilla macros
| * | SI-8270 unconfuses bundles and vanilla macrosEugene Burmako2014-02-1316-308/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a mistake in macro impl ref typechecking that used to have an heuristic to figure out whether it looks at a bundle method ref or at a vanilla object method ref. Under some circumstances the heuristic could fail, and then the macro engine would reject perfectly good macro impls. Now every macro impl ref is typechecked twice - once as a bundle method ref and once as a vanilla object method ref. Results are then analyzed, checked against ambiguities (which are now correctly reported instead of incorrectly prioritizing towards bundles) and delivered to the macro engine. The only heuristic left in place is the one that's used to report errors. If both bundle and vanilla typechecks fail, then if a bundle candidate looks sufficiently similar to a bundle, a bundle typecheck error is reported providing some common bundle definition hints.
* | | Merge pull request #3513 from xeno-by/topic/typecheck-member-defsJason Zaugg2014-02-167-69/+86
|\ \ \ | | | | | | | | typecheck(q"class C") no longer crashes
| * | | typecheck(q"class C") no longer crashesEugene Burmako2014-02-127-69/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MemberDefs alone can't be typechecked as is, because namer only names contents of PackageDefs, Templates and Blocks. And, if not named, a tree can't be typed. This commit solves this problem by wrapping typecheckees in a trivial block and then unwrapping the result when it returns back from the typechecker.
* | | | Merge pull request #3455 from densh/topic/patdefEugene Burmako2014-02-1612-110/+228
|\ \ \ \ | | | | | | | | | | Fix SI-8202 and improve support for splicing patterns into vals
| * | | | Improve support for patterns in valsDenys Shabalin2014-02-098-53/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds construction-only support for splicing patterns into vals (a.k.a. PatDef). Due to non-locality of the desugaring it would have been quite expensive to support deconstruction as the only way to do it with current trees is to perform implodePatDefs transformation on every single tree.
| * | | | Move null check case higher to avoid NPEDenys Shabalin2014-02-091-27/+27
| | | | | | | | | | | | | | | | | | | | Also use sym.isErrorneous instead of manual name check.
| * | | | Move placeholder construction logic into PlaceholdersDenys Shabalin2014-02-093-30/+44
| | | | | | | | | | | | | | | | | | | | | | | | | Previously construction logic used to be in Parsers and deconstruction in Placeholders making it easy to forget one if you change the other.
| * | | | SI-8202 bug compatibility with SI-8211 for quasiquotesDenys Shabalin2014-02-094-1/+13
| | |_|/ | |/| |
* | | | Merge pull request #3493 from retronym/ticket/3452-2Grzegorz Kossakowski2014-02-1640-263/+840
|\ \ \ \ | | | | | | | | | | SI-3452 Correct Java generic signatures for mixins, static forwarders
| * | | | SI-3452 GenBCode version of the static-forwarder signature fixJason Zaugg2014-02-156-1/+32
| | | | | | | | | | | | | | | | | | | | Shares the code with the GenASM version of the fix.
| * | | | SI-3452 Reduce low-hanging duplication bewteen GenASM and GenBCodeJason Zaugg2014-02-152-123/+4
| | | | |
| * | | | SI-3452 Refactoring code in GenASMJason Zaugg2014-02-151-145/+146
| | | | | | | | | | | | | | | | | | | | For a non copypasta for of reuse in GenBCode.
| * | | | SI-3452 A better fix for static forwarder generic sigsJason Zaugg2014-02-154-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit fixed this in the wrong way. The addition to the test case (testing an inherited method from a base class in addition to the test with a mxin method) still failed. Like mixin, static forwarder generation uses the exact erased siganture of the forwardee for the forwarder. It really ought to use the as-seen-from signature (adding requisite boxing/ unboxing), but until we do that we have to avoid emitting generic signatures that are incoherent.
| * | | | SI-7374 Test cases for fixed Java interop problemJason Zaugg2014-02-093-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Our generic signatures now match the erasure, so no more nasty linkage errors.
| * | | | SI-3452 Correct Java generic signatures for mixins, static forwardersJason Zaugg2014-02-0931-13/+649
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Parts of this patch and some of the commentary are from @paulp] This took me so long to figure out I can't even tell you. Partly because there were two different bugs, one which only arose for trait forwarders and one for mirror class forwarders, and every time I'd make one set of tests work another set would start failing. The runtime failures associated with these bugs were fairly well hidden because you usually have to go through java to encounter them: scala doesn't pay that much attention to generic signatures, so they can be wrong and scala might still generate correct code. But java is not so lucky. Bug #1) During mixin composition, classes which extend traits receive forwarders to the implementations. An attempt was made to give these the correct info (in method "cloneBeforeErasure") but it was prone to giving the wrong answer, because: the key attribute which the forwarder must capture is what the underlying method will erase to *where the implementation is*, not how it appears to the class which contains it. That means the signature of the forwarder must be no more precise than the signature of the inherited implementation unless additional measures will be taken. This subtle difference will put on an unsubtle show for you in test run/t3452.scala. trait C[T] trait Search[M] { def search(input: M): C[Int] = null } object StringSearch extends Search[String] { } StringSearch.search("test"); // java // java.lang.NoSuchMethodError: StringSearch.search(Ljava/lang/String;)LC; The principled thing to do here would be to create a pair of methods in the host class: a mixin forwarder with the erased signature `(String)C[Int]`, and a bridge method with the same erased signature as the trait interface facet. But, this turns out to be pretty hard to retrofit onto the current setup of Mixin and Erasure, mostly due to the fact that mixin happens after erasure which has already taken care of bridging. For a future, release, we should try to move all bridging after mixin, and pursue this approach. But for now, what can we do about `LinkageError`s for Java clients? This commit simply checks if the pre-erasure method signature that we generate for the trait forward erases identically to that of the interface method. If so, we can be precise. If not, we emit the erased signature as the generic signature. Bug #2) The same principle is at work, at a different location. During genjvm, objects without declared companion classes are given static forwarders in the corresponding class, e.g. object Foo { def bar = 5 } which creates these classes (taking minor liberties): class Foo$ { static val MODULE$ = new Foo$ ; def bar = 5 } class Foo { static def bar = Foo$.MODULE$.bar } In generating these, genjvm circumvented the usual process whereby one creates a symbol and gives it an info, preferring to target the bytecode directly. However generic signatures are calculated from symbol info (in this case reusing the info from the module class.) Lacking even the attempt which was being made in mixin to "clone before erasure", we would have runtime failures of this kind: abstract class Foo { type T def f(x: T): List[T] = List() } object Bar extends Foo { type T = String } Bar.f(""); // java // java.lang.NoSuchMethodError: Bar.f(Ljava/lang/String;)Lscala/collection/immutable/List; Before/after this commit: < signature f (Ljava/lang/String;)Lscala/collection/immutable/List<Ljava/lang/String;>; --- > signature f (Ljava/lang/Object;)Lscala/collection/immutable/List<Ljava/lang/Object;>; This takes the warning count for compiling collections under `-Ycheck:jvm` from 1521 to 26.
* | | | | Merge pull request #3511 from som-snytt/issue/interp-octalAdriaan Moors2014-02-157-4/+124
|\ \ \ \ \ | | | | | | | | | | | | SI-8266 Deprecate octal escapes in f-interpolator
| * | | | | SI-8266 Deprecate octal escapes in f-interpolatorSom Snytt2014-02-117-4/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also turns the f-interpolator into a migration assistant by suggesting alternatives for the standard escapes.
* | | | | | Merge pull request #3528 from Ichoran/issue/6908Adriaan Moors2014-02-152-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6908 FlatHashTable and things that depend on it can't store nulls
| * | | | | | Made ParFlatHashTableIterator private vars private[this].Rex Kerr2014-02-151-3/+3
| | | | | | |
| * | | | | | SI-6908 FlatHashTable and things that depend on it can't store nullsRex Kerr2014-02-132-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ParFlatHashTable to use entryToElem which correctly converts sentinels to nulls.
* | | | | | | Merge pull request #3527 from Ichoran/issue/8264Adriaan Moors2014-02-153-6/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-8264 scala.collection.immutable.HashSet#- returns broken Set
| * | | | | | | SI-8264 scala.collection.immutable.HashSet#- returns broken SetRex Kerr2014-02-143-6/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was an error in HashSet's handling of removal of an element when a HashTrieSet should turn into a HashSet1. Also slightly modified HashMap's filter0 to more closely match HashSet (by adding the same comment).
* | | | | | | Merge pull request #3443 from gourlaysama/man-pagesAdriaan Moors2014-02-151-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add -Xsource:version to scalac man page
| * | | | | | | add -Xsource:version to scalac man pageAntoine Gourlay2014-01-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag was added in d43618a (PR #3340) by @huitseeker.
* | | | | | | | Merge pull request #3532 from som-snytt/issue/7711Adriaan Moors2014-02-158-13/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-7711 Do not emit extra argv in script body
| * | | | | | | | SI-7711 Test for args in scriptSom Snytt2014-02-144-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiles with -Xlint to ensure there are no lurkers. Updates `ScriptTest` to pass args to the script. It's called `argv` partly as homage, partly because `args` is an `Array`.
| * | | | | | | | SI-7711 Do not emit extra argv in script bodySom Snytt2014-02-144-12/+8
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take away `argv` and make `args` the standard parameter name. This is a quick fix to avoid "unused local" lint error. All the examples use `args`; in particular, "Step 4. Write some Scala scripts" in "Programming in Scala" uses `args`. I see the footnote there is also where Odersky concatenation is specified, `"Hello, "+ args(0) +"!"` with no space next to the literals. Also removes `argv` from `StdNames`. Was torn whether just to add `argc`. Maybe start a new project to house Names, emeritus.
* | | | | | | | Merge pull request #3534 from clhodapp/test/literate_existentialsAdriaan Moors2014-02-152-0/+228
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add an extremely well-commented test
| * | | | | | | | Add an extremely well-commented testclhodapp2014-02-142-0/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes a test for some simple existential subtyping checks. It is exceptionally well-commented and may be helpful to someone trying to figure out what the rules are (supposed to be) in the future.
* | | | | | | | | Merge pull request #3533 from adriaanm/t8283Adriaan Moors2014-02-144-41/+84
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | SI-8283 mutation-free bound inference for existentials
| * | | | | | | | SI-8283 mutation-free bound inference for existentialsJason Zaugg2014-02-144-41/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A safer version of the fix for SI-6169 (#3471) Only modify the skolems to avoid leaking the sharper bounds to `quantified`. The included test case was minimized from akka-camel (src/main/scala/akka/camel/Consumer.scala).
* | | | | | | | | Merge pull request #3531 from Ichoran/issue/8188Adriaan Moors2014-02-142-2/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-8188 NPE during deserialization of TrieMap
| * | | | | | | | | SI-8188 NPE during deserialization of TrieMapRex Kerr2014-02-142-2/+27
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | The writer was using the constructor headf and ef instead of the internal vars hashingobj and equalityobj.
* | | | | | | | | Merge pull request #3530 from Ichoran/issue/6632Adriaan Moors2014-02-143-19/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-6632 ListBuffer's updated accepts negative positions
| * | | | | | | | | SI-6632 ListBuffer's updated accepts negative positionsRex Kerr2014-02-133-19/+17
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the behavior in SeqLike.updated (which would silently accept negatives and throw on empty.tail) to throw IndexOutOfBoundException. Updated tests to verify the behavior in ListBuffer. Everything else SeqLike will come along for the ride.
* | | | | | | | | Merge pull request #3525 from adriaanm/t8177bAdriaan Moors2014-02-1415-50/+168
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-8177 specializeSym must use memberInfo on high side
| * | | | | | | | | SI-8177 tidy up in type reificationEugene Burmako2014-02-147-8/+13
| | | | | | | | | |
| * | | | | | | | | SI-8177 specializeSym must use memberInfo on high sideAdriaan Moors2014-02-1312-47/+160
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When determining whether member `symLo` of `tpLo` has a stronger type than member `symHi` of `tpHi`, should we use memberType or memberInfo? Well, memberType transforms (using `asSeenFrom`) `sym.tpe`, whereas memberInfo performs the same transform on `sym.info`. For term symbols, this ends up being the same thing (`sym.tpe == sym.info`). For type symbols, however, the `.info` of an abstract type member is defined by its bounds, whereas its `.tpe` is a `TypeRef` to that type symbol, so that `sym.tpe <:< sym.info`, but not the other way around. Thus, for the strongest (correct) result, we should use `memberType` on the low side. On the high side, we should use the result appropriate for the right side of the `<:<` above (`memberInfo`). I also optimized the method a little bit by avoiding calling memberType if the symbol on the high side isn't eligble (e.g., it's a class). PS: I had to add a workaround to reifyType, because we now dealias a little less eagerly, which means a type selection on refinement class symbols makes it to reify this broke the t8104 tests. I also had to update the run/t6992 test, which should now test the right thing. Tests should be commented and/or use sensible names. What is it testing? What is the expected outcome? We should not be left guessing.
* | | | | | | | | Merge pull request #3376 from Ichoran/issue/8153Adriaan Moors2014-02-144-21/+51
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | SI-8153 Mutation is hard, let's go shopping with an empty list
| * | | | | | | | SI-8153 Mutation is hard, let's go shopping with an empty listRex Kerr2014-02-124-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the implementation of iterator to be more robust to mutation of the underlying ListBuffer. Added a test to make sure bug is gone. Fixed an "unsafe" usage of ListBuffer.iterator in the compiler, and added a comment explaining the (new) policy for iterating over a changing ListBuffer. The compiler now uses a synchronized-wrapped ArrayBuffer instead of ListBuffer, as that makes the (custom) units Iterator more natural to write (and avoids O(n) lookups).
* | | | | | | | | Merge pull request #3526 from retronym/ticket/1786-cycleGrzegorz Kossakowski2014-02-141-0/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-8276 Test for cyclic error caused by (reverted) SI-1786 fix
| * | | | | | | | | SI-8276 Test for cyclic error caused by (reverted) SI-1786 fixJason Zaugg2014-02-131-0/+57
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We reverted SI-1786 recently on the grounds that its means of avoiding cycles (not sharpening bounds of T[_] when T is uninitialized) caused unacceptable non-determinism (well: compilation order dependency) to type inference. Nary a day later, @gkossakowski hit a regression in scala-io. Bisection revealed that it stopped working in 2dbd17a2 and started working agiain after the revert. How's that for prescience! I've distilled the cyclic error in scala-io in this test case. I'm yet to pinpoint this, followon error, which didn't survive the shrink ray, and only appeared in the original code: error: java.lang.IndexOutOfBoundsException: 0 at scala.collection.LinearSeqOptimized$class.apply(LinearSeqOptimized.scala:51) at scala.collection.immutable.List.apply(List.scala:83) at scala.reflect.internal.tpe.TypeMaps$AsSeenFromMap.correspondingTypeArgument(TypeMaps.scala:5
* | | | | | | | | Merge pull request #3524 from paulp/pr/8280Adriaan Moors2014-02-133-1/+95
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | SI-8280 regression in implicit selection.
| * | | | | | | | SI-8280 regression in implicit selection.Paul Phillips2014-02-133-1/+95
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 2fa2db7840 I fixed a bug where applicable implicit conversions would not be found for numeric types if one introduced any aliasing or singleton types, for the usual reasons involving the absence of uniform type normalization. See pos/t7228 for examples - that test case has 20 errors in 2.10.3 but compiles in master. An unintended side effect was making implicit search less oblivious. It turns out that in so doing I had created ambiguity where there was none before. Not because it was any more ambiguous, but because the compiler now had the wits to notice the ambiguity at an earlier time. The fix for this is not intuitive. The way the internal logic is, we need to keep the wool over implicit search's eyes, which leads to those unrecognized types being passed to adapt, where they are recognized and weak subtyping suffices to be more specific. It is sufficient for SI-7228 that weak subtyping be done correctly - the other change, which is reverted here, was exposing the type arguments of Function1 when a view exists as a subtype of Function1. It is also possible this could be remedied by calling weak_<:< somewhere which is presently <:<, but I don't know where and it has a far greater chance of affecting something else than does this, which is a straight reversion of a post-2.10.3 change.
* | | | | | | | Merge pull request #3389 from retronym/ticket/8134-2Jason Zaugg2014-02-1327-108/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-8134 SI-5954 Fix companions in package object under separate comp.
| * | | | | | | | SI-8134 Address pull request feedbackJason Zaugg2014-02-021-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aesthetics only.
| * | | | | | | | SI-5954 Add a TODO comment with an idea for future workJason Zaugg2014-01-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the prophet once said: "'Tis better to never do at all than to have do and undo" Let's try that in 2.12.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 02:25:00 +0000