summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Changes tree pretty printer to use shorter name constructorsDen Shabalin2012-12-252-4/+4
| | | | | |
| * | | | | Changes reifier to use shorter name constructorsDen Shabalin2012-12-252-3/+3
| | | | | |
| * | | | | Adds extractors for TypeName, TermName and ModifiersDen Shabalin2012-12-255-4/+98
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to pattern match over type names, term names and modifiers. Otherwise it can be quite painful to match over complex trees as each name or modifiers requires a guard. This pull request also changes the name of default constructor for term and type names i.e. TypeName(s) instead of newTermName(s). This is shorter to type, more consistent with the rest of reflection api and consistent with the way it will be pattern matched later on.
* | | | | Merge pull request #1815 from scalamacros/topic/fresh-nameEugene Burmako2012-12-293-3/+26
|\ \ \ \ \ | | | | | | | | | | | | renames c.fresh to c.freshName
| * | | | | renames c.fresh to c.freshNameEugene Burmako2012-12-253-3/+26
| |/ / / /
* | | | | Merge pull request #1811 from scalamacros/topic/tree-nonemptyEugene Burmako2012-12-292-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | | adds Tree.nonEmpty
| * | | | adds Tree.nonEmptyEugene Burmako2012-12-252-0/+8
| |/ / / | | | | | | | | | | | | So that trees become consistent with isEmpty on lists and options.
* | | | Merge pull request #1826 from adriaanm/paulp-pr-dealiasWidenPaul Phillips2012-12-2852-270/+248
|\ \ \ \ | |_|/ / |/| | | uniform dealiasing and widening
| * | | SI-6846, regression in type constructor inference.Paul Phillips2012-12-283-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 658ba1b4e6 some inference was gained and some was lost. In this commit we regain what was lost and gain even more. Dealiasing and widening should be fully handled now, as illustrated by the test case.
| * | | Cleaning up type alias usage.Paul Phillips2012-12-287-45/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I determined that many if not most of the calls to .normalize have no intent beyond dealiasing the type. In light of this I went call site to call site knocking on doors and asking why exactly they were calling any of .normalize .widen.normalize .normalize.widen and if I didn't like their answers they found themselves introduced to 'dropAliasesAndSingleTypes', the recursive widener and dealiaser which I concluded is necessary after all. Discovered that the object called 'deAlias' actually depends upon calling 'normalize', not 'dealias'. Decided this was sufficient cause to rename it to 'normalizeAliases'. Created dealiasWiden and dealiasWidenChain. Dropped dropAliasesAndSingleTypes in favor of methods on Type alongside dealias and widen (Type#dealiasWiden). These should reduce the number of "hey, the type alias doesn't work" bugs.
| * | | Shored up a hidden dealiasing dependency.Paul Phillips2012-12-285-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the comment says: // This way typedNew always returns a dealiased type. This // used to happen by accident for instantiations without type // arguments due to ad hoc code in typedTypeConstructor, and // annotations depended on it (to the extent that they worked, // which they did not when given a parameterized type alias // which dealiased to an annotation.) typedTypeConstructor // dealiases nothing now, but it makes sense for a "new" to // always be given a dealiased type. PS: Simply running the test suite is becoming more difficult all the time. Running "ant test" includes time consuming activities of niche interest such as all the osgi tests, but test.suite manages to miss the continuations tests.
| * | | Fix and simplify typedTypeConstructor.Paul Phillips2012-12-2842-129/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Investigating the useful output of devWarning (-Xdev people, it's good for you) led back to this comment: "normalize to get rid of type aliases" You may know that this is not all the normalizing does. Normalizing also turns TypeRefs with unapplied arguments (type constructors) into PolyTypes. That means that when typedParentType would call typedTypeConstructor it would find its parent had morphed into a PolyType. Not that it noticed; it would blithely continue and unwittingly discard the type arguments by way of appliedType (which smoothly logged the incident, thank you appliedType.) The simplification of typedTypeConstructor: There was a whole complicated special treatment of AnyRef here which appears to have become unnecessary. Removed special treatment and lit a candle for regularity. Updated lots of tests regarding newly not-so-special AnyRef.
| * | | Removed dead implementation.Paul Phillips2012-12-281-82/+0
|/ / / | | | | | | | | | | | | Another "attractive nuisance" burning off time until I realized it was commented out.
* | | Merge pull request #1786 from retronym/ticket/6745-3Paul Phillips2012-12-268-12/+75
|\ \ \ | | | | | | | | SI-6745 Fix <init> lookup
| * | | SI-6745 Fix <init> lookupJason Zaugg2012-12-188-12/+75
| | |/ | |/| | | | | | | | | | | | | We should only consult the decls of the enclosing class. Members of the self type, enclosing scopes, or imports should not be considered.
* | | Merge pull request #1820 from paulp/pr/what-old-patmatPaul Phillips2012-12-2630-2392/+46
|\ \ \ | | | | | | | | Removed old pattern matcher.
| * | | Removed old pattern matcher.Paul Phillips2012-12-2630-2392/+46
| | |/ | |/|
* | | Merge pull request #1806 from paulp/pr/fasttrackPaul Phillips2012-12-264-25/+34
|\ \ \ | |/ / |/| | Rewrote FastTrack for clarity.
| * | Rewrote FastTrack for clarity.Paul Phillips2012-12-234-25/+34
| | | | | | | | | | | | | | | | | | We can say what we wish to say with more directness and with fewer vars, levels of indirection, public members, and implicit conversions.
* | | Merge pull request #1783 from paulp/pr/opt-specializePaul Phillips2012-12-243-12/+27
|\ \ \ | |/ / |/| | Optimization in SpecializeTypes.
| * | Optimization in SpecializeTypes.Paul Phillips2012-12-173-12/+27
| |/ | | | | | | | | Avoid time traveling to find type parameters which will never be there.
* | Merge pull request #1798 from paulp/pr/check-thread-access-masterPaul Phillips2012-12-231-1/+0
|\ \ | | | | | | Remove stray debugging output line.
| * | Remove stray debugging output line.Paul Phillips2012-12-221-1/+0
| | | | | | | | | | | | I finally reached my "CHECK THREAD ACCESS" limit.
* | | Merge pull request #1506 from som-snytt/issue/6446-plugin-descPaul Phillips2012-12-2233-157/+422
|\ \ \ | |/ / |/| | PluginComponent contributes description to -Xshow-phases. (Fixes SI-6446)
| * | PluginComponent contributes description to -Xshow-phases.Som Snytt2012-12-1833-157/+422
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Global, SubComponent is called a phase descriptor, but it doesn't actually have a description. (Phase itself does.) This fix adds a description to PluginComponent so that plugins can describe what they do in -Xshow-phases. Elliptical descriptions Exploded archives Plugged-in partest Roundup at the Little h!
* | Merge pull request #1796 from adriaanm/paulp-pr/update-mailmapAdriaan Moors2012-12-201-10/+57
|\ \ | | | | | | Fixing up the mailmap.
| * | Fixing up the mailmap.Paul Phillips2012-12-201-10/+57
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The format of the mailmap was wrong, and it was not accomplishing its intended task. I fixed it, and then obsessed/compulsed over the names for a while. Here's how you can tell if you're accomplishing something with the mailmap: % git shortlog -nse |wc -l Was 162, now 128.
* | Merge pull request #1769 from soc/SI-6809Adriaan Moors2012-12-2012-35/+22
|\ \ | | | | | | SI-6809 Forbids deprecated case class definitions without parameter list
| * | SI-6809 Forbids deprecated case class definitions without parameter listSimon Ochsenreither2012-12-1312-35/+22
| | | | | | | | | | | | This has been deprecated since at least 2.7.7, so it should be good to go.
* | | Merge pull request #1794 from paulp/merge-2.10.xAdriaan Moors2012-12-20102-610/+1504
|\ \ \ | | | | | | | | Merge 2.10.x into master.
| * \ \ Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.xPaul Phillips2012-12-20102-610/+1504
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/2.10.x: (31 commits) Implicit vars should have non-implicit setters. Deprecate `scala.tools.nsc.Phases` because it's dead-code. scaladoc Template: remove duplicate code and several usages of Option.get. adds scala-reflect.jar to MIMA in ant Test showing the absence of a forward reference update mailmap Remove dead code from `Global`. Cleanup MemberLookup. Better explain ambiguous link targets. typedIdent no longer destroys attachments fixes incorrect handling of Annotated in lazy copier simplifies checkBounds Recurse into instantiations when stripping type vars. Extract base scaladoc functionality for the IDE. Expand pattern match position tests. SI-6288 Remedy ill-positioned extractor binding. SI-6288 Fix positioning of label jumps SI-6288 Position argument of unapply Fixes SI-6758: force LazyAnnnotationInfo for DefDef and TypeDef SI-6795 Simplify errors related to "abstract override" on type members SI-6795 Adds negative check for "abstract override" on types in traits ... Conflicts: .mailmap src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/ast/DocComments.scala src/compiler/scala/tools/nsc/doc/base/CommentFactoryBase.scala src/compiler/scala/tools/nsc/doc/html/page/Source.scala src/compiler/scala/tools/nsc/doc/html/page/Template.scala src/compiler/scala/tools/nsc/doc/model/LinkTo.scala src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala test/scaladoc/run/links.scala
| | * \ \ Merge pull request #1781 from vigdorchik/html_templateAdriaan Moors2012-12-201-70/+69
| | |\ \ \ | | | | | | | | | | | | scaladoc Template: remove duplicate code and several usages of Option.get.
| | | * | | scaladoc Template: remove duplicate code and several usages of Option.get.Eugene Vigdorchik2012-12-171-70/+69
| | | | | |
| | * | | | 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 #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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 23:56:05 +0000