summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1347 from soc/SI-6380Grzegorz Kossakowski2012-09-282-0/+27
|\ \ | |/ |/| SI-6380 Add @throws[Exception]
| * SI-6380 #1 Add @throws[Exception]Simon Ochsenreither2012-09-212-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows an additional notation of the @throws annotation: Old-style: @throws(classOf[Exception]) New-style: @throws[Exception] The optional String argument moves @throws in line with @deprecated, @migration, etc. and prevents confusion caused by the default inheritance of ScalaDoc comments and the non-inheritance of annotations. Before: /** This method does ... * @throws IllegalArgumentException if `a` is less than 0. */ @throws(classOf[IllegalArgumentException]) def foo(a: Int) = ... Now: /** This method does ... */ @throws[IllegalArgumentException]("if `a` is less than 0") def foo(a: Int) = ... ScalaDoc @throws tags remain supported for cases where documentation of thrown exceptions is needed, but are not supposed to be added to the exception attribute of the class file. In this commit the necessary compiler support is added. The code to extract exceptions from annotations is now shared instead of being duplicated all over the place. The change is completely source and binary compatible, except that the code is now enforcing that the type thrown is a subtype of Throwable as mandated by the JVM spec instead of allowing something like @throws(classOf[String]). Not in this commit: - ScalaDoc support to add the String argument to ScalaDoc's exception list - Adaption of the library
* | Merge pull request #1399 from paulp/210-uncheckedGrzegorz Kossakowski2012-09-2833-34/+528
|\ \ | | | | | | Much better unchecked warnings.
| * | Added logic and tests for unchecked refinements.Paul Phillips2012-09-273-0/+41
| | |
| * | Moved two tests to less breaky locations.Paul Phillips2012-09-274-0/+0
| | | | | | | | | | | | | | | When there is a test called pos/t1107.scala and also a test called pos/t1107, it is bad.
| * | Nailed down the "impossible match" logic.Paul Phillips2012-09-2712-6/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I will again defer to a comment. /** Given classes A and B, can it be shown that nothing which is * an A will ever be a subclass of something which is a B? This * entails not only showing that !(A isSubClass B) but that the * same is true of all their subclasses. Restated for symmetry: * the same value cannot be a member of both A and B. * * 1) A must not be a subclass of B, nor B of A (the trivial check) * 2) One of A or B must be completely knowable (see isKnowable) * 3) Assuming A is knowable, the proposition is true if * !(A' isSubClass B) for all A', where A' is a subclass of A. * * Due to symmetry, the last condition applies as well in reverse. */
| * | Restored warning for impossible type tests.Paul Phillips2012-09-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had this in before, then removed it since it is sometimes redundant with an error message later issued by the pattern matcher (e.g. scrutinee is incompatible with pattern type.) However it also catches a lot of cases which are not errors, so I think the modest redundancy is tolerable for now. I also enhanced the logic for recognizing impossible type tests, taking sealedness into account.
| * | Yet more tests for unchecked warnings.Paul Phillips2012-09-262-1/+75
| | |
| * | Additional new tests for unchecked warnings.Paul Phillips2012-09-259-0/+151
| | |
| * | Improvements to unchecked warnings.Paul Phillips2012-09-256-33/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes SI-6275, SI-5762. The comment says is better than I can. /** On pattern matcher checkability: * * Consider a pattern match of this form: (x: X) match { case _: P => } * * There are four possibilities to consider: * [P1] X will always conform to P * [P2] x will never conform to P * [P3] X <: P if some runtime test is true * [P4] X cannot be checked against P * * The first two cases correspond to those when there is enough static * information to say X <: P or that !(X <: P) for all X and P. * The fourth case includes unknown abstract types or structural * refinements appearing within a pattern. * * The third case is the interesting one. We designate another type, XR, * which is essentially the intersection of X and |P|, where |P| is * the erasure of P. If XR <: P, then no warning is emitted. * * Examples of how this info is put to use: * sealed trait A[T] ; class B[T] extends A[T] * def f(x: B[Int]) = x match { case _: A[Int] if true => } * def g(x: A[Int]) = x match { case _: B[Int] => } * * `f` requires no warning because X=B[Int], P=A[Int], and B[Int] <:< A[Int]. * `g` requires no warning because X=A[Int], P=B[Int], XR=B[Int], and B[Int] <:< B[Int]. * XR=B[Int] because a value of type A[Int] which is tested to be a B can * only be a B[Int], due to the definition of B (B[T] extends A[T].) * * This is something like asSeenFrom, only rather than asking what a type looks * like from the point of view of one of its base classes, we ask what it looks * like from the point of view of one of its subclasses. */
* | | Merge pull request #994 from phaller/issue/5314Grzegorz Kossakowski2012-09-2816-0/+230
|\ \ \ | | | | | | | | SI-5314 - CPS transform of return statement fails (resubmission of #987)
| * | | Simplify the adaptation of types of return expressionsphaller2012-08-124-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `adaptTypeOfReturn` hook to `AnnotationCheckers`. Move adaptation of types of return expressions from `addAnnotations` to `typedReturn` via `adaptTypeOfReturn` hook. This resolves an inconsistency where previously types could have a plus marker without additional CPS annotations. This also adds additional test cases.
| * | | Revert "Add missing cases in tail return transform"phaller2012-08-092-15/+0
| | | | | | | | | | | | | | | | This reverts commit 8d020fab9758ced93eb18fa51c906b95ec104aed.
| * | | Add missing cases in tail return transformphaller2012-08-092-0/+15
| | | | | | | | | | | | | | | | | | | | Disabled warnings that no longer apply because of tail returns. Add several test cases.
| * | | Replace CheckCPSMethodTraverser with additional parameter on transformer methodsphaller2012-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Other fixes: - remove CPSUtils.allCPSMethods - add clarifying comment about adding a plus marker to a return expression
| * | | SI-5314 - CPS transform of return statement failsphaller2012-08-0814-0/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable return expressions in CPS code if they are in tail position. Note that tail returns are only removed in methods that do not call `shift` or `reset` (otherwise, an error is reported). Addresses the issues pointed out in a previous pull request: https://github.com/scala/scala/pull/720 - Addresses all issues mentioned here: https://github.com/scala/scala/pull/720#issuecomment-6429705 - Move transformation methods to SelectiveANFTransform.scala: https://github.com/scala/scala/pull/720#commitcomment-1477497 - Do not keep a list of tail returns. Tests: - continuations-neg/t5314-missing-result-type.scala - continuations-neg/t5314-type-error.scala - continuations-neg/t5314-npe.scala - continuations-neg/t5314-return-reset.scala - continuations-run/t5314.scala - continuations-run/t5314-2.scala - continuations-run/t5314-3.scala
* | | | moves Context.runtimeUniverse to TreeBuild.mkRuntimeUniverseRefEugene Burmako2012-09-273-4/+7
| | | | | | | | | | | | | | | | Scaladoc-driven cleanup for the win
* | | | simplifies Context.Run and Context.CompilationUnitEugene Burmako2012-09-271-2/+1
| | | | | | | | | | | | | | | | | | | | By turning them from abstract types into full-fledged traits implemented by our internal Run and CompilationUnit.
* | | | exposes Position.source as SourceFileEugene Burmako2012-09-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was useful to pretend that SourceFile isn't a part of the API, when it's physical location was in scala-compiler.jar. Afterwards Position and SourceFile have been moved to scala-reflect.jar, and (what's more important) scala-reflect.jar gained experimental status, meaning that we're not bound by backward compatibility in 2.10.0. Therefore I'd say we should expose a full-fledged SourceFile in Position.source (just as we do for Symbol.associatedFile) and later find out how to strip down its interface to something suitable for public consumption.
* | | | removes extraneous stuff from macros.InfrastructureEugene Burmako2012-09-271-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libraryClassLoader can be derived from currentClassPath currentMacro can be trivially derived from macroApplication Backend-detection methods forXXX (as in forJVM or forScaladoc) might be useful, but current design of this API is not future-proof. I'm not able to come up with a better design on the spot, so let's remove this functionality for the moment.
* | | | removes front ends from scala-reflect.jarEugene Burmako2012-09-273-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was an interesting idea to give macro developers control over front ends, but it hasn't given any visible results. To the contrast, front ends have proven useful for toolboxes to easily control what errors get printed where. Therefore I'm moving front ends to scala-compiler.jar to clean up the API. Yay for scaladoc-driven development!
* | | | MirrorOf => MirrorEugene Burmako2012-09-274-8/+8
| | | | | | | | | | | | | | | | | | | | The name looks weird in the scaladoc overview panel, so I decided to do a last-minute rename.
* | | | Merge pull request #1393 from scalamacros/topic/leaks-in-toolboxesGrzegorz Kossakowski2012-09-272-0/+52
|\ \ \ \ | | | | | | | | | | SI-6412 alleviates leaks in toolboxes, attempt #2
| * | | | SI-6412 alleviates leaks in toolboxes, attempt #2Eugene Burmako2012-09-272-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns importer caches into fully weak hash maps, and also applies manual cleanup to toolboxes every time they are used. It's not enough, because reflection-mem-typecheck test is still leaking at a rate of ~100kb per typecheck, but it's much better than it was before. We'll fix the rest later, after 2.10.0-final. For more information, see https://issues.scala-lang.org/browse/SI-6412 and http://groups.google.com/group/scala-internals/browse_thread/thread/eabcf3d406dab8b2 In comparison with https://github.com/scala/scala/commit/b403c1d, the original commit that implemented the fix, this one doesn't crash tests. The problem with the original commit was that it called tryFixup() before updating the cache, leading to stack overflows.
* | | | | hardens DirectTest against missing -d settingsEugene Burmako2012-09-261-1/+1
|/ / / / | | | | | | | | | | | | | | | | And also explicitly specifies -d in a test where I forgot to do that. Double checking never hurts.
* | | | Merge pull request #1380 from scalamacros/ticket/6277Eugene Burmako2012-09-2612-15/+19
|\ \ \ \ | | | | | | | | | | SI-6277 fix for isXXX methods in reflection
| * | | | SI-6277 fixes flags, annotations & privateWithinEugene Burmako2012-09-2612-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Symbol.getFlag`, 'Symbol.hasFlag`, `Symbol.hasAllFlags`, `Symbol.annotations` and `Symbol.privateWithin` now trigger automatic initialization of symbols if they are used in a runtime reflection universe and some other conditions are met (see `Symbol.needsInitialize` for details). As the performance testing in https://github.com/scala/scala/pull/1380 shows, this commit introduces a ~2% performance regression of compilation speed. Unfortunately all known solutions to the bug at hand (A, B & C - all of those) introduce perf regressions (see the pull request linked above for details). However we're under severe time pressure, so there's no more time to explore. Therefore I suggest this is reasonable to accept this performance hit, because we've just gained 6% from removing scala.reflect.base, and even before that we were well within our performance goal for 2.10.0-final.
* | | | | Merge pull request #1396 from axel22/issue/6410Josh Suereth2012-09-262-0/+11
|\ \ \ \ \ | | | | | | | | | | | | SI-6410 add test cases.
| * | | | | SI-6410 add test cases.Aleksandar Prokopec2012-09-252-0/+11
| | | | | |
* | | | | | Merge pull request #1394 from vjovanov/amk/ActorRefGrzegorz Kossakowski2012-09-2619-47/+743
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moving ActorRef API to scala.concurrent.
| * | | | | | Additional Actor Migration Tests.Vojin Jovanovic2012-09-2510-0/+656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Review by @phaller.
| * | | | | | Support for scala.concurrent for the ActorRef.Vojin Jovanovic2012-09-258-39/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Review by @phaller
| * | | | | | SI-6305 fix.Vojin Jovanovic2012-09-256-8/+13
| | | | | | |
* | | | | | | Generate links to external projects in scaladoc.Eugene Vigdorchik2012-09-262-18/+23
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Review by @VladUreche.
* | | | | | Update check-file for SI-6344 test.Grzegorz Kossakowski2012-09-251-2/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were some changes to value classes since pull request was tested so outdated check-file got merged. Paul confirmed that those changes are going in the right direction so all it requires is to update the check file. Review by @paulp.
* | | | | Merge pull request #1345 from paulp/issue/6344Grzegorz Kossakowski2012-09-252-0/+238
|\ \ \ \ \ | | | | | | | | | | | | Possible fix for SI-6344, value class generic signatures.
| * | | | | Fix for SI-6344, value class generic signatures.Paul Phillips2012-09-202-0/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Value classes mostly erase to the erasure of the underlying type. Not everything in the checkfile looks correct, but I know from experience I can spend the rest of my life poking at erasures, so let's try to book some progress.
* | | | | | Revert "SI-6412 alleviates leaks in toolboxes"Grzegorz Kossakowski2012-09-252-52/+0
| |/ / / / |/| | | | | | | | | | | | | | This reverts commit b403c1d7524ccdfc3455b5bc5d5363fdd9c82bec.
* | | | | SI-6412 alleviates leaks in toolboxesEugene Burmako2012-09-242-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns importer caches into fully weak hash maps, and also applies manual cleanup to toolboxes every time they are used. It's not enough, because reflection-mem-typecheck test is still leaking at a rate of ~100kb per typecheck, but it's much better than it was before. We'll fix the rest later, after 2.10.0-final. For more information, see https://issues.scala-lang.org/browse/SI-6412 and http://groups.google.com/group/scala-internals/browse_thread/thread/eabcf3d406dab8b2
* | | | | SI-6412 fixes leaks in Types.uniquesEugene Burmako2012-09-242-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the most blatant leak in reflection. There are others, but their impact is much smaller, therefore we'll fix them later, after 2.10.0-final. For more information, see https://issues.scala-lang.org/browse/SI-6412 and http://groups.google.com/group/scala-internals/browse_thread/thread/eabcf3d406dab8b2
* | | | | Merge pull request #1378 from scalamacros/ticket/5918Eugene Burmako2012-09-232-0/+47
|\ \ \ \ \ | | | | | | | | | | | | SI-5918 fixes the ConstantType ugliness
| * | | | | SI-5918 fixes the ConstantType uglinessEugene Burmako2012-09-232-0/+47
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java enum values are represented with constants wrapping corresponding Symbols. To find out the underlying type of such a constant one needs to calculate sym.owner.linkedClassOfClass.tpe (where sym represents the wrapped symbol). To quote the source code, given (in java): class A { enum E { VAL1 } } - sym: the symbol of the actual enumeration value (VAL1) - .owner: the ModuleClassSymbol of the enumeration (object E) - .linkedClassOfClass: the ClassSymbol of the enumeration (class E) Back then, as far as I can guess, linkedClassOfClass was flaky and didn't work well late in the compilation pipeline. Therefore a fix to SI-1329 introduced a caching facility. Once a ConstantType representing the type of Constant(sym) was created (I guess, during typer, when linkedClassOfClass was still working), it cached the underlying type and used it in subsequent phases. *** Unfortunately this solution, being fine for enum values, broke another flavor of constants - type wrapping constants that represent classOf (for example, Constant(IntTpe) represents the classOf[Int] constant). Type-wrapping constants are special, because their type (e.g. Class[Int] in the example from the previous paragraph) changes as the compilation progresses. Before erasure it's Class[something], and after erasure it's just Class. Therefore caching types of such constants might lead to incorrect types flying around after erasure, as described in this scala-internals thread: http://groups.google.com/group/scala-internals/browse_thread/thread/45185b341aeb6a30. *** Now when the problem is clear, the question is why didn't it happen before? That's all because of another peculiarity of the compiler. Before erasure package references (e.g. in TypeRef prefixes) are represented as ThisType(sym), where sym stands for a package class symbol. After erasure such references are represented differently, e.g. java.lang package looks like TypeRef(TypeRef(TypeRef(NoPrefix, root, Nil), java, Nil), java.lang, Nil). As described in the aforementioned thread, the incorrect caching strategy employed in UniqueConstantType mixed with other caching mechanisms in compiler effectively established a non-clearable cache that goes from Type instances to types that represent their classOfs, e.g. from String to Class[String]. So if anyone tried to typecheck a classOf after erasure, he/she would get Class[String] instead of the correct Class, and compiler would crash. Right? Nope. Before erasure String is TypeRef(ThisType(java.lang), StringSymbol, Nil), and after erasure it's TypeRef(TypeRef(...), StringSymbol, Nil), as explained above. Therefore the foul cache would contain two String types: one pre-erasure going to a pre-erasure Class[String], and another one post-erasure going to a post-erasure Class. *** This shaky balance was broken when I tried to implement class tag generation with shiny Type.erasure method that Martin just exposed in the reflection API. The erasure method partially invoked the Erasure phase, and for a String it returned its post-erasure representation (with java.lang prefix represented as TypeRef, not as ThisType). And after that I used the result of erasure to build a classOf for a class tag. Since I did it in a macro, it was typer, a pre-erasure phase. Now you understand why things broke. That classOf created a Constant wrapping a post-erasure representation of String, which cached the incorrect non-erased Class[String] type for a post-erasure type, and things exploded. You can imagine my panic! The ScalaDays deadline was near, I still had to do finishing touches to implicit macros (which I actually never had time to do), and such a fundamental thing exploded. Actually I figured out the hashing problem, but in the limited time I had I failed to understand why exactly it's happening, so I introduced the dirty workaround praised in SI-5918 and moved on. *** The story doesn't end here. Some time has passed, and I learned a lot about the compiler. I independently discovered the ThisType -> TypeRef transform that erasure applies to package references and patched Type.erasure to undo it. After all, Type.erasure is a user-facing API, and users don't need to know about post-typer implementation details. You can read more about this here: http://groups.google.com/group/scala-internals/browse_thread/thread/6d3277ae21b6d581 From what we've learned above, we can see that this Type.erasure fix made the UniqueConstantType workaround unnecessary. But I didn't know that. So imagine my surprise when I tried to remove that workaround and ran the tests only to see that nothing fails. I went back in time to April when the problem first manifested, extracted a minimized crasher and tried to use it on trunk. Again, nothing crashed. And only with the help of showRaw, I finally understood that types printed as "String" can be wildly different. The rest was a piece of cake. *** The irony is that the original reason for ConstantType caching is no longer valid. linkedClassOfClass now works fine (and files/jvm/outerEnum.scala agrees with me), so we can remove the cache altogether. So why all this story about erasure and package references? Well, I don't know. I enjoyed uncovering this mystery, so I wanted to share it with you :)
* | | | | Merge pull request #1379 from retronym/topic/boxing-conversionsPaul Phillips2012-09-222-0/+10
|\ \ \ \ \ | |/ / / / |/| | | | Remove BoxingConversions from the scala package.
| * | | | Remove BoxingConversions from the scala package.Jason Zaugg2012-09-222-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add it to two test cases that rely on it. It is a remnant of the now-removed FlatArray (8cc7de74d).
* | | | | A couple CRLF normalization stragglers.Paul Phillips2012-09-213-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now sorely needed since files with CRLF endings but an LF attribute which are checked into the repo will aggressively cause dirty git status on unix.
* | | | | Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.xPaul Phillips2012-09-20333-2841/+2841
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Normalized line endings.Paul Phillips2012-09-20333-2841/+2841
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings all the files into line with the .gitattributes settings, which should henceforth be automatically maintained by git.
* | | | | Merge pull request #1348 from scalamacros/ticket/6394Grzegorz Kossakowski2012-09-204-0/+18
|\ \ \ \ \ | | | | | | | | | | | | SI-6394 fixes macros.Context.enclosingClass
| * | | | | SI-6394 fixes macros.Context.enclosingClassEugene Burmako2012-09-194-0/+18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Previously I used typer.context.enclClass, but it seems to do something completely unexpected, so I switched to manual context traversal.
* | | | | Merge pull request #1325 from odersky/ticket/6337Paul Phillips2012-09-203-8/+36
|\ \ \ \ \ | | | | | | | | | | | | Fixes SI-6337 by disallowing nested value classes.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 21:16:23 +0000