summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2234 from scalamacros/ticket/7240Paul Phillips2013-03-125-2/+53
|\ | | | | SI-7240 fixes language feature lookup
| * SI-7240 fixes language feature lookupEugene Burmako2013-03-125-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As I discovered today, Definitions.getMember have a fallback clause, which accounts for the phases which have inner classes flattened. This fallback uses nme.flattenedName to compute a flattened name, but unfortunately nme.flattenedName produces a TermName, not a TypeName, which means that the fallback will commence search in a wrong namespace with predictable results. The commit also changes another usage of nme.flattenedName in a type name context. That one was correctly converting a TermName result to TypeName, so this is not a bugfix, but just a refactoring for the sake of being consistent.
* | Merge pull request #2230 from retronym/ticket/7233Paul Phillips2013-03-124-1/+24
|\ \ | | | | | | SI-7233 Account for aliased imports in EtaExpansion / Erasure
| * | SI-7233 Account for aliased imports in ErasureJason Zaugg2013-03-102-1/+9
| | | | | | | | | | | | When we discard the fiction of `scala.Any`.
| * | SI-7233 Account for aliased imports in eta expansion.Jason Zaugg2013-03-102-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buggy: treeCopy.Select(sel, sel.qual, sel.name) setSymbol null Select(sel, sel.qual, sel.name) Okay: treeCopy.Select(sel, sel.qual, sel.name) Select(sel, sel.qual, sel.symbol.name) // but doesn't copyAttrs! It is an easy mistake to make, I've found one more occurance: def foo(a: Any) = { import a.{toString => toS}; toS } error: uncaught exception during compilation: scala.reflect.internal.FatalError scala.reflect.internal.FatalError: class Object does not have a member toS at scala.reflect.internal.Definitions$DefinitionsClass.scala$reflect$internal$Definitions$DefinitionsClass$$fatalMissingSymbol(Definitions.scala:1028) A followup commit will address that problem.
* | | Merge pull request #2222 from scalamacros/ticket/6725Paul Phillips2013-03-125-1/+23
|\ \ \ | | | | | | | | SI-6725 `f` interpolator now supports %n tokens
| * | | SI-6725 `f` interpolator now supports %n tokensEugene Burmako2013-03-095-1/+23
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the `f` interpolator supports format specifiers which specify conversions for formatted arguments. However Java formatting is not limited to argument-related conversions as explained in: http://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#detail. Conversions which don't correspond to any arguments are `%` (used to emit verbatim `'%'` characters) and `n` (used to emit platform-specific line separators). Of those only the former is supported, and this patch fixes the oversight.
* | | Merge pull request #2227 from mergeconflict/2.10.x-SI-7132Paul Phillips2013-03-123-15/+22
|\ \ \ | | | | | | | | SI-7132 - don't discard Unit type in interpreter
| * | | SI-7132 - don't discard Unit type in interpreterDan Rosen2013-03-093-15/+22
| | | |
* | | | Merge pull request #2224 from retronym/ticket/7238Adriaan Moors2013-03-113-3/+16
|\ \ \ \ | | | | | | | | | | SI-7328 Bail out of names/defaults when args are error typed
| * | | | SI-7328 Bail out of names/defaults if args are error typedJason Zaugg2013-03-093-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | To avoid a crasher later on with a null type inside a sequence argument.
* | | | | Merge pull request #2225 from retronym/ticket/7234Adriaan Moors2013-03-113-7/+45
|\ \ \ \ \ | | | | | | | | | | | | SI-7234 Make named args play nice with dep. method types
| * | | | | SI-7234 Make named args play nice with dep. method typesJason Zaugg2013-03-093-7/+45
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Some care is needed to avoid interaction with constant types (e.g pos/z1730.scala) and with existentials (e.g. t3507-old.scala).
* | | | | Merge pull request #2221 from scalamacros/ticket/5710Adriaan Moors2013-03-114-0/+32
|\ \ \ \ \ | | | | | | | | | | | | SI-5710 has fixed itself
| * | | | | SI-5710 has fixed itselfEugene Burmako2013-03-094-0/+32
| | |_|_|/ | |/| | | | | | | | | | | | | My job here is only to submit tests.
* | | | | Merge pull request #2223 from scalamacros/ticket/7235Adriaan Moors2013-03-116-0/+42
|\ \ \ \ \ | | | | | | | | | | | | reifier is now aware of SI-7235
| * | | | | reifier is now aware of SI-7235Eugene Burmako2013-03-096-0/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-7235 is caused by a long-standing todo in typedRefinement, which leads to originals of compound type trees swallowing their stats. I'm not sure how exactly to fix SI-7235, but what I am sure about is that we shouldn't silently discard stats during reification. This patch introduces a new implementation restrictions, which now reports that reify of compound type trees with non-empty stats isn't going to work.
* | | | | Merge pull request #2228 from retronym/ticket/7226Adriaan Moors2013-03-112-0/+32
|\ \ \ \ \ | |_|_|/ / |/| | | | SI-7226 Fix inference regression caused by TypeVar equality
| * | | | SI-7226 Fix inference regression caused by TypeVar equality.Jason Zaugg2013-03-092-0/+32
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypeVars, being mutable creatures, mustn't have structural equality/hashing, otherwise TypeRefs that differ only by having distinct TypeVars as components get wrongly uniqued together. The reported bug showed the disaterous consequences: constraints from the `C?[Int]` in the return type applied to the `?C[?A]` in the parameter list. This commit overrides `equals` and `hashCode` in `TypeVar` to use reference equality. An alternative fix would be to drop the `case`-ness of the class, as was the case before 0cde930b when this regressed.
* | | | Merge pull request #2212 from dragos/fix/SI-7224James Iry2013-03-083-2/+169
|\ \ \ \ | |_|/ / |/| | | Fix SI-7224.
| * | | Fix SI-7224.Iulian Dragos2013-03-073-2/+169
|/ / / | | | | | | | | | | | | | | | | | | Don't focus positions assigned to the TypeTree of a parent of a Template when the parent exists in the source. A focused position (instance of `OffsetPosition`) makes it invisible to the presentation compiler when it looks for the innermost enclosing tree of a given position (breaking hyperlinking, for example).
* | | Merge pull request #2199 from retronym/ticket/7214Adriaan Moors2013-03-052-1/+60
|\ \ \ | | | | | | | | SI-7214 outer check based on dealiased pattern type.
| * | | SI-7214 outer check based on dealiased pattern type.Jason Zaugg2013-03-052-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Typed Pattern (_: T) is more than `.isInstanceOf`: if `T` is a path dependent type, the scrutinee's $outer reference is also compared against the prefix of `T`. The code that synthesises this is split into two places. `needsOuterCheck` determines whether to add this check, based on the type `T`, and the type of the scrutinee. If it gives the go-ahead, `treeCondStrategy.outerCheck` synthesizes the check. The new test case demonstrates the problems caused by the failure to dealias in `needsOuterCheck`: it could either wrongly lead to synthesis of an outer test (which would crash), or wrongly omit the outer test (meaning overly liberal matching.) A simple `dealias` remedies this. `dealiasWiden` is *not* appropriate here; we need to keep hold of singleton types. I'll also note that there is already a little slack between these methods, as commented: > ExplicitOuter replaces `Select(q, outerSym) OBJ_EQ expectedPrefix` > by `Select(q, > outerAccessor(outerSym.owner)) OBJ_EQ expectedPrefix` > if there's an outer accessor, otherwise the condition becomes `true` > TODO: can we improve needsOuterTest so there's always an outerAccessor? So this is probably a fragile area that warrants a careful review with a view to design improvements.
* | | | Merge pull request #2156 from vigdorchik/hierarchyAdriaan Moors2013-03-0511-145/+171
|\ \ \ \ | | | | | | | | | | SI-7109 SI-7153 Generalize the API to get docComments: allow to force do...
| * | | | SI-7109 SI-7153 Generalize the API to get docComments: allow to force docTreesEugene Vigdorchik2013-02-2411-145/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for given fragments. Don't type-check when forcing doc comments, but rather do it directly. Test the new functionality as well as better tests for the old one.
* | | | | Merge pull request #2193 from adriaanm/patmat-refactorAdriaan Moors2013-03-0518-374/+386
|\ \ \ \ \ | | | | | | | | | | | | merge 2.10.1 into 2.10.x
| * \ \ \ \ Merge 2.10.1 into 2.10.xAdriaan Moors2013-03-038-74/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for SI-7183 in 440bf0a8c2 was forward ported in f73d50f46c. Conflicts: src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
| | * \ \ \ \ Merge pull request #2190 from adriaanm/test-runs-mima-2.10.1v2.10.1-RC3v2.10.1James Iry2013-03-022-4/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | test.done again checks bin compat (using mima 0.1.5)
| | | * | | | | test.done again checks bin compat (using mima 0.1.5)Adriaan Moors2013-03-012-4/+8
| | | | | | | |
| | * | | | | | Merge pull request #2189 from adriaanm/ticket-7195James Iry2013-03-024-64/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | [nomaster] SI-7195 minor version mustn't introduce warnings
| | | * | | | | [nomaster] SI-7195 minor version mustn't introduce warningsAdriaan Moors2013-03-014-64/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want 2.10.1 to be a drop-in replacement for 2.10.0, so we can't start warning where we weren't warning in 2.10.0. See SI-5954 (#1882, #2079) for when it was an implementation restriction, which was then weakened to a warning. It's now hidden behind -Ydebug.
| | * | | | | Merge pull request #2168 from retronym/ticket/7183Adriaan Moors2013-03-013-14/+42
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-7183 Disable unreachability for withFilter matches.
| | | * | | | | SI-7183 Disable unreachability for withFilter matches.Jason Zaugg2013-02-253-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids spurious unreachable warnings on code that the user didn't write. The parser desugars for-comprehensions such as: for (A(a) <- List(new A)) yield a To: List(new A()).withFilter(((check$ifrefutable$2) => check$ifrefutable$2: @scala.unhecked match { case A((a @ _)) => true case _ => false }) ) But, if `A.unapply` returns `Some[_]`, the last case is dead code. (Matching against a regular case class *would* fall through in the caes of a null scrutinee.) In SI-6902, we enabled unreachability warnings, even if the scrutinee was annotated as @unchecked. That was consistent with the 2.9.2 behaviour, it was only disabled temporarily (actually, accidentally) in 2.10.0. But, the old pattern matcher didn't warn about this code. This commit makes the pattern matcher recognise the special scrutinee based on its name and disables both exhaustivity *and* unreachability analysis. To do so, the we generalize the boolean flag `unchecked` to the class `Suppression`.
| | * | | | | | Merge pull request #2167 from retronym/ticket/7126Adriaan Moors2013-03-013-6/+29
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-7126 Account for the alias types that don't dealias.
| | | * | | | | | SI-7126 Eliminate a source of malformed types.Jason Zaugg2013-02-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kind-polymorphic nature of Nothing and Any in concert with type argument inference could lead to types like `T[T]` (where `type T=Any`). Compensatory action is taken later on to recover; see the usages of `TypeRef#typeParamsMatchArgs`. But this these types have a nasty property, they can dealias to themselves. Callers recursing through types who fail to account for this hit an infinite recursion, as was reported in SI-7126. This commit simply dealiases `T` when registering the type bound in `unifySimple`. We should try to weed out additional sources of these types.
| | | * | | | | | SI-7126 Account for the alias types that don't dealias.Jason Zaugg2013-02-252-2/+18
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this change: qbin/scalac -Ydebug test/files/pos/t7126.scala 2>&1 | grep warning warning: dropExistential did not progress dealiasing Test.this.T[Test.this.T], see SI-7126 one warning found T[T]? Really? The true bug lies somewhere else; the comments of the ticket illuminate the general areas of concern.
| * | | | | | | [port] SI-7183 Disable unreachability for withFilter matches.Adriaan Moors2013-03-035-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a forward port of #2168 (originally for 2.10.1, but the pattern matcher has since been refactored in 2.10.x.)
| * | | | | | | better names for components of MatchTranslatorAdriaan Moors2013-03-033-34/+33
| | | | | | | |
| * | | | | | | move sat solving to separate fileAdriaan Moors2013-03-033-233/+243
| | | | | | | |
| * | | | | | | simplify dependencies between patmat components, remove self typesAdriaan Moors2013-03-037-41/+51
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #2198 from retronym/ticket/7215Paul Phillips2013-03-052-10/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-7215 Fix transpose of an empty Array[Array[T]].
| * | | | | | | SI-7215 Fix transpose of an empty Array[Array[T]].Jason Zaugg2013-03-052-10/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #2175 from retronym/ticket/7185Paul Phillips2013-03-055-1/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-7185 Avoid NPE in TreeInfo.isExprSafeToInline
| * | | | | | | SI-7185 Avoid NPE in TreeInfo.isExprSafeToInlineJason Zaugg2013-03-025-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We got there typechecking code with a redundant layer of Block. We can't express that in source code, so we test this with manual tree construction and with XML literals, which as reported produce such trees.
* | | | | | | | Merge pull request #2178 from scalamacros/ticket/7190Paul Phillips2013-03-052-0/+27
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | SI-7190 macros no longer give rise to bridges
| * | | | | | | SI-7190 macros no longer give rise to bridgesEugene Burmako2013-02-272-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amazingly enough, this got through all the testing we performed. But now erasure knows that it shouldn't generate bridges for macro methods.
* | | | | | | | Merge pull request #2184 from adriaanm/revert-pr-2083Adriaan Moors2013-03-0128-3539/+331
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Revert SI-6240 synchronization for runtime reflection
| * | | | | | | | Revert SI-6240 synchronization for runtime reflectionAdriaan Moors2013-03-0128-3539/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit reverts #2083: - 387b2590db runtime reflection: death from thousand threads - 73d079fb38 removes the assertion in missingHook - f4dd56ca5d synchronizes names - dd148de5a8 synchronizes pendingVolatiles - 4cbb9357c5 synchronizes toolboxes - 07bcb6176a SI-7045 reflection now auto-initializes selfType - bebd62d566 optimizes Scala reflection GIL - 735634f1d6 initializes lazy vals and inner objects in advance - 5b37cfb19a introduces GIL to Scala reflection - 981da8edfc cleans up initialization of runtime reflection - b2c2493b22 reflection no longer uses atPhase and friends - a9dca512d8 synchronizes symbols - 0262941b3c removes the crazy extraneous log - 21d5d3820b moves Symbol#SymbolKind to Symbols
* | | | | | | | | Merge pull request #2179 from adriaanm/merge-2.10.1Adriaan Moors2013-03-0133-479/+878
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Merge 2.10.1 into 2.10.x
| * | | | | | | | Merge 2.10.1 into 2.10.x.Adriaan Moors2013-02-2733-479/+878
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 23:47:42 +0000