summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Check named-args-for-clarity incur no extra bytecodeJason Zaugg2013-03-053-0/+22
| | | | | | | | | When named arguments correspond the the parameter declaration order, the compiler should not lift out assignments before the method call, as it would have to do for out-of-order arguments. Confirm this with a bytecode comparison test.
* Name boolean arguments in src/library.Jason Zaugg2013-03-0524-71/+71
|
* Name boolean arguments in src/reflect.Jason Zaugg2013-03-0511-31/+31
|
* Name boolean arguments in src/compiler.Jason Zaugg2013-03-0570-302/+302
| | | | | | | | | | What would you prefer? adaptToMemberWithArgs(tree, qual, name, mode, false, false) Or: adaptToMemberWithArgs(tree, qual, name, mode, reportAmbiguous = false, saveErrors = false)
* Merge pull request #2197 from paulp/pr/integrate-range-positionsJames Iry2013-03-0521-420/+372
|\ | | | | Integrate range positions.
| * Eliminated separate RangePositions trait.Paul Phillips2013-03-049-311/+271
| | | | | | | | | | | | | | One of those eternal headaches which probably sounded better on paper. Even before range positions are the default, there's no reason we can't have the range position code available in all globals enabled via settings, just like everything else.
| * Disentangled RangePositions from interactive.Paul Phillips2013-03-0420-409/+401
| | | | | | | | | | | | | | This is a stepping stone to having range positions all the time, as well as to modularizing the presentation compiler. It does not enable range positions by default, only places them smoewhere where they can be.
* | Merge pull request #2183 from mt2309/tailrec-intmapPaul Phillips2013-03-051-0/+3
|\ \ | | | | | | Require firstKey and lastKey on IntMap tail-recursive.
| * | Require firstKey and lastKey on IntMap to be tail recursive.Michael Thorpe2013-03-021-0/+3
| | |
* | | Merge pull request #2195 from vigdorchik/lint_libraryPaul Phillips2013-03-0511-40/+14
|\ \ \ | | | | | | | | Changes around lint
| * | | Remove unused symbols and imports from the library.Eugene Vigdorchik2013-03-057-12/+1
| | | |
| * | | Since the problem in SI-6758 is fixed, it's ok to move checking for unused ↵Eugene Vigdorchik2013-03-054-28/+13
| | | | | | | | | | | | | | | | imports to Analyzer. This allows the check to be used in the IDE.
* | | | Merge pull request #2191 from mergeconflict/SI-7132Paul Phillips2013-03-053-15/+22
|\ \ \ \ | | | | | | | | | | SI-7132 - don't discard Unit type in interpreter
| * | | | SI-7132 - don't discard Unit type in interpreterDan Rosen2013-03-023-15/+22
| | | | |
* | | | | Merge pull request #2187 from JamesIry/master_SI-6816Paul Phillips2013-03-054-1/+15
|\ \ \ \ \ | | | | | | | | | | | | SI-6816 Deprecate -Yeta-expand-keeps-star
| * | | | | SI-6816 Deprecate -Yeta-expand-keeps-starJames Iry2013-03-014-1/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This commit deprecates the -Yeta-expand-keeps-star flag. It was created in 2.10 to help in the transition from 2.9 but by the time 2.11 comes out it should no longer be necessary.
* | | | | Merge pull request #2196 from paulp/pr/logging-and-typevarsPaul Phillips2013-03-056-86/+105
|\ \ \ \ \ | |_|_|_|/ |/| | | | Logging little understood maneuverings during type inference
| * | | | Cleanup in isHKSubType0.Paul Phillips2013-03-041-38/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Making the mechanisms more apparent. Renamed to isHKSubType, because there is no other.
| * | | | Add some logging to sinful typevar methods.Paul Phillips2013-03-043-48/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These super-mutation-oriented methods should enthusiastically communicate what they are doing, especially when they encounter anything unexpected. None of this work should be taken as an endorsement of any of the worked-upon code.
| * | | | Added methods debuglogResult and devWarningResult.Paul Phillips2013-03-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Lowering the barriers to sensible logging - these methods are key in avoiding the "too much trouble" syndrome.
| * | | | Always at least log devWarnings.Paul Phillips2013-03-041-0/+2
|/ / / /
* | | | Merge pull request #2192 from paulp/pr/rename-type-paramAdriaan Moors2013-03-031-5/+5
|\ \ \ \ | | | | | | | | | | Renamed type param to be consistent with convention.
| * | | | Renamed type param to be consistent with convention.Paul Phillips2013-03-031-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | It's super confusing to see debugging output showing a type constructor called "Coll". The convention in the collections is that CC[A] takes type parameters and Coll is an alias for the applied type.
* | | | Merge pull request #2163 from paulp/pr/as-seen-fromAdriaan Moors2013-03-032-132/+201
|\ \ \ \ | |/ / / |/| | | Refactors AsSeenFromMap to expose extension point.
| * | | Establishes what's up with widening in asSeenFrom.Paul Phillips2013-03-031-6/+10
| | | | | | | | | | | | | | | | Added explanatory comment.
| * | | Simplified correspondingTypeArgument based on reviewer feedback.Paul Phillips2013-03-021-15/+10
| | | |
| * | | Refactors AsSeenFromMap to expose extension point.Paul Phillips2013-03-012-131/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The extension point was the initial motivation but I also tried to bring some clarity to the internals. This is a setup commit for scaladoc and interactive modularization, and also will be followed by a fix for abstract types losing their prefixes (SI-6161.)
* | | | Merge pull request #2180 from adriaanm/merge-2.10.1-masterAdriaan Moors2013-03-0115-26/+154
|\ \ \ \ | |/ / / |/| | | Merge 2.10.1 into master
| * | | Merge branch 2.10.1 into masterAdriaan Moors2013-02-2715-26/+154
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/ast/Trees.scala src/library/scala/concurrent/impl/ExecutionContextImpl.scala
| | * \ \ Merge 2.10.1 into 2.10.x.Adriaan Moors2013-02-2733-479/+878
| | |\ \ \
| | | * \ \ Merge pull request #2160 from scalamacros/topic/7112-followup-2101v2.10.1-RC2Adriaan Moors2013-02-251-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | fixes the test for SI-7112
| | | | * | | fixes the test for SI-7112Eugene Burmako2013-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Freshly released Java 1.6.0_41 for OSX fails with "IllegalAccessError: tried to access class JavaSimpleEnumeration_1 from class sun.proxy.$Proxy6", and rightfully so, because that class isn't public. I think I will avoid the usual "how could this even work before" in this commit message.
| | | * | | | Merge pull request #2166 from retronym/ticket/7180Adriaan Moors2013-02-252-1/+14
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | SI-7180 Fix regression in implicit scope of HK type alias.
| | | | * | | SI-7180 Fix regression in implicit scope of HK type alias.Jason Zaugg2013-02-252-1/+14
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We actually need to call normalize here, otherwise we don't progress through #1 below. [infer implicit] scala.this.Predef.implicitly[Higher[Foo.Bar]] with pt=Higher[Foo.Bar] in object Foo 1. tp=Foo.Bar tp.normalize=[A <: <?>]Foo.Bar[A] tp.dealias=Foo.Bar 2. tp=Foo.Bar[A] tp.normalize=Box[A] tp.dealias=Box[A]
| | | * | | Merge pull request #2152 from retronym/topic/annotatedRetyping-2.10.1Adriaan Moors2013-02-215-9/+87
| | | |\ \ \ | | | | | | | | | | | | | | SI-7163 backport of annotated retyping to 2.10.1
| | | | * | | Additional test case for Lukas' fix to annotated originals.Jason Zaugg2013-02-212-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was inspired by the regression that Mark encountered when upgrading SBT from 2.10.0 to 2.10.1-RC1.
| | | | * | | Fix typing idempotency bug with Annotated treesLukas Rytz2013-02-213-9/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typedAnnotated transforms an Annotated tree into a Typed tree. The original field of the result is set to the Annotated tree. The bug was that typedAnnotated was using the untyped Annotated tree as original, but also set its type. When re-typing later on the same Annotated tree, the typer would consider it as alreadyTyped. This is incorrect, the typer needs to convert Annotated trees to Typed. Also, the Annotated tree only had its type field set, but its children were still untyped. This crashed the compiler lateron, non-typed trees would get out of the typing phase.
| | | * | | | Merge pull request #2138 from retronym/ticket/6576-null-strikes-backJames Iry2013-02-191-2/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | SI-6576 Workaround / diagnostic for IDE NPE.
| | | | * | | | SI-6576 Workaround / diagnostic for IDE NPE.Jason Zaugg2013-02-191-2/+6
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like this was too optimistic: > // later by lukas: disabled when fixing SI-5975 > // i think it cannot happen anymore - restored the null check - added logging when we set the namer in this attachment, in the hope of spotting a pattern in the wild. We don't have a test case yet; if we did we could most likely have a more principled fix. But this should suffice for 2.10.1.
| | | * | | | Merge pull request #2140 from ↵James Iry2013-02-193-4/+32
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | viktorklang/wip-init-bug-executioncontextimpl-2.10.1 Fixing initialization order bug in ExecutionContextImpl, regression from...
| | | | * | | | SI-7146 - Fixing checkinit bug in ExecutionContextImpl and adding testViktor Klang2013-02-193-4/+32
| | | |/ / / /
| | | * | | | Merge pull request #2128 from retronym/ticket/7128James Iry2013-02-192-1/+4
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | SI-7128 Fix regression in copyToArray for empty arrays
| | | | * | | SI-7128 Fix regression in copyToArray for empty arraysJason Zaugg2013-02-142-1/+4
| | | |/ / /
| | | * | | Merge pull request #2122 from adriaanm/revert-pr-1403James Iry2013-02-127-236/+31
| | | |\ \ \ | | | | | | | | | | | | | | Revert #1403: binary incompatibilities in scala-swing
| | * | \ \ \ Merge pull request #2134 from scalamacros/topic/resetattrs-thisPaul Phillips2013-02-273-9/+60
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | resetAttrs now always erases This.tpe
| | | * | | | | adds some comments to resetAttrsEugene Burmako2013-02-261-5/+41
| | | | | | | |
| | | * | | | | resetAttrs now always erases This.tpeEugene Burmako2013-02-173-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbol of This, if it points to a package class, isn't touched, just as usual, so that our Select(Select(Select(...))) => This(...) optimization works fine with attr reset. However the tpe is now erased, so that subsequent reflective compilation doesn't spuriously fail when seeing that some subtrees of a tree being compiled are typed. Erasing the tpe doesn't pose even a tiniest problem, because, as it can be seen in typedThis, type is trivially reconstructed from the symbol.
| | * | | | | | Merge pull request #2117 from gkossakowski/issue/SI-7107Grzegorz Kossakowski2013-02-261-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix SI-7107: scala now thinks every exception is polymorphic
| | | * | | | | | Fix SI-7107: scala now thinks every exception is polymorphicGrzegorz Kossakowski2013-02-251-0/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to force info of the `cls` in `parseExceptions` because we pass `cls` to `addThrowsAnnotation` which in turn calls `Symbol.isMonomorphicType` that relies on a symbol being initialized to give right answers. In the future we should just clean up implementation of `isMonomorphicType` method to not rely on a symbol being initialized as there's no inherent reason for that in most cases. In cases where there's reason for that we should just force the initialization. This patch does not come with a test-case because it's hard to reproduce not initialized symbols in partest reliably.
| | * | | | | | Merge pull request #2149 from khernyo/issue/7074Grzegorz Kossakowski2013-02-253-1/+25
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-7074 Fix xml attribute sorting