summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SI-5914 handle null in classtag extractorAdriaan Moors2012-06-263-1/+11
|
* SI-2442 fixed by virtpatmat -- test files onlyAdriaan Moors2012-06-264-0/+18
|
* better fix for SI-5189 pt1Adriaan Moors2012-06-261-1/+3
| | | | | | | the fix in 0cffdf38d9 was brain dead (only looking at the first argument of the ctor, rather than the first argument list) the reasoning was that we should not look at the MethodType of the constructor, but at the argument types directly (since going through the method type would flip variance, though the ctor arguments are conceptually in covariant positions here)
* minor cleanup in patmat and typersAdriaan Moors2012-06-262-71/+67
| | | | | | | | patmat: - remove Var's unused 'checked' member; subsumed by 'domain' - updated docs: no longer using isSuccess in __match typers: clean up indentation, swap ifs to failure-first
* Merge pull request #776 from adriaanm/pullreq/fix-774Adriaan Moors2012-06-261-0/+16
|\ | | | | SI-5761: fix up #774 (missing check file)
| * SI-5761: fix up #774 (missing check file)Adriaan Moors2012-06-261-0/+16
|/
* Merge pull request #759 from dragos/new-eclipse-project-filesAdriaan Moors2012-06-2612-13/+202
|\ | | | | Eclipse project files for library, reflect, fjbg & compiler
| * Added new project files for using the compiler and library inside Eclipse ↵Iulian Dragos2012-06-2612-13/+202
| | | | | | | | | | | | and removed the old ones. To use these project files you need to define the Eclipse 'path variable' SCALA_BASEDIR, in General/Workspace/Linked Resources.
* | Merge pull request #774 from hubertp/issue/5761Adriaan Moors2012-06-261-0/+16
|\ \ | | | | | | Added test for SI-5761.
| * | Added test for SI-5761.Hubert Plociniczak2012-06-261-0/+16
| | | | | | | | | | | | | | | Seems that my cleanup of SI-4842 also fixed that one. Review by @paulp or @retronym.
* | | Merge pull request #768 from magarciaEPFL/fixesAdriaan Moors2012-06-261-87/+85
|\ \ \ | | | | | | | | emit JVM InnerClasses attribute for bean info classes
| * | | emit JVM InnerClasses attribute for bean info classesMiguel Garcia2012-06-241-87/+85
| | | |
* | | | Merge pull request #773 from magarciaEPFL/ticket-SI-4935-bAdriaan Moors2012-06-264-1/+36
|\ \ \ \ | |_|/ / |/| | | fix for SI-4935
| * | | fix for SI-4935Miguel Garcia2012-06-264-1/+36
|/ / /
* | | Merge pull request #770 from odersky/pullreq/statisticsAdriaan Moors2012-06-267-80/+149
|\ \ \ | | | | | | | | Statistics improvements and bug fixes.
| * | | Statistics improvements and bug fixes.Martin Odersky2012-06-257-80/+149
| | | | | | | | | | | | | | | | Added compile-time option hotEnabled to Statistics that can be used to count very high frequency methods with 0 overhead for the disabled case. Fixed problem with weak maps that caused some timers to be discarded prematurely before they could be printed. Fixed problem with accouning for stacked timers.
* | | | Merge pull request #769 from hubertp/topic/t4842-followupAdriaan Moors2012-06-266-13/+13
|\ \ \ \ | |/ / / |/| | | Minor followup on SI-4842: remove awkward condition. Review by @retronym
| * | | Minor followup on SI-4842: remove awkward condition. Review by @retronym.Hubert Plociniczak2012-06-256-13/+13
| | |/ | |/|
* | | Merge pull request #760 from retronym/ticket/5966-3Adriaan Moors2012-06-253-3/+17
|\ \ \ | | | | | | | | SI-5966 Fix eta expansion for repeated parameters with zero arguments.
| * | | SI-5966 Fix eta expansion for repeated parameters with zero arguments.Jason Zaugg2012-06-233-3/+17
| | | | | | | | | | | | | | | | | | | | Reworks part of e33901 / SI-5610, which was inserting an <empty> tree as an argument in this case, which turns into a null in icode.
* | | | Merge pull request #767 from retronym/ticket/5968Adriaan Moors2012-06-253-0/+11
|\ \ \ \ | |_|_|/ |/| | | SI-5968 Eliminate spurious exhaustiveness warning with singleton types.
| * | | SI-5968 Eliminate spurious exhaustiveness warning with singleton types.Jason Zaugg2012-06-233-0/+11
| | | | | | | | | | | | | | | | A singleton type is a type ripe for enumeration.
* | | | Merge pull request #766 from soc/patch-8Adriaan Moors2012-06-241-157/+161
|\ \ \ \ | | | | | | | | | | remove semi-colons and extraneous whitespace
| * | | | LongMap: Made life a bit less scary for those doing source archaeology.soc2012-06-241-157/+161
| |/ / /
* | | | Merge pull request #764 from soc/patch-5Adriaan Moors2012-06-241-142/+147
|\ \ \ \ | | | | | | | | | | remove semi-colons and extraneous whitespace
| * | | | IntMap: Made life a bit less scary for those doing source archaeology.soc2012-06-241-142/+147
| |/ / /
* | | | Merge pull request #762 from soc/patch-3Adriaan Moors2012-06-241-2/+3
|\ \ \ \ | | | | | | | | | | Adds missing closing curly brace to ScalaDoc code example.
| * | | | Adds missing closing curly brace to ScalaDoc code example.soc2012-06-241-2/+3
| |/ / /
* | | | Merge pull request #751 from scalamacros/topic/narrowAdriaan Moors2012-06-241-2/+10
|\ \ \ \ | | | | | | | | | | SI-5951 add `narrow` to the reflection API
| * | | | adds `narrow` to the reflection APIEugene Burmako2012-06-191-2/+10
| | | | | | | | | | | | | | | | | | | | as per https://issues.scala-lang.org/browse/SI-5951
* | | | | Merge pull request #761 from paulp/topic/parser-commentAdriaan Moors2012-06-241-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Added a key comment.
| * | | | | Added a key comment.Paul Phillips2012-06-231-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | The commit message from f4d2678c42 works a lot better up close and personal with the change.
* | | | | Merge pull request #758 from dragos/update-manifest-fileAdriaan Moors2012-06-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Exported new packages in the MANIFEST file.
| * | | | | Exported new packages in the MANIFEST file.Iulian Dragos2012-06-221-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #733 from retronym/ticket/4989-3Adriaan Moors2012-06-243-0/+83
|\ \ \ \ \ | |_|/ / / |/| | | | SI-4989 Reject super.x if an intermediate class declares x abstract.
| * | | | SI-4989 Reject super.x if an intermediate class declares x abstract.Jason Zaugg2012-06-173-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | This is in line with Java's treatment. Without this, an AbstractMethodError is thrown at runtime.
* | | | | Merge pull request #756 from axel22/issue/4809Josh Suereth2012-06-222-4/+38
|\ \ \ \ \ | | | | | | | | | | | | Fix SI-4809.
| * | | | | Fix SI-4809.Aleksandar Prokopec2012-06-212-4/+38
| | | | | |
* | | | | | Merge pull request #755 from axel22/issue/5284-cherry-pickedAdriaan Moors2012-06-2210-26/+180
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix SI-5284.
| * | | | | Fix SI-5284.Aleksandar Prokopec2012-06-2110-26/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was the false assumption that methods specialized on their type parameter, such as this one: class Foo[@spec(Int) T](val x: T) { def bar[@spec(Int) S >: T](f: S => S) = f(x) } have their normalized versions (`bar$mIc$sp`) never called from the base specialization class `Foo`. This meant that the implementation of `bar$mIc$sp` in `Foo` simply threw an exception. This assumption is not true, however. See this: object Baz { def apply[T]() = new Foo[T] } Calling `Baz.apply[Int]()` will create an instance of the base specialization class `Foo` at `Int`. Calling `bar` on this instance will be rewritten by specialization to calling `bar$mIc$sp`, hence the error. So, we have to emit a valid implementation for `bar`, obviously. Problem is, such an implementation would have conflicting type bounds in the base specialization class `Foo`, since we don't know if `T` is a subtype of `S = Int`. In other words, we cannot emit: def bar$mIc$sp(f: Int => Int) = f(x) // x: T without typechecking errors. However, notice that the bounds are valid if and only if `T = Int`. In the same time, invocations of `bar$mIc$sp` will only be emitted in callsites where the type bounds hold. This means we can cast the expressions in method applications to the required specialized type bound. The following changes have been made: 1) The decision of whether or not to create a normalized version of the specialized method is not done on the `conflicting` relation anymore. Instead, it's done based on the `satisfiable` relation, which is true if there is possibly an instantiation of the type parameters where the bounds hold. 2) The `satisfiable` method has a new variant called `satisfiableConstraints`, which does unification to figure out how the type parameters should be instantiated in order to satisfy the bounds. 3) The `Duplicators` are changed to transform a tree using the `castType` method which just returns the tree by default. In specialization, the `castType` in `Duplicators` is overridden, and uses a map from type parameters to types. This map is obtained by `satisfiableConstraints` from 2). If the type of the expression is not equal to the expected type, and this map contains a mapping to the expected type, then the tree is cast, as discussed above. Additional tests added. Review by @dragos Review by @VladUreche Conflicts: src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
* | | | | | Merge pull request #752 from retronym/topic/warn-catch-all-4Adriaan Moors2012-06-225-3/+43
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | SI-2807 Resurrect and refine the promiscuous catch warning.
| * | | | | SI-2807 Resurrect and refine the promiscuous catch warning.Jason Zaugg2012-06-195-3/+43
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous incarnation didn't survive 4fb3473. This version can be cleared by using a typed pattern: `catch { case _: Throwable => }`. This is motivated by the recent appearance of such a catch in `util.Try`, and by battle scars left by one too many processes bravely but stupidly catching and logging OutOfMemoryErrors. -Y status has been skipped: this warning is enabled by default and can only be silenced with use of a typed pattern.
* | | | | Merge pull request #712 from dragos/issue/hardening-compiling-with-newer-sourcesPaul Phillips2012-06-213-7/+17
|\ \ \ \ \ | | | | | | | | | | | | Issue/hardening compiling with newer sources
| * | | | | Remove NPE when `compileLate` sees sources during initialization.Iulian Dragos2012-06-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a symbol needed in Definitions is loaded, it may be that the corresponding source is newer than the classfile. That will send it to `compileLate`, but no phase is yet set. We simply add it to the compilation pipeline and continue gracefully.
| * | | | | Don't require symbols to be loaded in the parser.Iulian Dragos2012-06-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parser special-cases primitive types. For comparing the name, it relied on having the symbols for primitive types already loaded, which is not always the case. The presentation compiler may parse sources for, say, scala.Int, and therefore the symbol for Int may not be yet available.
| * | | | | Don't use the BrowsingLoader for Java sources. Iulian Dragos2012-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the presentation compiler needs a SourceLoader, instead of immediately adding the file to the compilation round it uses a fast parser to create symbols for all top-level class definitions. The fast parser assumes Scala sources, which is not always the case.
* | | | | | Merge pull request #753 from vjovanov/actor-tests-fixAdriaan Moors2012-06-2118-0/+1081
|\ \ \ \ \ \ | | | | | | | | | | | | | | Making Actor Migration Tests deterministic.
| * | | | | | Making Actor Migration Tests deterministic.Vojin Jovanovic2012-06-2018-0/+1081
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Review by: @phaller
* | | | | | Merge pull request #748 from jsuereth/update-scalacheck-sourceAdriaan Moors2012-06-2116-248/+145
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated scalacheck sources.
| * | | | | | Updated scalacheck sources.Paul Phillips2012-06-1916-248/+145
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To current scalacheck head 7ffda752d8 except for this diff: diff -rw src/scalacheck/org/scalacheck/Arbitrary.scala /s/scalacheck/src/main/scala/org/scalacheck/Arbitrary.scala 13d12 < import scala.reflect.ClassTag 281c280 < implicit def arbArray[T](implicit a: Arbitrary[T], c: ClassTag[T] --- > implicit def arbArray[T](implicit a: Arbitrary[T], c: ClassManifest[T] diff -rw src/scalacheck/org/scalacheck/Prop.scala /s/scalacheck/src/main/scala/org/scalacheck/Prop.scala 63c63 < def mainCallsExit = false --- > def mainCallsExit = true Only in /s/scalacheck/src/main/scala/org/scalacheck: ScalaCheckFramework.scala diff -rw src/scalacheck/org/scalacheck/util/Buildable.scala /s/scalacheck/src/main/scala/org/scalacheck/util/Buildable.scala 13d12 < import scala.reflect.ClassTag 34c33 < implicit def buildableArray[T](implicit cm: ClassTag[T]) = --- > implicit def buildableArray[T](implicit cm: ClassManifest[T]) =
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 11:41:32 +0000