summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4740 from gbasler/ticket/SI-9369Seth Tisue2015-09-143-1/+30
|\ | | | | SI-9369 Fix pattern matcher warnings for diamond shaped inheritance.
| * SI-9369 Fix pattern matcher warnings for diamond shaped inheritance.Gerard Basler2015-09-123-1/+30
|/ | | | | | | | | | A previous optimization (d44a86f432a7f9ca250b014acdeab02ac9f2c304) for pattern matcher exhaustivity checks used a smarter encoding to ensure that the scrutinee can be equal to one child only. However, in case of traits between the root and leave type, a child can be of several types and these types should not be in a mutually exclusive group. A simple solution (hat tip to retronym) is to just put traits and classes into separate groups.
* Merge pull request #4714 from Ichoran/issue/9407Seth Tisue2015-09-081-10/+1
|\ | | | | SI-9407 Vector implementation bit-shift bugfix
| * SI-9407 Vector implementation bit-shift bugfixRex Kerr2015-08-291-10/+1
| | | | | | | | | | | | Fixed logically incorrect or unnecessary code in Vector as reported by Dirk Toewe. No tests. Because of the size of the vectors, tests would be impractically slow. Also, the logic is quite clear: when you are recursing through a tree, using the wrong bit shift means you hit the wrong part of the tree, and when you create and then always overwrite a mutable var, you should just not do it to begin with.
* | Merge pull request #4333 from Ichoran/opt-Iterator-2.11.xSeth Tisue2015-09-081-59/+162
|\ \ | | | | | | Performance optimization - Iterator
| * | Performance optimization - Iterator span, collect, dropWhileRex Kerr2015-08-071-35/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite of span to avoid double-indirection of `.buffered` and to avoid use of `mutable.Queue` unless it is absolutely necessary. Rewrite of `span` and `dropWhile` to also avoid `.buffered` (less DRY but single vs. double indirection and object allocation). Performance improvements: ``` method reason =========== =============================================================== collect 2.3x faster on small collections, 1.5x on large span 1.6-1.7x faster on small collections 0.85x-1.8x slower/faster on large collections depending on how much must be cached (0.85x all, 1.8x none) dropWhile 1.2x faster on small collections, half the garbage ```
| * | Performance optimization - Iterator flatMap, find, indexWhere, indexOfRex Kerr2015-08-071-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tightened up bytecode, logic, and/or performance by using local return instead of a mutable variable in several methods. Performance/bytecode size improvements (smaller bytecode = better inlining) ``` method reason =========== =============================================================== flatMap hasNext bytecode 34 bytes down from 62 find bytecode 41 bytes instead of 53 indexWhere 1.5x faster on small collections (some contexts) indexOf bytecode 89 bytes instead of 110 ```
* | | Merge pull request #4713 from SethTisue/batch-of-typosJason Zaugg2015-09-088-12/+12
|\ \ \ | | | | | | | | fix typos/spelling
| * | | fix assorted typosSeth Tisue2015-08-287-11/+11
| | | |
| * | | fix trivial error in specSeth Tisue2015-08-281-1/+1
| | |/ | |/|
* | | Merge pull request #4722 from janekdb/2.11.x-scaladoc-in-context-AnyValDick Wall2015-09-062-2/+2
|\ \ \ | | | | | | | | Link to completed value classes SIP page instead of pending version
| * | | Link to completed value classes SIP page instead of pending versionJanek Bogucki2015-09-012-2/+2
| | | |
* | | | Merge pull request #4706 from VladUreche/issue/tree-checkerJason Zaugg2015-09-061-1/+8
|\ \ \ \ | | | | | | | | | | Re-enable tree checkers
| * | | | Re-enable tree checkersVlad Ureche2015-08-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My expectation is that tree checkers are re-typechecking the trees and making sure they are consistent. Unfortunately, following patch aced32d05c97651534f468bc9a475ea5f6ae75b8, the call to clearType() was removed, thus the typer no longer recursed inside the trees, rendering the type checkers framework useless. This is an attempt to make the tree checkers run again, by resetting the type of a tree before the call to super.typed, thus allowing the typer to actually visit the entire tree (not just the outer package definition). The work was prompted by SI-9442, where the type checkers would gladly allow validate the inconsistent trees.
* | | | | Merge pull request #4704 from VladUreche/issue/9442Jason Zaugg2015-09-064-10/+69
|\ \ \ \ \ | | | | | | | | | | | | SI-9442 Fix the uncurry-erasure types
| * | | | | SI-9442 Fix the uncurry-erasure typesVlad Ureche2015-08-234-10/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the "uncurry-erased" type (the one after the uncurry phase) can lead to incorrect tree transformations. For example, compiling: ``` def foo(c: Ctx)(l: c.Tree): Unit = { val l2: c.Tree = l } ``` Results in the following AST: ``` def foo(c: Ctx, l: Ctx#Tree): Unit = { val l$1: Ctx#Tree = l.asInstanceOf[Ctx#Tree] val l2: c.Tree = l$1 // no, not really, it's not. } ``` Of course, this is incorrect, since `l$1` has type `Ctx#Tree`, which is not a subtype of `c.Tree`. So what we need to do is to use the pre-uncurry type when creating `l$1`, which is `c.Tree` and is correct. Now, there are two additional problems: 1. when varargs and byname params are involved, the uncurry transformation desugares these special cases to actual typerefs, eg: ``` T* ~> Seq[T] (Scala-defined varargs) T* ~> Array[T] (Java-defined varargs) =>T ~> Function0[T] (by name params) ``` we use the DesugaredParameterType object (defined in scala.reflect.internal.transform.UnCurry) to redo this desugaring manually here 2. the type needs to be normalized, since `gen.mkCast` checks this (no HK here, just aliases have to be expanded before handing the type to `gen.mkAttributedCast`, which calls `gen.mkCast`)
* | | | | | Merge pull request #4726 from janekdb/2.11.x-now-Oracle-urlsSeth Tisue2015-09-037-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update Java and Sun URLs to replacement Java and Oracle URLs
| * | | | | | Update Java and Sun URLs to replacement Java and Oracle URLsJanek Bogucki2015-09-027-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each URL - Where it redirected the target of the redirection was used - Where is no longer existed a replacement was selected
* | | | | | | Merge pull request #4715 from Ichoran/issue/9424Seth Tisue2015-09-021-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | SI-9424 Clarify behavior of PriorityQueue toString
| * | | | | | SI-9424 Clarify behavior of PriorityQueue toStringRex Kerr2015-08-291-2/+13
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarified that PriorityQueue will not print in order and gave an example of a workaround if one needs it. Documentation change only; no tests.
* | | | | | Merge pull request #4701 from janekdb/2.11.x-scaladoc-in-context-OptionSeth Tisue2015-09-021-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Improve comment in Option.collect example
| * | | | | Improve implementation comments in Option.collect exampleJanek Bogucki2015-08-311-1/+1
| | | | | |
* | | | | | Merge pull request #4692 from JanBessai/Fix-SI-6636Adriaan Moors2015-08-314-0/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6636 Fix macro expansion in toolboxes
| * | | | | | SI-6636 Fix macro expansion in toolboxesJan Bessai2015-08-234-0/+47
| | | | | | |
* | | | | | | Merge pull request #4694 from janekdb/2.11.x-READMEAdriaan Moors2015-08-311-35/+40
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Format and content enhance README.md
| * | | | | | Format and content enhance README.mdJanek Bogucki2015-08-191-35/+40
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace bullet points with tables for - Review labels - Command overviews Rescue sbt section from midst of Ant section. Syntax correct use of ANT_OPTS. Synchronise IntelliJ menu path to 14.1. Update OSS repo name. The Central Repository was formerly known as Maven Central. Standardise on @-mention instead of @mention. Mark unfinished section with TODO. Include a few other minor improvements.
* | | | | | Merge pull request #4707 from fthomas/topic/pins-linkLukas Rytz2015-08-281-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add link to online version of Programming in Scala
| * | | | | | Add link to online version of Programming in ScalaFrank S. Thomas2015-08-241-2/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4710 from retronym/ticket/9450Seth Tisue2015-08-273-3/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9450 Fix triple quoted strings in REPL :power mode
| * | | | | | SI-9450 Fix triple quoted strings in REPL :power modeJason Zaugg2015-08-273-3/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some extra synthetic code generated under this mode failed to escape input before adding it to a literal string. It used to get away with this most of the time by triple quoting the literal. This commit reuses Scala string escaping logic buried in `Constant` to do this properly. Actually, the proper approach would be to build the synthetic code with trees and quasiquotes, and avoid the mess of stringly-genererated code. I threw in some defensive hygiene for the reference to `Nil` while I was in the neighbourhood.
* | | | | | Merge pull request #4703 from Ichoran/issue/8346Lukas Rytz2015-08-276-5/+124
|\ \ \ \ \ \ | |/ / / / / |/| | | | | SI-8346 Re-established soundness of toSet (element type widening)
| * | | | | SI-8346 Re-established soundness of toSet (element type widening)Rex Kerr2015-08-266-5/+124
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toSet needs to rebuild some child classes, but not others, as toSet is allowed to widen element types (which the invariant Set normally cannot do), and some sets rely upon their invariance. Thus, sets that rely upon their invariance now rebuild themselves into a generic set upon toSet, while those that do not just sit there. Note: there was a similar patch previously that fixed the same problem, but this is a reimplementation to circumvent license issues. Note: the newBuilder method was benchmarked as (surprisingly!) the most efficient way to create small sets, so it is used where sets may need to be rebuild.
* | | | | Merge pull request #4705 from mpociecha/fix-typos3Seth Tisue2015-08-2340-52/+52
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix typos in spec, docs and comments
| * | | | Fix typo in the name of a private methodMichał Pociecha2015-08-231-5/+5
| | | | | | | | | | | | | | | | | | | | Since it's a private method, it's safe to just rename it.
| * | | | Fix typos in spec, docs and commentsMichał Pociecha2015-08-2339-47/+47
|/ / / /
* | | | Merge pull request #4702 from janekdb/2.11.x-CONTRIBUTING-adviceAdriaan Moors2015-08-211-2/+2
|\ \ \ \ | | | | | | | | | | Sync commit advice to README.md and fix Scabot URL
| * | | | Sync commit advice to README.md and fix Scabot URLJanek Bogucki2015-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONTRIBUTING.md offered different advice on commit subject line length to README.md. Align CONTRIBUTING to README. Fix Scabot repo URL
* | | | | Merge pull request #4696 from janekdb/2.11.x-contributingSeth Tisue2015-08-201-0/+1
|\| | | | | |_|/ / |/| | | Extend documentation contacts
| * | | Extend documentation contactsJanek Bogucki2015-08-191-0/+1
| |/ /
* | | Merge pull request #4693 from scala/revert-3791-ticket/8346Seth Tisue2015-08-205-64/+6
|\ \ \ | | | | | | | | Revert "SI-8346 Rebuild invariant sets in #toSet, avoiding CCE"
| * | | Revert "SI-8346 Rebuild invariant sets in #toSet, avoiding CCE"Adriaan Moors2015-08-185-64/+6
| |/ /
* | | Merge pull request #4697 from martijnhoekstra/patch-3Seth Tisue2015-08-191-2/+2
|\ \ \ | | | | | | | | Fix documentation of Stream.filter introduced in 13f30c
| * | | Fix documentation of filter introduced in 13f30cmartijnhoekstra2015-08-191-2/+2
| |/ /
* | | Merge pull request #4695 from janekdb/2.11.x-scaladoc-PredefSeth Tisue2015-08-191-1/+1
|\ \ \ | |/ / |/| | Fix method name reference in Predef documentation
| * | Fix method name reference in Predef documentationJanek Bogucki2015-08-191-1/+1
|/ /
* | Merge pull request #4678 from stusmall/2.11.xLukas Rytz2015-08-101-0/+4
|\ \ | | | | | | Improved error message for "filename too long" build errors
| * | SI-3623 Improved error message for "filename too long" build errorsstusmall2015-08-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | When building on ecryptfs filenames can be limited to ~142 characters. This limit doesn't take long to hit and can leave the the user with a hard to diagnosis error message. Some legacy file systems will have similarly small limits. This just adds a hint that the error might be related to the underlying fs.
* | | Merge pull request #4688 from retronym/topic/typer-debug-implicitsLukas Rytz2015-08-102-3/+5
|\ \ \ | |_|/ |/| | Fix tracing of implicit search under -Ytyper-debug
| * | Fix tracing of implicit search under -Ytyper-debugJason Zaugg2015-08-062-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The log messages intented to chronicle implicit search were always being filtered out by virtue of the fact that the the tree passed to `printTyping` was already typed, (e.g. with an implicit MethodType.) This commit enabled printing in this case, although it still filters out trees that are deemed unfit for typer tracing, such as `()`. In the context of implicit search, this happens to filter out the noise of: ``` | | | [search #2] start `()`, searching for adaptation to pt=Unit => Foo[Int,Int] (silent: value <local Test> in Test) implicits disabled | | | [search #3] start `()`, searching for adaptation to pt=(=> Unit) => Foo[Int,Int] (silent: value <local Test> in Test) implicits disabled | | | \-> <error> ``` ... which I think is desirable. The motivation for this fix was to better display the interaction between implicit search and type inference. For instance: ``` class Foo[A, B] class Test { implicit val f: Foo[Int, String] = ??? def t[A, B](a: A)(implicit f: Foo[A, B]) = ??? t(1) } ``` ```` % scalac -Ytyper-debug sandbox/instantiate.scala ... | |-- t(1) BYVALmode-EXPRmode (site: value <local Test> in Test) | | |-- t BYVALmode-EXPRmode-FUNmode-POLYmode (silent: value <local Test> in Test) | | | [adapt] [A, B](a: A)(implicit f: Foo[A,B])Nothing adapted to [A, B](a: A)(implicit f: Foo[A,B])Nothing | | | \-> (a: A)(implicit f: Foo[A,B])Nothing | | |-- 1 BYVALmode-EXPRmode-POLYmode (site: value <local Test> in Test) | | | \-> Int(1) | | solving for (A: ?A, B: ?B) | | solving for (B: ?B) | | [search #1] start `[A, B](a: A)(implicit f: Foo[A,B])Nothing` inferring type B, searching for adaptation to pt=Foo[Int,B] (silent: value <local Test> in Test) implicits disabled | | [search #1] considering f | | [adapt] f adapted to => Foo[Int,String] based on pt Foo[Int,B] | | [search #1] solve tvars=?B, tvars.constr= >: String <: String | | solving for (B: ?B) | | [search #1] success inferred value of type Foo[Int,=?String] is SearchResult(Test.this.f, TreeTypeSubstituter(List(type B),List(String))) | | |-- [A, B](a: A)(implicit f: Foo[A,B])Nothing BYVALmode-EXPRmode (site: value <local Test> in Test) | | | \-> Nothing | | [adapt] [A, B](a: A)(implicit f: Foo[A,B])Nothing adapted to [A, B](a: A)(implicit f: Foo[A,B])Nothing | | \-> Nothing ```
* | | Merge pull request #4620 from lastland/patch-1Seth Tisue2015-08-071-1/+2
|\ \ \ | | | | | | | | Fix the bug in the example in scala.sys.process
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 13:15:50 +0000