summaryrefslogtreecommitdiff
path: root/test/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1437 from paulp/typevar-suspensionGrzegorz Kossakowski2012-10-0210-9/+301
|\ | | | | Typevar suspension
| * Recovered a bunch of deleted tests.Paul Phillips2012-10-016-0/+275
| | | | | | | | | | | | | | | | | | | | | | Are we in the habit of simply deleting tests when they become inconvenient? A comment referenced test "0851" as the example of why the code was needed; the test was deleted years ago for no reason I can see except that it was not passing at the time. Words fail me. Public Service Announcement: tests which are failing are the MOST USEFUL tests. DON'T DELETE THEM!
| * Fix for TypeVar instantiation.Paul Phillips2012-10-014-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an effort to reduce the enormous amount of duplication which now exists among methods which attempt to deduce something about the relationship between two types, a sampling (and only a sampling - this might not even be half of them) given here: def isAsSpecific(ftpe1: Type, ftpe2: Type): Boolean def isCompatibleByName(tp: Type, pt: Type): Boolean def isConservativelyCompatible(tp: Type, pt: Type): Boolean def isConsistent(tp1: Type, tp2: Type): Boolean def isDifferentType(tp1: Type, tp2: Type): Boolean def isDifferentTypeConstructor(tp1: Type, tp2: Type): Boolean def isDistinguishableFrom(t1: Type, t2: Type): Boolean def isNeverSubType(tp1: Type, tp2: Type): Boolean def isNumericSubType(tp1: Type, tp2: Type): Boolean def isPlausiblyCompatible(tp: Type, pt: Type): Boolean def isPopulated(tp1: Type, tp2: Type): Boolean def isSameType(tp1: Type, tp2: Type): Boolean def isSameType2(tp1: Type, tp2: Type): Boolean def isSubType(tp1: Type, tp2: Type): Boolean def isWeakSubType(tp1: Type, tp2: Type): Boolean def isWeaklyCompatible(tp: Type, pt: Type): Boolean def matches(tpe1: Type, tpe2: Type): Boolean def overlaps(tp1: Type, tp2: Type): Boolean def typesConform(tp: Type, pt: Type): Boolean I began pulling a thread left by moors in isPopulated: need to investgate why this can't be made symmetric -- neg/gadts1 fails, and run/existials also. Followed that to this code in TypeVar: val newInst = wildcardToTypeVarMap(tp) (constr isWithinBounds newInst) && { setInst(tp); true } -------^ That was the obstacle to symmetry, because it creates a cycle in e.g. run/existentials. Kept pulling the string, came back to my own comment of long ago: !!! Is it somehow guaranteed that this will not break under nesting? In general one has to save and restore the contents of the field... Decided that uncertainty could no longer be tolerated. Unless it can be proven somehow that there will never be crosstalk among the save/suspension points, we should do it this way even if nothing demands it yet. What's in this commit: - Made isPopulated symmetric. - Made setInst resistant to TypeVar cycles. - Fixed above mentioned bug in registerTypeEquality. - Added some rigor to the suspension/unsuspension of TypeVars so it will not break under nesting. - Recovered pos/t0851.scala from its deletion.
* | Merge pull request #1430 from paulp/SI-5859-5353-4729Grzegorz Kossakowski2012-10-028-2/+61
|\ \ | | | | | | Fixes for SI-5859, SI-5353, SI-4729.
| * | Fix for SI-4729, overriding java varargs in scala.Paul Phillips2012-09-293-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a bad interaction between anonymous subclasses and bridge methods. new Foo { override def bar = 5 } Scala figures it can mark "bar" private since hey, what's the difference. The problem is that if it was overriding a java-defined varargs method in scala, the bridge method logic says "Oh, it's private? Then you don't need a varargs bridge." Hey scalac, you're the one that made me private! You made me like this! You!
| * | Fix for SI-5353, imperfect error message.Paul Phillips2012-09-294-2/+9
| | | | | | | | | | | | The fix of course is a perfect error message.
| * | Fix for SI-5859, inapplicable varargs.Paul Phillips2012-09-291-0/+15
| |/ | | | | | | And other polishing related to varargs handling.
* | Merge pull request #1423 from paulp/issue/5130Grzegorz Kossakowski2012-10-021-0/+46
|\ \ | |/ |/| Fix for SI-5130, precision disappearing from refinement.
| * Fix for SI-5130, precision disappearing from refinement.Paul Phillips2012-09-281-0/+46
| | | | | | | | Remove some code, win a prize.
* | Fix for SI-6447, macro dependent type propagation.Paul Phillips2012-09-281-0/+18
|/ | | | | | | It really pays not to write new TypeMaps unless it is absolutely necessary, because there are about 1000 ways to get them wrong. I'm 98% sure this one can be dropped. Review by @xeno-by.
* Merge branch '2.10.x' into 210-mergePaul Phillips2012-09-2862-75/+772
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.10.x: (37 commits) Added logic and tests for unchecked refinements. Moved isNonRefinementClassType somewhere logical. Moved two tests to less breaky locations. Nailed down the "impossible match" logic. Finish docs for string interpolation. moves Context.ParseError outside the cake revives macros.Infrastructure moves Context.runtimeUniverse to TreeBuild.mkRuntimeUniverseRef a more precise type for Context.mirror gets rid of macros.Infrastructure simplifies Context.Run and Context.CompilationUnit exposes Position.source as SourceFile removes extraneous stuff from macros.Infrastructure merges macros.CapturedVariables into macros.Universe merges macros.Exprs and macros.TypeTags into Context removes front ends from scala-reflect.jar PositionApi => Position hides BuildUtils from Scaladoc MirrorOf => Mirror docs.pre-lib now checks for mods in reflect ... Conflicts: test/files/neg/t4302.check test/files/neg/unchecked.check test/files/neg/unchecked2.check
| * Merge pull request #1399 from paulp/210-uncheckedGrzegorz Kossakowski2012-09-2832-34/+474
| |\ | | | | | | 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-258-0/+97
| | |
| | * 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 2.10.x into master to fix breaking tests and keep things up-to-date.Josh Suereth2012-09-2739-56/+731
|\| | |
| * | | Merge pull request #1393 from scalamacros/topic/leaks-in-toolboxesGrzegorz Kossakowski2012-09-271-0/+26
| |\ \ \ | | | | | | | | | | SI-6412 alleviates leaks in toolboxes, attempt #2
| | * | | SI-6412 alleviates leaks in toolboxes, attempt #2Eugene Burmako2012-09-271-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2618-46/+742
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | 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-255-7/+12
| | | | | |
| * | | | | 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-251-26/+0
| | |/ / / | |/| | | | | | | | | | | | | This reverts commit b403c1d7524ccdfc3455b5bc5d5363fdd9c82bec.
| * | | | SI-6412 alleviates leaks in toolboxesEugene Burmako2012-09-241-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-17 20:12:28 +0000