summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1424 from soc/SI-6449Paul Phillips2012-10-0113-15/+15
|\ \ | |/ |/| SI-6449 Adds version arg to @deprecated usages (non-compiler sources)
| * Fix incomplete version strings (2.10 -> 2.10.0)Simon Ochsenreither2012-09-2910-11/+11
| |
| * SI-6449 Adds version arg to @deprecated usages (non-compiler sources)Simon Ochsenreither2012-09-293-4/+4
| |
* | Merge remote-tracking branch 'scala/2.10.x' into 2.10.0-wipGrzegorz Kossakowski2012-09-2981-215/+1535
|\ \ | |/ |/|
| * Merge pull request #1415 from scalamacros/is-value-typeEugene Burmako2012-09-2812-11/+224
| |\ | | | | | | a fork of isValueType and isNonValueType
| | * fully initializes symbols on `typeSignature`Eugene Burmako2012-09-282-3/+3
| | | | | | | | | | | | | | | | | | only affects runtime reflection, because Symbol.typeSignature is only defined in the reflection API. the rest of the compiler uses Symbol.info instead.
| | * Fix for failing test.Paul Phillips2012-09-282-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's some very sketchy behavior visible - I'm printing a method signature and getting this: [B <: <?>, That <: <?>](f: <?>)(implicit cbf: <?>)That But there's no exposed way to force the info. Am I supposed to call isSealed or something?
| | * Implementations of isValueType and isNonValueType.Paul Phillips2012-09-285-13/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrictions regarding how non-value types can be used have generally not been enforced explicitly, depending instead on the fact that the compiler wouldn't attempt to use them in strange ways like offering a method type as a type argument. Since users can now create most types from scratch, it has become important to enforce the restrictions in a more direct fashion. This was a lot harder than it probably should have been because there are so many types which go unmentioned by the specification. Hopefully a useful exercise in any case.
| | * SI-6417 correctly reifies non-value typesEugene Burmako2012-09-285-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're reifying non-value types (e.g. MethodTypes), we can't use them as type arguments for TypeTag/WeakTypeTag factory methods, otherwise the macro expansion won't typecheck: http://groups.google.com/group/scala-internals/browse_thread/thread/2d7bb85bfcdb2e2 This situation is impossible if one uses only reify and type tags, but c.reifyTree and c.reifyType exposes in the macro API let anyone feed anything into the reifier. Therefore I now check the tpe that is about to be used in TypeApply wrapping TypeTag/WeakTypeTag factory methods and replace it with AnyTpe if it doesn't fit.
| | * showRaw no longer crashes on NoSymbolEugene Burmako2012-09-283-1/+8
| | |
| * | Merge pull request #1395 from odersky/topic/valueclass-cleanupGrzegorz Kossakowski2012-09-281-1/+1
| |\ \ | | | | | | | | Removes discrepancy between SIP 15 and compiler
| | * | Removes discrepancy between SIP 15 and compilerMartin Odersky2012-09-251-1/+1
| | | | | | | | | | | | | | | | There was a discrepancy in that the compiler alternatively accepts a val parameter or an unbox method for a value class but SIP 15 does not mention the unbox method. I commented out the line in the compiler that does it.
| * | | Merge pull request #1347 from soc/SI-6380Grzegorz Kossakowski2012-09-287-15/+57
| |\ \ \ | | |_|/ | |/| | SI-6380 Add @throws[Exception]
| | * | SI-6380 #1 Add @throws[Exception]Simon Ochsenreither2012-09-217-15/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2843-157/+865
| |\ \ \ | | | | | | | | | | Much better unchecked warnings.
| | * | | Added logic and tests for unchecked refinements.Paul Phillips2012-09-274-4/+61
| | | | |
| | * | | Moved isNonRefinementClassType somewhere logical.Paul Phillips2012-09-272-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | It's not Typer's personal method. All should be able to drink of its wisdom.
| | * | | 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-2713-34/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| | * | | Annotate non local returns with @unchecked.Paul Phillips2012-09-262-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Newly available @unchecked annotation enables removing the special case from the unchecked logic.
| | * | | Additional new tests for unchecked warnings.Paul Phillips2012-09-259-0/+151
| | | | |
| | * | | Improvements to unchecked warnings.Paul Phillips2012-09-257-121/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. */
| | * | | Pass a more precise type to checkCheckable when it's available.Paul Phillips2012-09-251-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without it, one cannot assess the checkability of any aspect of the pattern for which static verifiability depends on knowledge of the scrutinee.
| | * | | Moved isVariableName to StdNames where it belong.sPaul Phillips2012-09-254-16/+18
| | | | |
| | * | | Added exists3 to fast collections.Paul Phillips2012-09-251-0/+14
| | | | |
| | * | | Move checkCheckable out of Infer.Paul Phillips2012-09-252-95/+156
| | | | | | | | | | | | | | | | | | | | Preparing for separate file with checkability logic.
| * | | | Merge pull request #994 from phaller/issue/5314Grzegorz Kossakowski2012-09-2821-31/+388
| |\ \ \ \ | | | | | | | | | | | | SI-5314 - CPS transform of return statement fails (resubmission of #987)
| | * | | | Improve doc comment on adaptTypeOfReturn in CPSAnnotationCheckerphaller2012-08-201-3/+7
| | | | | |
| | * | | | Simplify the adaptation of types of return expressionsphaller2012-08-128-11/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-094-26/+8
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d020fab9758ced93eb18fa51c906b95ec104aed.
| | * | | | Add missing cases in tail return transformphaller2012-08-094-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled warnings that no longer apply because of tail returns. Add several test cases.
| | * | | | Replace CheckCPSMethodTraverser with additional parameter on transformer methodsphaller2012-08-085-68/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0819-15/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #1416 from jsuereth/fix/string-context-scaladocGrzegorz Kossakowski2012-09-281-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | add a bit about unicode to scaladoc.
| * | | | | add a bit about unicode to scaladoc.Josh Suereth2012-09-281-0/+7
|/ / / / /
* | | | | Merge pull request #1402 from scalamacros/topic/reflectionEugene Burmako2012-09-2770-764/+531
|\ \ \ \ \ | | | | | | | | | | | | reflection and macro cleanup
| * | | | | moves Context.ParseError outside the cakeEugene Burmako2012-09-272-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I did this for ReificationError a long time ago. Must've probably forgot to do the same for ParseError.
| * | | | | revives macros.InfrastructureEugene Burmako2012-09-278-79/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Takes macros.Settings, throws away its mutable parts, moves classPath from Run back to the top level - and unites all that in the Infrastructure trait.
| * | | | | moves Context.runtimeUniverse to TreeBuild.mkRuntimeUniverseRefEugene Burmako2012-09-276-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | Scaladoc-driven cleanup for the win
| * | | | | a more precise type for Context.mirrorEugene Burmako2012-09-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scala.reflect.api.Mirror is the most basic contract for mirrors. Currently scala.reflect.api.Universe.Mirror is simply an abstract type type Mirror >: Null <: scala.reflect.api.Mirror[self.type], and scala.reflect.macros.Universe doesn't override that type, so from the user standpoint at the moment scala.reflect.api.Mirror == c.mirror, however, in the future this might be a source of errors.
| * | | | | gets rid of macros.InfrastructureEugene Burmako2012-09-278-32/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currentRun goes to Enclosures and becomes enclosingRun currentClassPath gets integrated into Run
| * | | | | simplifies Context.Run and Context.CompilationUnitEugene Burmako2012-09-277-39/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By turning them from abstract types into full-fledged traits implemented by our internal Run and CompilationUnit.
| * | | | | exposes Position.source as SourceFileEugene Burmako2012-09-274-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-274-69/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | merges macros.CapturedVariables into macros.UniverseEugene Burmako2012-09-275-38/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back then we didn't have a notion of a macro-specific universe, so I had to expose these methods in Context. Now we have our very own macros.Universe, so capturing methods have landed there.
| * | | | | merges macros.Exprs and macros.TypeTags into ContextEugene Burmako2012-09-278-38/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former is a one-method trait, the latter is a two-method trait. In a scaladoc these guys don't look like the pull their weight.
| * | | | | removes front ends from scala-reflect.jarEugene Burmako2012-09-2713-214/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| * | | | | PositionApi => PositionEugene Burmako2012-09-274-172/+171
| | | | | | | | | | | | | | | | | | | | | | | | Continues the series of Scaladoc-driven optimizations to scala-reflect.jar.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 17:26:02 +0000