summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1716 from paulp/merge-2.10Adriaan Moors2012-12-0553-139/+675
|\ | | | | Merged 2.10.0/x into master.
| * Merge branch 'merge-2.10-wip' into merge-2.10Paul Phillips2012-12-0553-139/+675
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722. Asserts about Tree qualifiers. Fix for SI-6731, dropped trees in selectDynamic. neg test added SI-5753 macros cannot be loaded when inherited from a class or a trait Take advantage of the margin stripping interpolator. Adds a margin stripping string interpolator. SI-6718 fixes a volatile test Mark pattern matcher synthetics as SYNTHETIC. Set symbol flags at creation. Fix for SI-6687, wrong isVar logic. Fix for SI-6706, Symbol breakage under GC. findEntry implementation code more concise and DRYer. Fix for SI-6357, cycle with value classes. Refactoring of adaptMethod SI-6677 Insert required cast in `new qual.foo.T` Conflicts: src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/internal/SymbolTable.scala src/reflect/scala/reflect/internal/util/package.scala test/files/neg/gadts1.check
| * Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10-wipPaul Phillips2012-12-054-6/+17
| |\ | | | | | | | | | | | | | | | | | | | | | | | | # By Eugene Burmako (1) and others # Via Adriaan Moors (2) and others * origin/2.10.0-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply
| | * Merge pull request #1704 from retronym/ticket/6754-2v2.10.0-RC5v2.10.0Adriaan Moors2012-12-053-2/+9
| | |\ | | | | | | | | Fix for rangepos crasher.
| | | * Fix for rangepos crasher.Paul Phillips2012-12-043-2/+9
| | | | | | | | | | | | | | | | | | | | wrapClassTagUnapply was generating an unpositioned tree which would crash under -Yrangepos. See SI-6338.
| | * | Merge pull request #1712 from jsuereth/fix/osgi-distv2.10.0-RC4Adriaan Moors2012-12-051-1/+6
| | |\ \ | | | |/ | | |/| Fixing OSGi distribution.
| | | * Fixing OSGi distribution.Josh Suereth2012-12-051-1/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | There was some kind of wierd filesystem issue where ANT would overwrite jars or not, depending on timestamps. It was a non-repeatable failure. Rather than overwrite JARs and rely on ANT, let's just spell out the non-OSGI bundles. While I had hoped to avoid hard-coding these, it's probably best we've done so.
| | * Merge pull request #1686 from scalamacros/ticket/6685Eugene Burmako2012-12-021-3/+2
| | |\ | | | | | | | | Ticket/6685
| | | * SI-6685 fixes error handling in typedApplyEugene Burmako2012-11-301-3/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MissingClassTagError doesn't lead to an exception, but rather silently sets an error, we need to bubble the resulting erroneous tree up the responsibility chain instead of mindlessly typechecking this again. This wasn't an issue before, because as far as I can guess the aforementioned error setter was always throwing exceptions in the most common usage scenarios (therefore the typecheck-again-fail-again vicious loop wasn't triggered).
| * | Merge pull request #1681 from paulp/issue/6731Adriaan Moors2012-12-0510-48/+331
| |\ \ | | | | | | | | Fix for SI-6731, dropped trees in selectDynamic.
| | * | Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.Paul Phillips2012-11-297-1/+110
| | | | | | | | | | | | | | | | | | | | All tickets involving selectDynamic fixed by the prior commit. It also fixes SI-6663, but that already has a test case.
| | * | Fix for SI-6731, dropped trees in selectDynamic.Paul Phillips2012-11-283-47/+221
| | | | | | | | | | | | | | | | I rewrote mkInvoke entirely, and boosted the test coverage.
| * | | Merge pull request #1682 from paulp/assert-about-qualifierPaul Phillips2012-12-034-7/+20
| |\ \ \ | | | | | | | | | | Asserts about Tree qualifiers.
| | * | | Asserts about Tree qualifiers.Paul Phillips2012-11-294-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Encoding recent revelations about certain tree invariants in the form of asserts.
| * | | | Merge pull request #1678 from martende/ticket/5753Eugene Burmako2012-11-2915-10/+57
| |\ \ \ \ | | |/ / / | |/| | | SI-5753 macros cannot be loaded when inherited from a class or a trait
| | * | | neg test addedmartende2012-11-276-0/+22
| | | | |
| | * | | SI-5753 macros cannot be loaded when inherited from a class or a traitmartende2012-11-279-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | enclClass should be taken from Tree otherwise we can jump to declaration class/trait.
| * | | | Merge pull request #1676 from retronym/topic/sm-interpolatorPaul Phillips2012-11-2813-55/+148
| |\ \ \ \ | | |_|/ / | |/| | | Adds a margin stripping string interpolator.
| | * | | Take advantage of the margin stripping interpolator.Jason Zaugg2012-11-269-55/+52
| | | | | | | | | | | | | | | | | | | | Safer and shorter.
| | * | | Adds a margin stripping string interpolator.Jason Zaugg2012-11-264-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only for compiler internal use. Designed to avoid surprises if the interpolated values themselves contain the margin delimiter. Before: val bip = "\n |.." s"""fooo |bar $bip |baz""".stripMargin "fooo bar .. baz" After: sm"""fooo |bar $bip |baz""" "fooo bar |.. baz"
| * | | | Merge pull request #1674 from scalamacros/topic/showrawJosh Suereth2012-11-272-4/+6
| |\ \ \ \ | | |_|/ / | |/| | | SI-6718 fixes a volatile test
| | * | | SI-6718 fixes a volatile testEugene Burmako2012-11-262-4/+6
| | | | |
| * | | | Merge pull request #1666 from paulp/issue/6707Adriaan Moors2012-11-252-4/+4
| |\ \ \ \ | | | | | | | | | | | | Flag pattern matcher synthetics as synthetic.
| | * | | | Mark pattern matcher synthetics as SYNTHETIC.Paul Phillips2012-11-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flagging synthetics accurately is important to allow for useful static analysis.
| | * | | | Set symbol flags at creation.Paul Phillips2012-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All should prefer passing flags at symbol creation to mutating the flags field after creation.
| * | | | | Merge pull request #1665 from paulp/issue/6687Adriaan Moors2012-11-252-1/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix for SI-6687, wrong isVar logic.
| | * | | | | Fix for SI-6687, wrong isVar logic.Paul Phillips2012-11-242-1/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Fields which back lazy vals need to be excluded via !isLazy lest isVar return true.
| * | | | | Merge pull request #1663 from paulp/merge-2.10.wip-xAdriaan Moors2012-11-2540-141/+410
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ \ \ \ Merge pull request #1652 from jedesah/FlatHashTableAdriaan Moors2012-11-251-7/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | findEntry implementation code more concise and DRYer.
| | * | | | | | findEntry implementation code more concise and DRYer.Jean-Remi Desjardins2012-11-201-7/+6
| | | | | | | |
| * | | | | | | Merge pull request #1647 from adriaanm/backport-1626-2.10.xAdriaan Moors2012-11-253-1/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for SI-6357, cycle with value classes.
| | * | | | | | | Fix for SI-6357, cycle with value classes.Paul Phillips2012-11-193-1/+12
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Don't force the owner info.
| * | | | | | | Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-253-6/+77
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6677 Insert required cast in `new qual.foo.T`
| | * | | | | | | Refactoring of adaptMethodJason Zaugg2012-11-181-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the early return, and address micro-duplication between adaptType and adaptMember.
| | * | | | | | | SI-6677 Insert required cast in `new qual.foo.T`Jason Zaugg2012-11-183-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Short version: we sometimes need to rewrite this as new T(qual.asInstanceOf[OwnerOfFoo].foo) Long version: `adaptMember` in Erasure performs a few tasks, among them: 1. adding an empty argument list to qualifiers in `new qual.T` for which `qual` is a val template member that has (post uncurry) a MethodType with an empty parameter list. The same rewriting was already applied in uncurry for such qualifiers appearing in other contexts, e.g. `qual.foo` was already rewritten to `qual().foo`. 2. casting, if necessary, the qualifier in `Select(qual, name)` to the type of owner of the symbol that this selection references. This can be neccesary with compound types: - some val class member has type `A with B`; - we instantiate `new ab.valMemberOfB.T` - we must pass `ab.valMemberOfB` to the constructor of `T` as the `$outer` pointer - we must cast `ab` to `B` before calling `valMemberOfB`. Failure to insert this cast can lead to a LinkageError or a VerifyError. However, if 1) was performed, 2) was not. The error is pretty easy to trigger with the new reflection API: class Test { val cm: reflect.runtime.universe.Mirror = reflect.runtime.currentMirror def error { new cm.universe.Traverser // java.lang.VerifyError } def okay1 { val cm: reflect.runtime.universe.Mirror = reflect.runtime.currentMirror new cm.universe.Traverser } } The fix applied here to `adaptMember` mirrors the existing implementation of `adaptType`.
| * | | | | | | | Merge pull request #1662 from paulp/issue/6706Eugene Burmako2012-11-242-0/+19
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | Fix for SI-6706, Symbol breakage under GC.
| | * | | | | | | Fix for SI-6706, Symbol breakage under GC.Paul Phillips2012-11-232-0/+19
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the map key and the String in the Symbol are the same reference by removing the old key before updating the map with the new key -> symbol relation.
* | | | | | | | Merge pull request #1673 from paulp/serialversionuidPaul Phillips2012-12-036-42/+71
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for SerialVersionUID instability.
| * | | | | | | | Disabled part of a test.Paul Phillips2012-11-252-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hmmm, the giant blob of binary data embedded in a test suddenly stopped working. What does one do in this spot.
| * | | | | | | | Account for existence of scala's ClassfileAnnotation.Paul Phillips2012-11-251-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently this thing is not real well tested, as the scaladoc code was written as if it does not exist.
| * | | | | | | | Eliminate some one-arg asserts.Paul Phillips2012-11-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only thing more fun than debugging non-deterministic scaladoc crashes unrelated to one's change is doing so with all one-argument asserts.
| * | | | | | | | Fix for SerialVersionUID instability.Paul Phillips2012-11-253-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can hardly believe this has been broken for a decade or so, but there it is - see test case. Four classes attempt to set their SerialVersionUID to 13. One succeeds. No warnings or errors. The output before this patch (for me anyway - your random numbers may differ) was: 860336111422349646 13 8409527228024057943 -7852527872932878365 There was already code in place for rejecting annotations with non-constant args when constant args are required, but that check is only performed on ClassfileAnnotations, and SerialVersionUID was a StaticAnnotation. Maybe people don't reach for ClassfileAnnotation because of this giant warning which I see no way to suppress: warning: Implementation restriction: subclassing Classfile does not make your annotation visible at runtime. If that is what you want, you must write the annotation class in Java. Why did I change the name of the field from uid to value? If you don't use the name 'value', you have to name the argument every time you use it, even if it's the only parameter. I didn't relish breaking every usage of scala's @SerialVersionUID in the known universe.
* | | | | | | | | Merge pull request #1669 from paulp/update-asmPaul Phillips2012-11-2874-7421/+7406
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Updated asm to 4.1.
| * | | | | | | | Updated asm to 4.1.Paul Phillips2012-11-2474-7421/+7406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Released 2012-10-14. One of the listed features is 316321: asm osgi bundles based on BND. in case that's interesting to someone.
* | | | | | | | | Merge pull request #1664 from paulp/merge-2.10.x-masterAdriaan Moors2012-11-2558-180/+736
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Merge 2.10.x into master.
| * | | | | | | | Merge branch 'merge-2.10.wip-x' into merge-2.10.x-masterPaul Phillips2012-11-2358-180/+736
|/| | | | | | | | | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10.wip-x: (24 commits) SI-6023 reify abstract vals Removing controversial `either` method from Futures API. SI-6695 Test case for fixed Array match bug adds comments to standard attachments SI-6673 fixes macro problems with eta expansions Restore the opimization apparently lost after merge. SI-6624 set info of case pattern binder to help find case field accessors Scaladoc update for collection.mutable.MultiMap SI-6663: don't ignore type parameter on selectDynamic invocation SI-6551: don't insert apply call in polymorphic expression. SI-6634 Fixes data corruption issue in ListBuffer#remove Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6150 - backport to 2.10.x branch. SI-5330, SI-6014 deal with existential self-type Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped sane printing of renamed imports SI-6440 Address regressions around MissingRequirementError ... Conflicts: src/library/scala/collection/generic/IndexedSeqFactory.scala src/library/scala/collection/mutable/ListBuffer.scala src/reflect/scala/reflect/internal/Symbols.scala src/reflect/scala/reflect/internal/Types.scala test/files/run/t6150.scala
| * | | | | | | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-xPaul Phillips2012-11-2340-141/+410
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jason Zaugg (8) and others # Via Adriaan Moors (6) and Josh Suereth (5) * origin/2.10.0-wip: Removing controversial `either` method from Futures API. SI-6624 set info of case pattern binder to help find case field accessors Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped Update comment. SI-6646 `ident` or Ident is always new binding. SI-6440 Address regressions around MissingRequirementError Refine the message and triggering of MissingRequirementError. SI-6640 Better reporting of deficient classpaths. SI-6644 Account for varargs in extmethod forwarder SI-6646 Fix regression in for desugaring. Update tools/epfl-publish
| | * | | | | Merge pull request #1656 from jsuereth/fix/remove-future-either-methodv2.10.0-RC3Adriaan Moors2012-11-211-23/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Removing controversial `either` method from Futures API.
| | | * | | | | Removing controversial `either` method from Futures API.Josh Suereth2012-11-211-23/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removes `either` from Future * No tests need to change, since this was an untested method.
| | * | | | | Merge pull request #1607 from retronym/ticket/6640Josh Suereth2012-11-1915-53/+200
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-6640 Better reporting of deficient classpaths.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 16:27:04 +0000