summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3238 from soc/SI-8050Adriaan Moors2013-12-134-19/+37
|\ | | | | SI-8050 [Avian] Skip instrumented tests
| * SI-8050 [Avian] Skip instrumented testsSimon Ochsenreither2013-12-084-19/+37
| | | | | | | | | | | | | | | | | | | | Instrumentation is (currently) not supported on Avian. This causes - tests instrumented/InstrumentationTest.scala and - instrumented/inline-in-constructors to fail. Let's skip these tests on Avian.
* | Merge pull request #3218 from som-snytt/issue/8027-repl-dbltabJason Zaugg2013-12-123-9/+64
|\ \ | | | | | | SI-8027 REPL double tab regression
| * | SI-8027 REPL double tab regressionSom Snytt2013-12-033-9/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where did double tab go? "The shadow knows." The regression was introduced by the last flurry before we were left to wallow in whatever white space remained. Some xs put other xs under erasure. It's clear that somebody's daughter walked into the room and asked for a story, because, shockingly, the case arrows don't line up. We need a plug-in for Jenkins, or I guess Travis, to fail the build if arrows and equals don't align, because it clearly indicates a lapse of some kind.
* | | Merge pull request #3169 from som-snytt/issue/4841-plugin-cpJason Zaugg2013-12-129-53/+167
|\ \ \ | | | | | | | | Plugins get a class path
| * | | SI-4841 Plugins get a class pathSom Snytt2013-12-069-53/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let -Xplugin specify a class path (or multiple of them). Each entry can be a jar or dir, and the first entry to supply a plugin descriptor defines the plugin to load. If no plugin is found on the path, then issue a warning if `-Xdev`. This honors the legacy silent treatment (which scala-ide tests for). In the proposed scheme, each plugin gets a class loader so that plugins are isolated from each other. Presumably, if compiler plugins were a rich ecosystem, in which shared dependencies were required in incompatible versions, this would have become a requirement by now. (Updated with a `DirectTest` that uses two plugins, but keeping the following as documentation.) Partest can't do multiple plugins yet, but this is what it looks like: ``` skalac -Xplugin:sample.jar:useful.jar:util,needful.jar:another.jar:util,needful.jar:util:exploded -Xplugin-require:sample,another,other foo.scala skalac -Xplugin:sample.jar:useful.jar:util,needful.jar:another.jar:util,needful.jar:util:exploded -Xplugin-require:sample,other -Xplugin-disable:another foo.scala skalac -Xplugin:sample.jar:useful.jar:util,sample.jar:useful.jar:util -Xplugin-require:sample foo.scala ``` The manual test shows three plugins with various permutations of jars and dirs. The manual test demonstrates that plugins only see classes on their class path: ``` Initializing test.plugins.SamplePlugin needful.Needful? Failure(java.lang.ClassNotFoundException: needful.Needful) useful.Useful? Success(class useful.Useful) Initializing more.plugins.AnotherPlugin needful.Needful? Success(class needful.Needful) useful.Useful? Failure(java.lang.ClassNotFoundException: useful.Useful) Initializing other.plugins.OtherPlugin ``` Disabling a plugin results in a message instead of silent suppression: ``` Disabling plugin another ``` The duplicate plugin class test must still be honored: ``` Ignoring duplicate plugin sample (test.plugins.SamplePlugin) Initializing test.plugins.SamplePlugin needful.Needful? Failure(java.lang.ClassNotFoundException: needful.Needful) useful.Useful? Success(class useful.Useful) ``` If the path is bad, then missing classes will report which plugin induced the error: ``` Error: class not found: util/Probe required by test.plugins.SamplePlugin Error: class not found: util/Probe required by more.plugins.AnotherPlugin Initializing other.plugins.OtherPlugin needful.Needful? Success(class needful.Needful) useful.Useful? Failure(java.lang.ClassNotFoundException: useful.Useful) error: Missing required plugin: sample error: Missing required plugin: another two errors found ```
* | | | Merge pull request #3241 from retronym/ticket/8054Jason Zaugg2013-12-122-5/+39
|\ \ \ \ | | | | | | | | | | SI-8054 Fix regression in TypeRef rebind with val overriding object
| * | | | SI-8054 Fix regression in TypeRef rebind with val overriding objectJason Zaugg2013-12-092-5/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regressed in 80767383fd / SI-7928 The condition added in that commit are necessary after refchecks but poisonous before. This still seems rather fragile: I wonder if `eliminateModuleDefs` in `RefChecks` ought to flag the module symbol as `ARTIFACT` after creating the accessor, so as to signal that it shouldn't be bound anymore?
* | | | Merge pull request #3255 from densh/pr/unliftable-3Jason Zaugg2013-12-1234-402/+1081
|\ \ \ \ | | | | | | | | | | Introduce Unliftable for Quasiquotes (take #3)
| * | | | Address minor pull request feedback pointsDen Shabalin2013-12-114-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Use (x1, x2): (T1, T2) instead of (x1: T1, x2: T2) 2. More detailed error message for improper function argument 3. Fix typo 4. Completely remove LiftableClass symbol from definitions
| * | | | Test possible quasiquote runtime failuresDen Shabalin2013-12-112-0/+76
| | | | |
| * | | | Test usage of SubpatternsAttachment from a macroDen Shabalin2013-12-113-0/+26
| | | | |
| * | | | Test unliftable not found scenarioDen Shabalin2013-12-102-0/+9
| | | | |
| * | | | Test tuple lifting and unliftingDen Shabalin2013-12-102-0/+73
| | | | |
| * | | | SI-7789 make quasiquotes deconstruct UnApply treesDen Shabalin2013-12-102-3/+30
| | | | |
| * | | | Introduce support for Unliftable for QuasiquotesDen Shabalin2013-12-1010-6/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unliftable is a type class similar to existing Liftable that lets users to extract custom data types out of trees with the help of straightforward type ascription syntax: val q“foo.bar(${baz: Baz})” = ... This will use Unliftable[Baz] to extract custom data type Baz out of a tree nested inside of the another tree. A simpler example would be extracting of constant values: val q”${x: Int} + ${y: Int}” = q”1 + 2”
| * | | | Refactor Holes and Reifiers slices of Quasiquotes cakeDen Shabalin2013-12-108-239/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit performs a number of preliminary refactoring needed to implement unliftable: 1. Replace previous inheritance-heavy implementation of Holes with similar but much simpler one. Holes are now split into two different categories: ApplyHole and UnapplyHole which correspondingly represent information about holes in construction and deconstruction quasiquotes. 2. Make Placeholders extract holes rather than their field values. This is required to be able to get additional mode-specific information from holes (e.g. only ApplyHoles have types). 3. Bring ApplyReifier & UnapplyReifier even closer to the future where there is just a single base Reifier with mode parameter. Along the way a few bugs were fixed: 1. SI-7980 SI-7996 fail with nice error on bottom types splices 2. Use asSeenFrom instead of typeArguments in parseCardinality. This fixes a crash if T <:< Iterable[Tree] but does not itself have any type arguments. 3. Fix spurious error message on splicing of Lists through Liftable[List[T]]
| * | | | Provide a way for unapply macro to obtain a list of subpattensDen Shabalin2013-12-103-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces internal attachment that allows unapply macros to be aware of their sub patterns and tweak their expansion depending on that info. At the moment this is not possible due to the way pattern macros are expanded: case MacroPat(inner1, inner2) => ... During type checking this will expand as MacroPat.unapply(<unapply-dummy>) Meaning that macro can’t see inner1 and inner2 in it’s macroApplication. To circumvent this we attach that info as an attachment to the dummy.
| * | | | Move Liftable into the Universe cake; add additional standard LiftablesDen Shabalin2013-12-1010-80/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we believed that having Liftable outside of the Universe will bring some advantages but it turned out this wasn’t worth it. Due to infectious nature of path dependent types inside of the universe one had to cast a lot. A nice example of what I’m talking about is a change in trait ArbitraryTreesAndNames. Additionally a number of standard Liftables is added for types that are available through Predef and/or default scala._ import: Array, Vector, List, Map, Set, Option, Either, TupleN.
| * | | | SI-7979 Fix quasiquotes crash on mismatch between fields and constructorDen Shabalin2013-12-102-4/+24
| | | | |
| * | | | SI-6842 Make splicing less sensitive to precise types of treesDen Shabalin2013-12-107-54/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously trees that represent parameters, case clauses and type variables had strictly defined ValDef, TypeDef and CaseDef types which caused problems in compositionality. Now this checks are moved to runtime so it's possible to pass a tree that is CaseDef but has Tree type.
| * | | | SI-8009 Ensure that Idents preserve isBackquoted propertyDen Shabalin2013-12-105-2/+24
| | | | |
| * | | | SI-8016 Ensure that q”..$xs” is equivalent to q”{..$xs}”Den Shabalin2013-12-103-1/+16
| | | | |
| * | | | SI-8008 Make q”f(..$xs)” only match trees with Apply nodeDen Shabalin2013-12-105-22/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it also matched other nodes but returned Nil as value of xs. This behavior was added for sake of consistentcy with q”f[..$ts]”. On the other hand q”f[..$Nil]” == q”f” but q”f(..$Nil)” == q”f()” not q”f”. Due to this deconstruction/construction symmetry was broken. On the other hand applications also have q"f(...$xss)" option which is infact similar to q"f[..$ts]". Splicing Nil into it also results in q"f".
* | | | Merge pull request #3246 from xeno-by/topic/compile-time-onlyJason Zaugg2013-12-103-48/+85
|\ \ \ \ | | | | | | | | | | streamlines refchecking undesired symbol properties
| * | | | streamlines refchecking undesired symbol propertiesEugene Burmako2013-12-093-48/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unifies `checkDeprecated`, `checkMigration` and `checkCompileTimeOnly` into a single centralized point of reference that is now consistently called from `checkTypeRef`, `transformIdent` and `transformSelect`.
* | | | | Merge pull request #3237 from xeno-by/topic/macrodef-returntype-inferenceJason Zaugg2013-12-10102-235/+245
|\ \ \ \ \ | |/ / / / |/| | | | deprecates macro def return type inference
| * | | | deprecates macro def return type inferenceEugene Burmako2013-12-10102-235/+245
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new focus on quasiquotes in macro implementations, we now have to change the way how inference of macro def return types works. Previously, if the return type of a macro def wasn’t specified, we looked into the signature of its macro impl, took its return type (which could only be c.Expr[T]) and then assigned T to be the return type of the macro def. We also had a convenient special case which inferred Any in case when the body of the macro impl wasn’t an expr. That avoided reporting spurious errors if the macro impl had its body typed incorrectly (because in that case we would report a def/impl signature mismatch anyway) and also provided a convenience by letting macro impls end with `???`. However now we also allow macro impls to return c.Tree, which means that we are no longer able to do any meaningful type inference, because c.Tree could correspond to tree of any type. Unfortunately, when coupled with the type inference special case described above, this means that the users who migrate from exprs to quasiquotes are going to face an unpleasant surprise. If they haven’t provided explicit return types for their macro defs, those types are going to be silently inferred as `Any`! This commit plugs this loophole by prohibiting type inference from non-expr return types of macro impls (not counting Nothing). Moreover, it also deprecates c.Expr[T] => T inference in order to avoid confusion when switching between exprs and quasiquotes.
* | | | Merge pull request #3226 from ziggystar/patch-1Adriaan Moors2013-12-082-0/+35
|\ \ \ \ | | | | | | | | | | add method dequeueOption to immutable.Queue
| * | | | add method dequeueOption to immutable.QueueThomas Geier2013-12-052-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows immutable.Queue to be used conveniently in functional code. Method is in the spirit of `headOption` on seqs or `get` on maps. Also adds a unit test for immutable.Queue.
* | | | | Merge pull request #3225 from som-snytt/issue/8013-interp-nowarnAdriaan Moors2013-12-084-6/+60
|\ \ \ \ \ | |_|_|_|/ |/| | | | SI-8013 Nowarn on macro str interpolation
| * | | | SI-8013 Nowarn on macro str interpolationSom Snytt2013-12-044-6/+60
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When warning about stray "foo $bar" under `-Xlint`, which may be missing an interpolator id, suppress the warning if we're in the middle of a macro expansion, since we have no useful heuristic to apply to the expanded tree. The test for whether the string is part of an expanded tree is to check all open macros for an expanded tree that contains the literal tree under scrutiny. (This is deemed more paranoid than looking for a macro application that is an enclosing position.)
* | | | Merge pull request #3231 from xeno-by/topic/undeprecate-parseEugene Burmako2013-12-061-3/+0
|\ \ \ \ | | | | | | | | | | undeprecates c.parse
| * | | | undeprecates c.parseEugene Burmako2013-12-061-3/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never thought that c.parse is going to be completely subsumed by quasiquotes, but hoped that the use cases that are going to be lost aren’t going to be noticed by anyone. Unfortunately, this isn’t the case, so I’m undeprecating c.parse until we get a better story for those for whom quasiquotes are not enough.
* | | | Merge pull request #3228 from retronym/merge/2.10.x-and-pr-3209-to-masterJason Zaugg2013-12-0617-29/+137
|\ \ \ \ | | | | | | | | | | Merge #3209 and 2.10.x to master
| * \ \ \ Merge commit '7d41094' into merge/2.10.x-and-pr-3209-to-masterJason Zaugg2013-12-068-15/+58
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/interactive/scala/tools/nsc/interactive/CompilerControl.scala
| | * | | | SI-7982 Changed contract of askLoadedType to unload units by defaultFrançois Garillot2013-12-068-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale for not keeping units loaded by default is that the more units are loaded, the slower is background compilation. For instance, in the Scala IDE for Eclipse (which uses the presentation compiler), typechecking occurs every time the reconciler kicks-in (~500millis after you stop typing), hence it is important that units are not kept loaded unless strictly necessary (for some extra information about this, see https://www.assembla.com/spaces/scala-ide/tickets/1001388) While I agree that using a boolean argument (`keepLoaded`) for deciding if a unit should be loaded isn't a great design, other methods in `CompilerControl` also have a keepLoaded parameter, so at least we have some consistency. For the future, I'm thinking we should be able to remove the `keepLoaded` flag altogether, and change the implementation of `askLoadedType` to preserve the same units loaded in the presentation compiler before and after its execution. Basically, if you want a unit to be kept loaded, you should call `askReload` first, and then `askLoadedType`. However, to reduce impact, I think the changes carried by this commit will help us estimate if the solution I just outlined is viable (because `askLoadeType` won't be keeping units loaded by default, which wasn't the case with the former implementation). (While the patch was mostly contributed by @huitseeker, @dotta has edited the commit message to preserve the comments in the PR https://github.com/scala/scala/pull/3209)
| * | | | | Merge commit '7d74884' into merge-2.10.x-to-masterJason Zaugg2013-12-063-5/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/files/jvm/scala-concurrent-tck.scala
| | * \ \ \ \ Merge pull request #3181 from heathermiller/issue/6913James Iry2013-12-053-5/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-6913 Reapplies a lost fix by @viktorklang
| | | * | | | | SI-6913 Fixing semantics of Future fallbackTo to be according to docsHeather Miller2013-12-053-5/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Origin: viktorklang@1bbe854
| * | | | | | Merge commit '7c1d114' into merge-2.10.x-to-masterJason Zaugg2013-12-067-9/+71
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/interactive/Global.scala
| | * | | | | Merge pull request #3208 from dotta/si-7548-on-2.10Jason Zaugg2013-12-027-9/+71
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | askTypeAt returns the same type for full/ targeted typecheck (2.10.x)
| | | * | | | SI-7458 Pres. compiler must not observe trees in silent modeJason Zaugg2013-12-022-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we can think that `+` in `1 + BigInt(2)` refers to a method in `Int`. In general, this protects the IDE from observing results from "exploratory" typing which is discarded as the compiler backtracks to another possibility. This protection subsumes the condition that checked for overloaded types: presentation/t7458 now passes without this.
| | | * | | | SI-7548 Test to demonstrate residual exploratory typing bugJason Zaugg2013-12-023-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't observe tree types under silent mode. The enclosed test is a standalone version of `1 + BigInt(2)`, a standard example of exploratory typing in Scala. Once we determine that none of the `+` methods in `Int` accepts (possibly implicitly coerced `BigInt`), we have to backtrack and look for a view from `Int => { +(_: BigInt): ? }`. The next commit will correct the problem.
| | | * | | | SI-7548 askTypeAt returns the same type whether the source was fully or ↵Mirco Dotta2013-12-024-9/+39
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targeted type-checked When asking for targeted typecheck, the located tree may have overloaded types is the source isn't yet fully typechecked (e.g., a select tree for an overloaded method). This is problematic as it can lead to unknown 'hovers', broken hyperlinking that suddenly starts working, unresolved ScalaDoc comments, and similar, in the Scala IDE. With this commit we are hardening the contract of `askTypeAt` to return the same type whether the file was fully type-checked or targeted type-checked. This is done by preventing the typechecker to stop too early if the `located` tree has an overloaded type. Furthermore, I'm assuming that if `located.tpe` is of type `OverloadedType`, by letting the compiler carry-on the typechecking, the `located.tpe` will eventually be resolved to a non-overloaded type. Said otherwise, I expect the targeted typechecking will always terminate (if my reasoning isn't sound, please say so). The test provided with this commit demonstrates the new behavior (the position used to execute the test is resolved to the `foo` method's call). In fact, before this commit, executing the test returned the following: (x: Int, y: String)Unit <and> (x: String)Unit <and> (x: Int)Unit Showing that the tree's type is an overloaded type. The ambiguity is fixed by this commit, and in fact the test's output is now: (x: Int)Unit
| * | | | | Merge commit 'da73950' into merge-2.10.x-to-masterJason Zaugg2013-12-060-0/+0
| |\| | | |
| | * | | | Merge pull request #3180 from xeno-by/topic/toolbox-rangeposJason Zaugg2013-11-263-2/+16
| | |\ \ \ \ | | | | | | | | | | | | | | teaches toolbox about -Yrangepos
| | | * | | | [nomaster] teaches toolbox about -YrangeposEugene Burmako2013-11-223-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike in master, in 2.10.x enabling -Yrangepos requires instantiating Global with mixed in RangePositions trait. Same story for toolboxes. Just setting Yrangepos is not enough - one needs to mix in RangePositions into ToolboxGlobal. I didn’t know that back then, so now I’m fixing the oversight. The commit is marked as [nomaster], because -Yrangepos doesn’t need special treatment in master.
| | * | | | | Merge pull request #3196 from retronym/topic/3190-fixupJason Zaugg2013-11-2610-8/+178
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Corrects positions for Dynamic calls
* | | | | | | Merge pull request #3191 from retronym/ticket/deprecate-par-viewJason Zaugg2013-12-0621-968/+286
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Remove parallel collection views and, with them, Gen*View
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-12 04:05:41 +0000