summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-deletePaul Phillips2012-12-0610-2171/+7
|\ | | | | | | | | | | | | | | * commit 'refs/pull/1717/head': SI-6769 Removes GenJVM backend Conflicts: src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
| * SI-6769 Removes GenJVM backendJames Iry2012-12-0510-2171/+7
| | | | | | | | | | Get rid of GenJVM and everything that refers to it. Also get rid of GenAndroid since it's dead code that refers to GenJVM.
* | Merge pull request #1697 from retronym/ticket/6745-2Adriaan Moors2012-12-061-1/+8
|\ \ | | | | | | Don't return unimportables from importedSymbol.
| * | Don't return unimportables from importedSymbol.Jason Zaugg2012-12-031-1/+8
| |/ | | | | | | | | | | | | | | | | | | Hardening against the symptom of SI-6745, which yielded: wat.scala:4: error: too many arguments for constructor Predef: ()object Predef def this() = this(0) ^ The fix for the underlying problem in that bug has been targetted at branch 2.10.x.
* | Merge pull request #1693 from paulp/name-implicit-removalAdriaan Moors2012-12-0630-111/+104
|\ \ | | | | | | Name implicit removal
| * | Remove TermName -> String implicit.Paul Phillips2012-12-029-41/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | These implicits were crutches going back to a much Stringier time. Of course "with great type safety comes great verbosity" and no doubt this could be cleaned up significantly further. At least the underpinnings are consistent now - the only implicits involving name should be String -> TypeName and String -> TermName.
| * | Remove Name -> TermName implicit.Paul Phillips2012-12-0122-70/+71
| | | | | | | | | | | | And simplify the name implicits.
* | | Merge branch 'merge-2.10-wip' into merge-2.10Paul Phillips2012-12-0513-112/+104
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-051-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | Fix for rangepos crasher.Paul Phillips2012-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | wrapClassTagUnapply was generating an unpositioned tree which would crash under -Yrangepos. See SI-6338.
| | * | 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-051-47/+38
| |\ \ \ | | | | | | | | | | Fix for SI-6731, dropped trees in selectDynamic.
| | * | | Fix for SI-6731, dropped trees in selectDynamic.Paul Phillips2012-11-281-47/+38
| | | | | | | | | | | | | | | | | | | | I rewrote mkInvoke entirely, and boosted the test coverage.
| * | | | Merge pull request #1682 from paulp/assert-about-qualifierPaul Phillips2012-12-032-2/+2
| |\ \ \ \ | | | | | | | | | | | | Asserts about Tree qualifiers.
| | * | | | Asserts about Tree qualifiers.Paul Phillips2012-11-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding recent revelations about certain tree invariants in the form of asserts.
| * | | | | Merge pull request #1678 from martende/ticket/5753Eugene Burmako2012-11-291-10/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | SI-5753 macros cannot be loaded when inherited from a class or a trait
| | * | | | SI-5753 macros cannot be loaded when inherited from a class or a traitmartende2012-11-271-10/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | 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-288-46/+44
| |\ \ \ \ | | |/ / / | |/| | | Adds a margin stripping string interpolator.
| | * | | Take advantage of the margin stripping interpolator.Jason Zaugg2012-11-268-46/+44
| | | | | | | | | | | | | | | | | | | | Safer and shorter.
| * | | | 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 #1663 from paulp/merge-2.10.wip-xAdriaan Moors2012-11-254-8/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ \ \ \ Merge pull request #1647 from adriaanm/backport-1626-2.10.xAdriaan Moors2012-11-251-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for SI-6357, cycle with value classes.
| | * | | | | | Fix for SI-6357, cycle with value classes.Paul Phillips2012-11-191-1/+2
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Don't force the owner info.
| * | | | | | Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-251-6/+16
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | 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-181-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1673 from paulp/serialversionuidPaul Phillips2012-12-031-16/+20
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix for SerialVersionUID instability.
| * | | | | 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.
* | | | | | Merge pull request #1669 from paulp/update-asmPaul Phillips2012-11-281-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Updated asm to 4.1.
| * | | | | Updated asm to 4.1.Paul Phillips2012-11-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'merge-2.10.wip-x' into merge-2.10.x-masterPaul Phillips2012-11-235-34/+52
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-234-8/+22
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 #1607 from retronym/ticket/6640Josh Suereth2012-11-191-3/+9
| | |\ \ | | | | | | | | | | SI-6640 Better reporting of deficient classpaths.
| | | * | SI-6440 Address regressions around MissingRequirementErrorJason Zaugg2012-11-131-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Go back to using globalError to report when a stub's info is referenced, and only throw the MissingRequirementError when compilation really must abort due to having a StubTermSymbol in a place where a StubClassSymbol would have been a better choice. This situation arises when an entire package is missing from the classpath, as was the case in the reported bug. Adds `StoreReporterDirectTest`, which buffers messages issued during compilation for more structured interrogation. Use this in two test for manifests -- these tests were using a crude means of grepping compiler console output to focus on the relevant output, but this approach was insufficient with the new multi-line error message emitted as part of this change. Also used that base test class to add two new tests: one for the reported error (package missing), and another for a simpler error (class missing). The latter test shows how stub symbols allow code to compile if it doesn't the subset of signatures in some type that refer to a missing class. Gave the INFO/WARNING/ERROR members of Reporter sensible toString implementations; they inherit from Enumeration#Value in an unusual manner (why?) that means the built in toString of Enumeration printed `Severity@0`.
| | * | | Merge pull request #1638 from adriaanm/ticket-6624Josh Suereth2012-11-191-1/+11
| | |\ \ \ | | | | | | | | | | | | SI-6624 better lookup of case field accessors for case class pattern with complicated type
| | | * | | SI-6624 set info of case pattern binder to help find case field accessorsAdriaan Moors2012-11-161-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes the type checker infers a weird type for a sub-pattern of a case class/extractor pattern this confuses the pattern matcher and it can't find the case field accessors for the sub-pattern use the expected argument type of the extractor corresponding to the case class that we're matching as the info for the sub-pattern binder -- this type more readily admits querying its caseFieldAccessors
| * | | | | SI-6023 reify abstract valsYour Name2012-11-232-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type trees created by MethodSynthesis for abstract val getters carry symless originals, which are unusable for reification purposes (or the result of reification will be unhygienic). To combat this, type trees for such getters are now created empty, i.e. without any `tpe` set, just having an original assigned. Subsequent `typedTypeTree` invocations fill in the `tpe` and update the original to be symful.
| * | | | | Merge pull request #1645 from scalamacros/ticket/6673Josh Suereth2012-11-211-4/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | SI-6673 fixes macro problems with eta expansions
| | * | | | | SI-6673 fixes macro problems with eta expansionsEugene Burmako2012-11-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eta expansions previously caused the typer to disable macros. That was done in order to detect eta expansion of macro defs and show the user an appropriate error message. Macros were disabled because to find out whether we're expanding a macro def, we need to get its symbol, and to get a symbol of something we need to typecheck that something. However typechecking automatically expands macros, so, unless we disable macros, after a typecheck we won't be able to analyze macro occurrences anymore. Unfortunately this solution has a fatal flaw. By disabling macros we not only prevent the eta-expandee from macro expanding, but also all the subtrees of that eta-expandee (see SI-6673). This commit adds a mechanism for fine-grained control over macro expansion. Now it's possible to prohibit only the node, but not its children from macro expanding.
| * | | | | | Merge pull request #1620 from namin/si-6551Josh Suereth2012-11-201-4/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes SI-6551.
| | * | | | | | SI-6551: don't insert apply call in polymorphic expression.Nada Amin2012-11-161-4/+5
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Don't rewrite an explicit apply method to dynamic polytypes.
| * | | | | | Merge pull request #1621 from jannic/SI-6663-2.10.xJosh Suereth2012-11-201-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Si 6663 2.10.x fix type parameter on selectDynamic
| | * | | | | | SI-6663: don't ignore type parameter on selectDynamic invocationJan Niehusmann2012-11-161-1/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mkInvoke to handle selectDynamic calls of the form new C.foo[T].xyz or new C.foo[T].xyz :U (where C extends Dynamic) Without this patch, the type parameter was silently ignored, and possibly inferred to a different. This patch fixes mkInvoke to handle these cases, where ctxTree has the form Select(TypeApply(fun, targs), nme) or Typed(...)
| * / / / / / Restore the opimization apparently lost after merge.Eugene Vigdorchik2012-11-181-19/+7
| |/ / / / /
* | | | | | Merge pull request #1648 from paulp/unused-bonanza-2Adriaan Moors2012-11-21149-2830/+218
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removing unused code, take 2.
| * | | | | | Remove code from compiler central.Paul Phillips2012-11-2050-1143/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All those old-timey methods whose melodies have become unfashionable.
| * | | | | | Remove code from misc bits of the compiler.Paul Phillips2012-11-206-41/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are everywhere. They defy categorization. They are... M I S C
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 19:13:22 +0000