summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| | | * | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 12:09:42 +0000