summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2574 from paulp/issue/3425Paul Phillips2013-05-242-10/+17
|\ | | | | SI-3425 erasure crash with refinement members.
| * SI-3425 erasure crash with refinement members.Paul Phillips2013-05-212-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking that a refinement class symbol does not override any symbols does mean it will have to be invoke reflectively; but the converse is not true. It can override other symbols and still have to be called reflectively, because the overridden symbols may also be defined in refinement classes. scala> class Foo { type R1 <: { def x: Any } ; type R2 <: R1 { def x: Int } } defined class Foo scala> typeOf[Foo].member(TypeName("R2")).info.member("x": TermName).overrideChain res1: List[$r.intp.global.Symbol] = List(method x, method x) scala> res1 filterNot (_.owner.isRefinementClass) res2: List[$r.intp.global.Symbol] = List() And checking that "owner.info decl name == this" only works if name is not overloaded. So the logic is all in "isOnlyRefinementMember" now, and let's hope that suffices for a while.
* | Merge pull request #2576 from retronym/ticket/7436Paul Phillips2013-05-231-1/+1
|\ \ | | | | | | SI-7436 Varargs awareness for super param aliasing.
| * | SI-7436 Varargs awareness for super param aliasing.Jason Zaugg2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Don't consider a super class parameter accessor to be an alias if it is a repeated. Parameter aliases are used to avoid retaining redundant fields in the subclass; but that optimization is out of the question here.
* | | Merge pull request #2568 from scalamacros/topic/abstractfile-classloaderEugene Burmako2013-05-223-246/+9
|\ \ \ | |_|/ |/| | Moves AbstractFileClassLoader to scala-reflect.jar
| * | Moves AbstractFileClassLoader to scala-reflect.jarEugene Burmako2013-05-203-246/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Its string name was used in ReflectionUtils and became broken after repl got factored out. This hints that that classloader belongs to where it is used, i.e. to scala-reflect.jar. Moreover AbstractFile is defined in scala-reflect.jar, so it's only logical to also define a derived classloader in scala-reflect.jar.
* | | Swabbing exprTypeArgs.Paul Phillips2013-05-201-55/+50
| | | | | | | | | | | | | | | Oh exprTypeArgs, you will send us to the poorhouse with your spendy ways. So many tuples have been dying needlessly.
* | | Help makeFullyDefined allocate fewer ListBuffers.Paul Phillips2013-05-201-8/+7
| | |
* | | Tried to follow own advice with isCoercible.Paul Phillips2013-05-202-38/+36
| | | | | | | | | | | | | | | | | | | | | Only to discover that it's really hard to move isCoercible anywhere because it wants to call inferView which, despite its suggestive name, is not visible in Infer. So I did what I could and documented it a little.
* | | Wipe some dirt off protoTypeArgs's face.Paul Phillips2013-05-201-14/+8
| | | | | | | | | | | | He's a good kid, even if not the most hygenic.
* | | Splashed soap and water on checkAccessible.Paul Phillips2013-05-201-67/+29
| | | | | | | | | | | | | | | | | | | | | Yes checkAccessible, you patiently waited your turn. Do you like your new clothes? Oh, still not clean enough? I understand, but we must leave time for the other methods. Now run along and check something.
* | | Pull some big chunks out of checkAccessible.Paul Phillips2013-05-201-0/+43
| | | | | | | | | | | | To streamline the essential logic.
* | | Remove isPossiblyMissingArgs.Paul Phillips2013-05-202-18/+4
| | | | | | | | | | | | It has been hardcoded to return false for a long while anyway.
* | | Annotated return type of a method.Paul Phillips2013-05-201-4/+3
| | | | | | | | | | | | | | | | | | Because nobody should have to guess a return type like (List[Type], Array[Int], Boolean). In fact nobody should ever experience such a return type at all.
* | | Commented out code from 2008.Paul Phillips2013-05-201-7/+0
| | |
* | | Commented out code from 2007.Paul Phillips2013-05-201-43/+0
| | | | | | | | | | | | It's not exactly 2006-era code but it's still a little ripe.
* | | Commented out code from 2006.Paul Phillips2013-05-201-13/+0
| | | | | | | | | | | | | | | | | | Yes, 2006. Perhaps we should have a "sunset provision" which removes commented-out code after seven years. Or even slightly sooner.
* | | Scrubbing up inferPolyAlternatives.Paul Phillips2013-05-201-77/+67
| | | | | | | | | | | | Now you can take inferPolyAlternatives home to meet your mother.
* | | Moving on to checkBounds.Paul Phillips2013-05-201-26/+19
| | | | | | | | | | | | So much dust and debris, so little time.
* | | Cleaning crew moves down the hall.Paul Phillips2013-05-201-98/+70
| | | | | | | | | | | | | | | | | | | | | Swabbing the decks of isAsSpecific and isApplicableSafe. Wow isApplicableSafe, you don't really need to declare and allocate a two-argument case class in order to manage a second method call.
* | | Cleaning up isApplicable and neighbors.Paul Phillips2013-05-202-99/+72
| | | | | | | | | | | | | | | I'd really like these methods to receive greater scrutiny. To that end I'm scrutinizing them.
* | | Merge pull request #2492 from paulp/pr/enter-elimination-modePaul Phillips2013-05-2010-444/+555
|\ \ \ | | | | | | | | Toward more organized typer state.
| * \ \ Merge remote-tracking branch 'origin/master' into pr/enter-elimination-modePaul Phillips2013-05-192-19/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: An attempt to make tests deterministic. SI-7427 stop crashing under -Ydebug.
| * \ \ \ Merge commit 'd93826f278' into pr/enter-elimination-modePaul Phillips2013-05-1810-444/+555
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd93826f278': Incorporated reviewer feedback. Incorporated reviewer feedback. Refactored stabilize. Eliminated HKmode. Eliminated RETmode. Eliminated SNDTRYmode. Started eliminating modes. Corralling Modes into a smaller pen. Conflicts: src/compiler/scala/tools/nsc/typechecker/Macros.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | * | | Incorporated reviewer feedback.Paul Phillips2013-05-163-51/+49
| | | | | | | | | | | | | | | | | | | | Made things a little more consistent and self-apparent.
| | * | | Merge branch 'master' into HEADPaul Phillips2013-05-1612-68/+109
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: SI-7469 Remove @deprecated scala.util.logging SI-3943 Test case for already-fixed Java interop bug Fix formatting for couple of docs in the compiler SI-7476 Add documentation to GenericTraversableTemplate SI-7469 Remove @deprecated scala.util.parsing.ast SI-7469 Remove @deprecated MurmurHash elements SI-7469 Remove deprecated elements in s.u.parsing.combinator SI-7469 Make @deprecated elems in scala.concurrent private[scala] removes duplication in inferImplicitValue SI-7047 fixes silent for c.inferImplicitXXX SI-7167 implicit macros decide what is divergence macroExpandAll is now triggered in all invocations of typed SI-5923 instantiates targs in deferred macro applications SI-6406 Restore deprecated API SI-6039 Harden against irrelevant filesystem details Limit unnecessary calls to Type#toString. fix typo in comment SI-7432 add testcases SI-7432 Range.min should throw NoSuchElementException on empty range AbstractFile.getDirectory does not return null when outDir is "." Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | * | | | Incorporated reviewer feedback.Paul Phillips2013-05-112-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | Made things a little more consistent and self-apparent.
| | * | | | Refactored stabilize.Paul Phillips2013-05-113-79/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mode elimination ramps up in difficulty now, so I pursued other forms of code hygiene.
| | * | | | Eliminated HKmode.Paul Phillips2013-05-113-36/+52
| | | | | | | | | | | | | | | | | | | | | | | | It becomes context mode "TypeConstructor".
| | * | | | Eliminated RETmode.Paul Phillips2013-05-112-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | It becomes context mode "ReturnExpr".
| | * | | | Eliminated SNDTRYmode.Paul Phillips2013-05-112-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | It becomes context mode "SecondTry".
| | * | | | Started eliminating modes.Paul Phillips2013-05-114-69/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidating the scattered typer state in Context, where it's relatively easy to keep an eye on, rather than threaded throughout the typer in sneaky/sticky bitmasks. The general pattern will be what was once an explicitly passed around bit in Mode becomes an implicitly propagated-as-appropriate bit in Context. In this commit: ALTmode becomes context mode "PatternAlternative" STARmode becomes context mode "StarPatterns" SUPERCONSTRmode becomes context mode "SuperInit"
| | * | | | Corralling Modes into a smaller pen.Paul Phillips2013-05-115-229/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to reduce the frequency of low-level operations with modes. I mean stuff like this: if ((mode & (EXPRmode | LHSmode)) == EXPRmode) THey don't make those ten line boolean guards any easier to understand. Hopefully this will lead us toward eliminating some of the modes entirely, or at least better isolating their logic rather than having it interspersed at arbitrary points throughout the typer. Modes are in their entirety a leaked implementation detail. Typing a tree requires a tree and optionally an expected type. It shouldn't require a bucket of state bits. In subsequent commits I will start eliminating them. This commit also breaks adapt down into more digestible chunks.
* | | | | | Merge pull request #2562 from som-snytt/issue/double-pluginv2.11.0-M3Jason Zaugg2013-05-201-7/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-7494 Each plugin must only be instantiated once.
| * | | | | SI-7494 Each plugin must only be instantiated once.Som Snytt2013-05-181-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old behavior was that Plugin.loadAllFrom took a distinct list of plugin locations. The broken behavior incorrectly punted to the pruning algorithm in Plugins.loadPlugins$pick. The new behavior is to distinctify the list of class names to load. This is more robust; under the old scheme, specifying the continuations.jar under two file names would fail as described in the ticket. Pruning a plugin by disabling (-Xplugin-disable) or because it steps on someone else's phase name suffers the same defect. There is no way to tell the plugin it has been benched. And you know that global I gave you? Can I have it back?
* | | | | | SI-7427 stop crashing under -Ydebug.Paul Phillips2013-05-192-19/+17
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "dumpClassesAndAbort" to "devWarning". You can witness it happen like so. % scalac test/files/pos/t7427.scala -Ydebug -Xdev ... [running phase cleanup on t7427.scala] [running phase icode on t7427.scala] warning: !!! PJUMP(method matchEnd4)/scala.tools.nsc.backend.icode.GenICode$PJUMP is not a control flow instruction warning: !!! PJUMP(method case6)/scala.tools.nsc.backend.icode.GenICode$PJUMP is not a control flow instruction [running phase inliner on t7427.scala] [running phase inlinehandlers on t7427.scala] Having now lived with this for months, I have no ambition to unravel the actual problem, I just want it to stop crashing.
* | | | | Merge 2.10.x into masterAdriaan Moors2013-05-171-3/+7
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/typechecker/Implicits.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala
| * | | | Merge pull request #2530 from kzys/jira-6424Adriaan Moors2013-05-171-9/+25
| |\ \ \ \ | | | | | | | | | | | | SI-6424 Scaladoc: Use mapNodes.get(_) to avoid NoSuchElementException
| | * | | | SI-6424 Scaladoc: Use mapNodes.get(_) to avoid NoSuchElementExceptionKato Kazuyoshi2013-05-151-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | Use mapNodes.get(_) instead of mapNodes(_) to avoid NoSuchElementException.
| * | | | | Merge pull request #2549 from vigdorchik/slash_slashAdriaan Moors2013-05-171-4/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Prevent slash duplication.
| | * | | | | Prevent slash duplication.Eugene Vigdorchik2013-05-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add trailing slash to external doc URL if it already ends with one.
| * | | | | | SI-7486 regression in implicit resolution.Paul Phillips2013-05-171-3/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | What a touchy beast the compiler is.
* | | | | | Merge pull request #2555 from soc/SI-7492Adriaan Moors2013-05-173-217/+113
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-7492 Remove -Ystruct-dispatch and associated code
| * | | | | | SI-7492 Remove -Ystruct-dispatch and associated codeSimon Ochsenreither2013-05-173-217/+113
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that the private option is gone as well as the untested code for no-cache and mono-cache and the non-working code for invoke-dynamic. poly-cache is now always used. For the future it probably makes more sense to let the backend decide how it wants to treat structural dispatch instead of allowing the user to “mix and match” backends with structural dispatch implementations.
* | | | | | Merge pull request #2518 from paulp/issue/1786Adriaan Moors2013-05-171-15/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-1786 incorporate defined bounds in inference
| * | | | | | No bounds-driven inference for the named.Paul Phillips2013-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a variation on the previous commit which excludes named type parameters, so this works def f(x: Class[_]) = x.foo.bar But this does not: def f[T](x: Class[T]) = x.foo.bar This seems undesirable to me, but I offer it in case it makes the patch more attractive to others.
| * | | | | | SI-1786 incorporate defined bounds in inferencePaul Phillips2013-05-121-15/+39
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes SI-5459. Look, you don't have to redeclare the bounds, isn't it exciting? For instance, there are eight places in JavaMirrors with this: jTypeVariable[_ <: GenericDeclaration] After this code is in starr, those can look like this: jTypeVariable[_] Since TypeVariable's definition looks like this: interface TypeVariable<D extends GenericDeclaration> We already know that!
* | | | | | Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-17440-53725/+8974
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ================================================================ Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala ================================================================ Merge -s ours 4e64a27 ([nomaster commit range]) ================================================================ Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/Macros.scala
| * | | | Merge pull request #2454 from vigdorchik/scaladoc_fixesJason Zaugg2013-05-172-2/+0
| |\ \ \ \ | | | | | | | | | | | | This is a cleanup of scaladoc code.
| | * | | | Remove self types check suppression usage from scaladoc.Eugene Vigdorchik2013-05-172-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Also remove private setting not used anymore.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 14:24:40 +0000