summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '90706b0' into merge-2.11-to-2.12-june-1Lukas Rytz2016-06-013-2/+0
|\
| * Merge pull request #5172 from lrytz/move-testJason Zaugg2016-05-172-0/+0
| |\ | | | | | | Move t8449 to correct place
| | * Move t8449 to correct placeLukas Rytz2016-05-172-0/+0
| | | | | | | | | | | | Follow-up for https://github.com/scala/scala/pull/4117
| * | Remove default value for sourcepath in scalac (ant version). (#5166)Krzysztof Romanowski2016-05-171-2/+0
| |/
* | SI-9767 document and test behaviour of String->integer/float conversionsMike Pheasant2016-06-012-7/+46
| | | | | | | | | | | | | | We delegate `String`'s extension methods `toInt`, `toFloat`, etc to corresponding methods in the Java standard library. These differ in the way they handle whitespace in the original string. This commit documents and tests the current behaviour.
* | Merge pull request #5076 from soc/topic/deprecations-sinceLukas Rytz2016-05-30195-677/+786
|\ \ | | | | | | Improvements to deprecations related to `since` parameter
| * | Add documentation to @deprecatedSimon Ochsenreither2016-05-294-21/+101
| | |
| * | Add since arg to deprecationWarning and use itSimon Ochsenreither2016-05-2966-132/+160
| | |
| * | Lower-case spelling of @deprecated messagesSimon Ochsenreither2016-05-28117-490/+484
| | |
| * | SI-9084 Add `since` (if available) to deprecation warningsSimon Ochsenreither2016-05-2828-87/+96
| | |
| * | SI-9483 Add `since` to `@deprecatedName`Simon Ochsenreither2016-05-271-3/+1
| | |
* | | Merge pull request #5191 from som-snytt/issue/9382Lukas Rytz2016-05-307-99/+131
|\ \ \ | | | | | | | | SI-9382 Privatize enhanced x in Tuple2Zipped.Ops
| * | | SI-9382 Zippy clean-up in aisle 2 & 3Som Snytt2016-05-265-97/+113
| | | | | | | | | | | | | | | | | | | | Consolated JUnit tests and heeded comment about private def and code beauty.
| * | | SI-9382 Privatize enhanced x in Tuple2Zipped.OpsSom Snytt2016-05-254-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably there should be an Abide rule to avoid leaking the "underlying value" of a value class. The spec or SIP defines "underlying type" but doesn't mention the underlying value. The argument for concealing the member is that it is redundant and makes autocompletion results harder to read. Also, possibly an additional implicit might want to add a member so-named.
* | | | Merge pull request #5193 from som-snytt/issue/9794Lukas Rytz2016-05-303-2/+10
|\ \ \ \ | | | | | | | | | | SI-9794 Error advice uses decoded method name
| * | | | SI-9794 Error advice uses decoded method nameSom Snytt2016-05-263-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So much work went into polishing this error message, it's worth buffing the method name when it's an operator. The message now says `+` instead of `$plus`.
* | | | | Merge pull request #5200 from lrytz/bootstrap-opt-optionsLukas Rytz2016-05-301-2/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Don't pass -opt to starr / locker build in the bootstrap script
| * | | | Don't pass -opt to starr / locker build in the bootstrap scriptLukas Rytz2016-05-301-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming -Yopt to -opt revealed that we're passing the flag when building the locker (and optionally the starr) version. This is not necessary: when building the next stage with the flag enabled, the same optimizations are performed no matter if the current stage was built with the flag or not.
* | | | Merge pull request #5102 from milessabin/2.12.xJason Zaugg2016-05-2737-11/+514
|\ \ \ \ | | | | | | | | | | SI-2712 Add support for partial unification of type constructors
| * | | | -Xexperimental mode now only includes -Ypartial-unificationMiles Sabin2016-05-243-5/+5
| | | | |
| * | | | SI-2712 Add support for higher order unificationMiles Sabin2016-05-2435-6/+509
| | | | |
* | | | | Merge pull request #5186 from lrytz/inlinerM5Jason Zaugg2016-05-276-18/+87
|\ \ \ \ \ | | | | | | | | | | | | Debug flag to print a summary of the inliner's work
| * | | | | Debug flag to print a summary of the inliner's workLukas Rytz2016-05-246-18/+87
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example output below. Note that inlining List.map fails because the trait forwarder uses `INVOKESPECIAL` for now, will change with pr 5177. $ cat Test.scala class C { def foo = Map(1 -> 'a', 2 -> 'b') def bar(l: List[Int]) = l.map(_ + 1) } $ qsc -Yopt-log-inline _ -Yopt:l:classpath Test.scala Inlining into C.foo (initially 36 instructions, ultimately 72): - Inlined scala/Predef$ArrowAssoc$.$minus$greater$extension (8 instructions) 2 times: the callee is annotated `@inline` Inlining into C.bar (initially 12 instructions, ultimately 12): - Failed to inline scala/collection/immutable/List.map (the callee is a higher-order method, the argument for parameter (bf: Function1) is a function literal): The callee scala/collection/immutable/List::map(Lscala/Function1;Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object; contains the instruction INVOKESPECIAL scala/collection/TraversableLike.map (Lscala/Function1;Lscala/collection/generic/CanBuildFrom;)Ljava/lang/Object; that would cause an IllegalAccessError when inlined into class C.
* | | | | Merge pull request #5192 from dwijnand/wip/scala-repl-no-importsJason Zaugg2016-05-2713-31/+604
|\ \ \ \ \ | |_|/ / / |/| | | | Fully qualify types in REPL generated code
| * | | | Fully qualify types in REPL generated codeDale Wijnand2016-05-2613-31/+604
| | | | |
* | | | | Merge pull request #5189 from lrytz/y-notAdriaan Moors2016-05-2687-178/+178
|\ \ \ \ \ | |/ / / / |/| | | | Rename -Yopt to -opt, -Yopt-warnings to -opt-warnings
| * | | | Rename -Yopt to -opt, -Yopt-warnings to -opt-warningsLukas Rytz2016-05-2587-178/+178
|/ / / / | | | | | | | | | | | | Keep -Yopt-inline-heuristics and -Yopt-trace unchanged
* | | | Merge pull request #5188 from janekdb/topic/2.12.x-scaladoc-AnsiColour-2Lukas Rytz2016-05-251-1/+1
|\ \ \ \ | | | | | | | | | | Use full braces style in AnsiColor example
| * | | | Use full braces style in AnsiColor exampleJanek Bogucki2016-05-251-1/+1
|/ / / / | | | | | | | | | | | | This matches the use of ${..} in Console.
* | | | Merge pull request #5052 from kilotaras/topic/map-applyOrElseLukas Rytz2016-05-251-0/+4
|\ \ \ \ | | | | | | | | | | Added applyOrElse to MapLike
| * | | | Added applyOrElse to MapLikeTaras Boiko2016-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This overrides default implementation from PartialFunction which used both contains(x) and get(x) with getOrElse.
* | | | | Merge pull request #5185 from janekdb/topic/2.12.x-scaladoc-java-link-syntaxLukas Rytz2016-05-252-6/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix Scaladoc link syntax on java.util.Formatter references
| * | | | | Fix Scaladoc link syntax on java.util.Formatter referencesJanek Bogucki2016-05-242-6/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #5124 from performantdata/bug/SI-9522Lukas Rytz2016-05-256-32/+116
|\ \ \ \ \ | |/ / / / |/| | | | SI-9522 release key reference when deleting from OpenHashMap
| * | | | SI-9522 release key reference when deleting from OpenHashMapPerformant Data LLC2016-05-246-32/+116
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets the key field in the hash table entry to its default value when an entry is deleted, so as not to unexpectedly retain an object reference, leading to a memory leak. Also includes incidental changes to the slot location algorithm that reduce the number of deleted entries.
* | | | Merge pull request #4935 from som-snytt/issue/8044-tickvarAdriaan Moors2016-05-248-11/+44
|\ \ \ \ | | | | | | | | | | SI-8044 Allow binding backquoted varid in patterns
| * | | | SI-8044 Allow any id in explicit pattern bindingSom Snytt2016-05-203-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows arbitrary identifier in `X @ pat`, including non-varids. This goes to regularity. Users of this syntax are not likely to be confused by the "backquoted var id is stable" rule. Also for sequence pattern, `X @ _*`.
| * | | | SI-8044 Test for quoted not-a-varidSom Snytt2016-05-202-0/+8
| | | | |
| * | | | SI-8044 Allow binding backquoted varid in patternsSom Snytt2016-05-206-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, a varid could not be backquoted, so that it was not possible to introduce variables with names such as `type` in a match expression. This commit allows backquoted varids in `case x @ _` and `case x: Int`. In neither position is a stable id accepted, that is, an id with leading uppercase. Therefore, this commit merely relaxes the backquoted varid to be taken as a normal varid in these contexts.
* | | | | Merge pull request #5175 from som-snytt/issue/9656-range-toStringStefan Zeiger2016-05-246-20/+84
|\ \ \ \ \ | |_|/ / / |/| | | | SI-9656 Distinguish Numeric with step type
| * | | | SI-9656 Range.toString distinguishes Numeric stepSteve Robinson2016-05-196-20/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Range and NumericRange, toString will indicate the step if it is not 1. Additionally, indicate empty ranges and ranges which are not "exact". For a "mapped" range, used by `Range.Double`, toString includes the underlying range and the simple type of the step (to distinguish Double from BigDecimal).
* | | | | Merge pull request #5179 from liff/topic/SI-9781Adriaan Moors2016-05-233-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Check left side of an assignment expression for errors; fixes SI-9781
| * | | | | SI-9781 Don't convert erroneous expression to assignmentOlli Helenius2016-05-203-1/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `convertToAssignment` is triggered on a type error but it doesn't seem to really care what the error is as long as the expression can be converted to an assignment expression. This patch fixes that by checking whether the qualifier of the selection contains any errors before deciding to continue with the conversion.
* | | | | Merge pull request #5106 from milessabin/topic/hkgadtAdriaan Moors2016-05-234-1/+101
|\ \ \ \ \ | | | | | | | | | | | | SI-9760 Fix for higher-kinded GADT refinement
| * | | | | Added pos test with multiple cases; added neg tests.Miles Sabin2016-05-063-4/+87
| | | | | |
| * | | | | Added missing result type to test.Miles Sabin2016-04-201-1/+1
| | | | | |
| * | | | | SI-9760 Fix for higher-kinded GADT refinementMiles Sabin2016-04-192-1/+18
| | | | | |
* | | | | | Merge pull request #5181 from chrisokasaki/issue/9776Adriaan Moors2016-05-232-18/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9776 Fix type of PriorityQueue.newBuilder and improve performance
| * | | | | | SI-9776: Fix type of PriorityQueue.newBuilder and improve performancechrisokasaki2016-05-222-18/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix the return type of mutable.PriorityQueue.newBuilder to be Builder[A, PriorityQueue[A]] rather than PriorityQueue[A]. - Improve performance of bulk inserts from O(N log N) to O(N), primarily in the builder, ++=, and reverse. These changes indirectly benefit the many other methods that use the builder or ++=. - Improve performance of clone. - Fix SI-9757 space leak in dequeue.
* | | | | | | Merge pull request #5164 from viktorklang/wip-future-docs-√Adriaan Moors2016-05-233-59/+133
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve Future documentation (+ minor code cleanups)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 03:03:54 +0000