summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1790 from paulp/2.10.0-wip-mergeAdriaan Moors2012-12-204-6/+17
|\ | | | | Merge 2.10.0-wip into 2.10.x
| * Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-mergePaul Phillips2012-12-194-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 #1788 from retronym/ticket/6848Paul Phillips2012-12-203-1/+5
|\ \ \ | |/ / |/| | Implicit vars should have non-implicit setters.
| * | Implicit vars should have non-implicit setters.Jason Zaugg2012-12-193-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise they trigger spurious feature warnings. scala> trait T { implicit var a: Any } <console>:7: warning: implicit conversion method a_= should be enabled by making the implicit value language.implicitConversions visible.
* | | Merge pull request #1778 from JamesIry/p_SI-6795_2.10.xAdriaan Moors2012-12-194-3/+17
|\ \ \ | | | | | | | | SI-6795 simplify "abstract override" errors on type members
| * | | SI-6795 Simplify errors related to "abstract override" on type membersJames Iry2012-12-104-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | Instead of saying "only allowed on non-type members of traits" use separate errors for "not allowed on types" and "only allowed on members of traits"
| * | | SI-6795 Adds negative check for "abstract override" on types in traitsJames Iry2012-12-104-3/+10
| | | | | | | | | | | | | | | | | | | | "abstract override" shouldn't was being allowed on types in traits but the result made no sense and the spec says that shouldn't be allowed.
* | | | Merge pull request #1771 from vigdorchik/si_6605Adriaan Moors2012-12-195-46/+56
|\ \ \ \ | | | | | | | | | | Cleanup MemberLookup. Better explain ambiguous link targets.
| * | | | Cleanup MemberLookup. Better explain ambiguous link targets.Eugene Vigdorchik2012-12-135-46/+56
| | | | |
* | | | | Merge pull request #1772 from gkossakowski/global-deadcodeAdriaan Moors2012-12-192-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove dead code from `Global`.
| * | | | | Deprecate `scala.tools.nsc.Phases` because it's dead-code.Grzegorz Kossakowski2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 0a2022c made `scala.tools.nsc.Phases` dead-code. It's not private so it got deprecated instead of being removing right away. Review by @paulp.
| * | | | | Remove dead code from `Global`.Grzegorz Kossakowski2012-12-131-2/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is clearly dead-code (`phaseTimings` is not referred anywhere else in `Global.scala`) and it's safe to remove it since `phaseTimings` is private. This dead-code is leftover from 317a1056. Review by @paulp.
* | | | | Merge pull request #1709 from retronym/ticket/3995Adriaan Moors2012-12-193-3/+41
|\ \ \ \ \ | | | | | | | | | | | | SI-3995 Exclude companions with an existential prefix.
| * | | | | Expand test with a stably qualified example.Jason Zaugg2012-12-052-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example below, we need a view from `String => l.F0`, and the companion object `FO` is reachable by a stable, non existentially-bound path. class Lift { def apply(f: F0) {} class F0 object F0 { implicit def f2f0(fn: String): F0 = ??? } } object Test { val l = new Lift l.apply("") // okay } Followup for SI-3995
| * | | | | SI-3995 Exclude companions with an existential prefix.Jason Zaugg2012-12-053-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `(qual: Q).apply(expr)` where `expr` must be implictily converted to a path dependent type `T` defined in `qual`, we were looking for companion implicits via a path prefixed by an existential skolem `_1`. These aren't much good to us, as when we try to feed them into `mkAttributedQualifer`, a crash rightly ensues. This commit excludes companions prefixed by an existentially bound path.
* | | | | | Merge pull request #1727 from scalamacros/ticket/6548Paul Phillips2012-12-195-14/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6548 reflection now correctly enters jinners
| * | | | | | cosmetic renamings in runtime reflectionEugene Burmako2012-12-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initClassModule => initClassAndModule createClassModule => initAndEnterClassAndModule
| * | | | | | SI-6548 reflection now correctly enters jinnersEugene Burmako2012-12-074-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When completing Java classes, runtime reflection enumerates their fields, methods, constructors and inner classes, loads them and enters them into either the instance part (ClassSymbol) or the static part (ModuleSymbol). However unlike fields, methods and constructors, inner classes don't need to be entered explicitly - they are entered implicitly when being loaded. This patch fixes the double-enter problem, make sure that enter-on-load uses the correct owner, and also hardens jclassAsScala against double enters that can occur in a different scenario. Since the fix is about Java-compiled classes, the test needs *.class artifacts produced by javac. Therefore I updated javac-artifacts.jar to include the new artifacts along with their source code.
* | | | | | | Merge pull request #1759 from scalamacros/topic/annotatedPaul Phillips2012-12-195-1/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fixes incorrect handling of Annotated in lazy copier
| * | | | | | | fixes incorrect handling of Annotated in lazy copierEugene Burmako2012-12-135-1/+60
| | | | | | | |
* | | | | | | | Merge pull request #1780 from scalamacros/topic/mimaAdriaan Moors2012-12-171-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | adds scala-reflect.jar to MIMA in ant
| * | | | | | | | adds scala-reflect.jar to MIMA in antEugene Burmako2012-12-161-1/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #1707 from retronym/ticket/5390Adriaan Moors2012-12-1710-1/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-5390 Detect forward reference of case class apply
| * | | | | | | | | Test showing the absence of a forward referenceJason Zaugg2012-12-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are only forbidden in terms, they are permitted in types.
| * | | | | | | | | SI-5390 Detect forward reference of case class applyJason Zaugg2012-12-049-1/+63
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refchecks performs (among others) two tasks at once: - detecting forward references - translating `qual.Case(...)` to `new qual.Case(...)` As is often the case with such multi-tasking tree traversals, completion of one task precluded the other.
* | | | | | | | | Merge pull request #1776 from adriaanm/mailmap-2.10.xAdriaan Moors2012-12-171-0/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | update mailmap
| * | | | | | | | update mailmapAdriaan Moors2012-12-141-0/+25
| | | | | | | | |
* | | | | | | | | Merge pull request #1706 from retronym/ticket/5361Adriaan Moors2012-12-154-4/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-5361 Avoid cyclic type with malformed refinement
| * | | | | | | | | SI-5361 Refactor in accordance with review comments.Jason Zaugg2012-12-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for malformed stats in the refinement body in the same place we check for erroneous parents.
| * | | | | | | | | SI-5361 Avoid cyclic type with malformed refinementJason Zaugg2012-12-044-3/+16
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The statement `val x = this` in the refinment type: (new {}): {val x = this} is lazily typechecked, in order to, according to the comment in `typedRefinment, "avoid cyclic reference errors". But the approximate type used ends up with: Refinment@1( parents = [...] decls = { val x: Refinement@1 }) This commit eagerly checks that there is no term definitions in type refinments, rather than delaying this. This changes the error message for SI-3614.
* | | | | | | | | Merge pull request #1766 from scalamacros/topic/typed-ident-attachmentsEugene Burmako2012-12-146-1/+24
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | typedIdent no longer destroys attachments
| * | | | | | | | typedIdent no longer destroys attachmentsEugene Burmako2012-12-136-1/+24
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When transforming Idents to qualified Selects, typedIdent used to forget about carrying original attachments to the resulting tree. Not anymore.
* | | | | | | | Merge pull request #1754 from retronym/ticket/6288Adriaan Moors2012-12-148-14/+252
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | SI-6288 Perfecting positions
| * | | | | | | Expand pattern match position tests.Jason Zaugg2012-12-122-11/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds tests for unapplySeq and unapply: Boolean. Both seem to be well positioned after the previous changes.
| * | | | | | | SI-6288 Remedy ill-positioned extractor binding.Jason Zaugg2012-12-123-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to `Option#get` on the result of the unapply method was unpositioned and ended up with the position of the `match`.
| * | | | | | | SI-6288 Fix positioning of label jumpsJason Zaugg2012-12-124-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICode generation was assigning the position of the last label jump to all jumps to that particular label def. This problem is particularly annoying under the new pattern matcher: a breakpoint in the body of the final case will be triggered on the way out of the body of any other case. Thanks to @dragos for the expert guidance as we wended our way through GenICode to the troublesome code. Chalk up another bug for mutability. I believe that the ICode output should be stable enough to use a a .check file, if it proves otherwise we should make it so.
| * | | | | | | SI-6288 Position argument of unapplyJason Zaugg2012-12-113-2/+57
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `atPos(pos) { ... }` doesn't descend into children of already positioned trees, we need to manually set the position of `CODE.REF(binder)` to that of the stunt double `Ident(nme.SELECTOR_DUMMY)`.
* | | | | | | Merge pull request #1740 from scalamacros/topic/super-call-argsPaul Phillips2012-12-122-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | s/SuperCallArgs/SuperArgs/
| * | | | | | | s/SuperCallArgs/SuperArgs/Eugene Burmako2012-12-102-9/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applies a minor renaming that I failed to thoroughly perform in the last pull request which refactored parent types.
* | | | | | | Merge pull request #1742 from scalamacros/ticket/4044Paul Phillips2012-12-122-22/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | prevents spurious kind bound errors
| * | | | | | | simplifies checkBoundsEugene Burmako2012-12-131-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is an isomorphic transformation of checkBounds, which avoids doing any checks altogether if the scrutinee is already erroneous. Inspection of checkKindBounds and isWithinBounds called from checkBounds suggests that they don't perform side effects which can't be omitted.
| * | | | | | | prevents spurious kind bound errorsEugene Burmako2012-12-102-8/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds a check which makes sure that the trees we're about to report aren't already erroneous.
* | | | | | | Merge pull request #1758 from hubertp/2.10.x-issue/strip-tvarsAdriaan Moors2012-12-122-2/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | When we strip tvars we should also recursively strip their instantiation...
| * | | | | | | Recurse into instantiations when stripping type vars.Hubert Plociniczak2012-12-122-2/+27
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This led to the inference of weird types as list of lub base types was empty. This change fixes case x3 in the test case.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 17:17:26 +0000