summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SI-9885 Don't return offset past EOFSom Snytt2016-08-122-9/+33
| | | | | On bad line number, `lineToOffset` should not return an offset past EOF (which was sentinel, internally).
* Merge pull request #5286 from soc/topic/biased-either-fixupStefan Zeiger2016-08-031-24/+48
|\ | | | | Improve Scaladoc for Either:
| * Improve Scaladoc for Either:Simon Ochsenreither2016-07-151-24/+48
| | | | | | | | | | - remove text on projections - add for comprehensions
* | Merge pull request #5313 from adriaanm/fixup-5292Adriaan Moors2016-07-293-4/+4
|\ \ | | | | | | Make sure sbt's exit code is seen as script exit code
| * | Make sure sbt's exit code is seen as script exit codeAdriaan Moors2016-07-293-4/+4
|/ / | | | | | | | | | | ... and not grep's exit code, which would mean the test suite's result is determined by whether grep fails or not, instead of partest/junit's hard work
* | Merge pull request #5250 from dimatkach/fast-array-slice-3Adriaan Moors2016-07-281-0/+11
|\ \ | | | | | | Override `.slice` in ArrayOps to use arraycopy.
| * | Fixed some style issuesDima Tkach2016-07-271-2/+2
| | |
| * | Override `.slice` in ArrayOps to use arraycopy.Dima Tkach2016-06-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it ~10x faster when copying large chunks arround. My benchmark: def bm(duration: Long)(f: => Unit): Int = { val end = System.currentTimeMillis + duration var count = 0 while(System.currentTimeMillis < end) { f count += 1 } count } def measure(seconds: Int)(f: => Unit) = (1 to seconds).map { _ => bm(1000)(f) }.sum / seconds val array = scala.util.Random.alphanumeric.take(1000).toArray measure(20) { array.slice(100, 500) } // ~5 million measure(20) { scala.collection.WrappedArray(array).slice(100, 500) } // ~300K
* | | Merge pull request #5292 from szeiger/wip/sbt-windowsAdriaan Moors2016-07-288-65/+102
|\ \ \ | | | | | | | | Switch Windows CI build to sbt (w/ some sbt build improvements) [ci: last-only]
| * | | Switch Windows CI build to sbt (w/ some sbt build improvements)Stefan Zeiger2016-07-218-65/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use sbt in `integrate/windows`: This essentially combines the Unix CI jobs `validate/publish-core` and `validate/test`, first publishing a local release built with STARR and then building a new version with that and running all tests on it. - Unify repository handling across build scripts: A new function `generateRepositoriesConfig` in `common`, based on the existing code in `integrate/bootstrap`, writes the `repositories` file for sbt, either with or without an extra bootstrap repository for resolving a previously built version. It is used in all CI scripts to ensure that artifacts are only resolved through the sanctioned proxies and upstream repositories. - The repository URL arguments in `setupPublishCore` and `setupValidateTest` are now optional as well. These commands are used without a URL from `integrate/windows`, which publishes to `local` instead of a temporary remote repository. - `testAll` is now a task instead of a command. It runs the same sequence of sub-tasks as before but does not propagate failures immediately. It always runs all subtasks and reports errors at the end. - The `generateBuildCharacterPropertiesFile` task now includes all properties from `versions.properties` (whose values have potentially been overwritten with `-D` options) in `buildcharacter.properties`.
* | | | Merge pull request #5301 from retronym/ticket/SD-167Adriaan Moors2016-07-264-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | SD-167 Fine tuning constructor pattern translation Fixes scala/scala-dev#167
| * | | | SD-167 Fine tuning constructor pattern translationJason Zaugg2016-07-254-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid calling NoSymbol.owner when checking whether we're dealing with a case class constructor pattern or a general extractor. Tested manually with the test case in the ticket, no more output is produced under `-Xdev`. - Be more conservative about the conversion to a case class pattern: rather than looking just at the type of the pattern tree, also look at the tree itself to ensure its safe to elide. This change is analagous to SI-4859, which restricted rewrites of case apply calls to case constructors. I've manually tested that case class patterns are still efficiently translated: ``` object Test { def main(args: Array[String]) { Some(1) match { case Some(x) => } } } ``` ``` % qscalac -Xprint:patmat sandbox/test.scala [[syntax trees at end of patmat]] // test.scala package <empty> { object Test extends scala.AnyRef { def <init>(): Test.type = { Test.super.<init>(); () }; def main(args: Array[String]): Unit = { case <synthetic> val x1: Some[Int] = scala.Some.apply[Int](1); case4(){ if (x1.ne(null)) matchEnd3(()) else case5() }; case5(){ matchEnd3(throw new MatchError(x1)) }; matchEnd3(x: Unit){ x } } } } ```
* | | | | Merge pull request #5279 from retronym/ticket/SD-183Adriaan Moors2016-07-263-14/+30
|\ \ \ \ \ | | | | | | | | | | | | SD-183 Make refinement classes ineligible as SAMs
| * | | | | SD-183 Make refinement classes ineligible as SAMsJason Zaugg2016-07-143-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only non-refinement class types need apply, which is the same restriction that we levy on parent types of a class. ``` scala> class C; class D extends C; type CD = C with D; class E extends CD <console>:11: error: class type required but C with D found class C; class D extends C; type CD = C with D; class E extends CD ^ scala> class C; class D extends C; type DC = D with C; class E extends DC <console>:11: error: class type required but D with C found class C; class D extends C; type DC = D with C; class E extends DC ^ ``` Prior to this change: ``` scala> trait T { def t(a: Any): Any }; trait U; abstract class C extends T defined trait T defined trait U defined class C ```` For indy-based lambdas: ``` scala> val tu: T with U = x => x tu: T with U = $$Lambda$1812/317644782@3c3c4a71 scala> tu: U java.lang.ClassCastException: $$Lambda$1812/317644782 cannot be cast to U ... 30 elided ``` For anon class based lambdas: ``` scala> ((x => x): C with U) <console>:14: error: class type required but C with U found ((x => x): C with U) ^ scala> implicit def anyToCWithU(a: Any): C with U = new C with U { def t(a: Any) = a } warning: there was one feature warning; re-run with -feature for details anyToCWithU: (a: Any)C with U scala> (((x: Any) => x): C with U) // SAM chosen but fails to typecheck the expansion uncurry <console>:17: error: class type required but C with U found (((x: Any) => x): C with U) // SAM chosen but fails to typecheck the expansion uncurry ^ ``` Fixes https://github.com/scala/scala-dev/issues/183 While it is tempting to special case refinement classes with no decls by flattening their parents into the parents of the lambda. But there are some subtle issues at play with lineriazation order, as Martin pointed out when I brought this up before: http://www.scala-lang.org/old/node/6817.html
* | | | | | Merge pull request #5267 from lrytz/deprecateRemoteAdriaan Moors2016-07-264-19/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate @remote
| * | | | | | Minor cleanups in GenBCodeLukas Rytz2016-07-201-19/+16
| | | | | | |
| * | | | | | Deprecate scala.remoteLukas Rytz2016-07-203-0/+5
| | | | | | |
* | | | | | | Merge pull request #5300 from milessabin/topic/si-4914Adriaan Moors2016-07-262-0/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-4914 Addition of tests resolves as fixed
| * | | | | | | Added tests for SI-482/SI-4914Miles Sabin2016-07-222-0/+27
| | | | | | | |
* | | | | | | | Merge pull request #5299 from mpociecha/improve-intellij-integrationAdriaan Moors2016-07-263-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve sbt-based IntelliJ integration in case of Windows
| * | | | | | | | Improve sbt-based IntelliJ integration in case of WindowsMichał Pociecha2016-07-223-4/+8
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use File.pathSeparator when processing classpath instead of just : to don't end up with classpath like "C:\sth\a.jar:C:\sth\b.jar" what was causing problems after split(":"). Display questions first and then wait for user input. I tested on 3 computes and without flush the printed questions were always displayed just after user replied - never before.
* | | | | | | | Merge pull request #5297 from retronym/review/5268Jason Zaugg2016-07-264-5/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Disable stub warning by default.
| * | | | | | | | Disable stub warning by default.Oscar Boykin2016-07-224-5/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we create a class symbols from a classpath elements, references to other classes that are absent from the classpath are represented as references to "stub symbols". This is not a fatal error; for instance if these references are from the signature of a method that isn't called from the program being compiled, we don't need to know anything about them. A subsequent attempt to look at the type of a stub symbols will trigger a compile error. Currently, the creation of a stub symbol incurs a warning. This commit removes that warning on the basis that it isn't something users need to worry about. javac doesn't emit a comparable warning. The warning is still issued under any of `-verbose` / `-Xdev` / `-Ydebug`.
* | | | | | | | Merge pull request #4851 from soc/SI-9560-scaladoc-json-depStefan Zeiger2016-07-2516-93/+116
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | SI-9560 Remove dependency on parser-combinators/json
| * | | | | | | SI-9560 Remove dependency on parser-combinators/jsonSimon Ochsenreither2016-07-2216-93/+116
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update a few example IDE files for Eclipse and IntelliJ. This drops the dependency by integrating the bare minimum functionality to keep things working.
* | | | | | | Merge pull request #5295 from varming/cvarming/nepotismStefan Zeiger2016-07-223-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-8774 Null link fields in mutable LinkedHashMap (and friends) on remove
| * | | | | | | SI-8774 Null link fields in mutable hash maps on removal.Carsten Varming2016-07-213-1/+8
| |/ / / / / /
* | | | | | | Merge pull request #5281 from dwijnand/either-valueLukas Rytz2016-07-221-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Deprecate and rename Left#a/Right#b to Left#value/Right#value
| * | | | | | | Deprecate and rename Left#a/Right#b to Left#value/Right#valueDale Wijnand2016-07-141-2/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5296 from retronym/ticket/SD-186Lukas Rytz2016-07-222-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SD-186 Fix positions in trait method bytecode
| * | | | | | | SD-186 Fix positions in trait method bytecodeJason Zaugg2016-07-222-1/+20
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concrete, non private methods in traits are translated into a static method with an explicit `$this` parameter. After this translation, the references to `$this` (subistuted for `this` in user written code) where being positioned at the position of the method, which makes debugging unpleasant. This commit leaves the `Ident($this)` trees unpositioned. This is analagous to what we do in the body of extension methods, which is the other user of `ThisSubstitutor`. It would be more correct to copy the position of each `This` tree over to the substituted tree. That would let us set a breakpoint on a line that _only_ contained `this`. But in 99% of cases users won't be able to spot the difference, so I've opted for the tried and tested approach here.
* | | | | | | Merge pull request #5278 from retronym/ticket/SD-120Lukas Rytz2016-07-225-31/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SD-120 Non FunctionN lambdas should not be universally serializable
| * | | | | | | SD-120 Non FunctionN lambdas should not be universally serializableJason Zaugg2016-07-225-31/+80
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, we follow the example set by javac, and predicate serializability of bot anon-class and invokedynamic-based lambdas on whether or not the SAM type extends java.io.Serializable. Fixes https://github.com/scala/scala-dev/issues/120
* | | | | | | Merge pull request #5298 from retronym/ticket/SD-121Lukas Rytz2016-07-22135-1683/+93
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | SD-121 Remove now-unneeded J{Function,Proc}N functional interfaces
| * | | | | | SD-121 Remove now-unneeded J{Function,Proc}N functional interfacesJason Zaugg2016-07-22135-1683/+93
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non specialized functions can directly use `scala.FunctionN` as the functional interface, now that mixin generates default methods in the new trait encoding. Unfortunately we can't do this for specialized functions as things stand: specialization leaves the wrong method abstract. In principle, we could/should amend the specialization transform to fix this. But my earlier attempts at this weren't sucessful, so for now we have to stick with the fallback plan of keeping some hand rolled functional interfaces around. This commit reduces the surface area of `scala.runtime.java8` to the minimal requiremnt: one functional interface for each specialized variant of `Function{0,1,2}`.
* | | | | | Merge pull request #5293 from lrytz/asm-51Adriaan Moors2016-07-209-32/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | upgrade asm to 5.1
| * | | | | | Upgrade asm to 5.1Lukas Rytz2016-07-209-32/+47
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The constructor of scala.tools.asm.Handle now takes an additional boolean parameter to denote whether the owner is an interface.
* | | | | | Merge pull request #5257 from szeiger/wip/final-tuplesLukas Rytz2016-07-2032-66/+37
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-7301 Make tuple classes final
| * | | | | SI-7301 Make tuple classes finalStefan Zeiger2016-07-0732-66/+37
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | This includes undoing the special case for `-Xfuture` introduced in https://github.com/scala/scala/pull/2299 and updating tests to take the new errors into account.
* | | | | Merge pull request #5261 from som-snytt/issue/9827Stefan Zeiger2016-07-192-51/+161
|\ \ \ \ \ | | | | | | | | | | | | SI-9827 MatchIterator advances itself
| * | | | | SI-9827 MatchIterator advances itselfSom Snytt2016-07-182-51/+161
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid caveats about calling `next` (or `hasNext`) before using `MatchData` methods on `MatchIterator`, just do it internally as necessary. Note `MatchIterator` behavior in the docs. Added tests showing what people cried about.
* | | | | Merge pull request #5265 from szeiger/issue/6947Adriaan Moors2016-07-189-248/+247
|\ \ \ \ \ | | | | | | | | | | | | SI-6947 Better type parameter names for Map classes
| * | | | | SI-6947 Better type parameter names for Map classesStefan Zeiger2016-07-079-248/+247
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type parameter names are currently assigned pretty much alphabetically without any meaning. This change renames all key parameters in Map classes from `A` to `K` and all value parameters from `B` to `V` to make them more meaningful. Derived names are renamed accordingly (e.g. `V1` instead of `B1` for an upper bound on `V`, `W` instead of `C` for a new value type). As a side-effect this solves the documentation problem in SI-6947. Due to using `B` both as a type parameter for `foldLeft[B]` in `GenTraversableOnce[A]` and in `Map[A, B]` which extends `GenTraversableOnce[(A, B)]`, the signature of `Map.foldLeft` was rendered in scaladoc as def foldLeft[B](z: B)(op: (B, (A, B)) ⇒ B): B Now you get an unambiguous version: def foldLeft[B](z: B)(op: (B, (K, V)) ⇒ B): B
* | | | | Merge pull request #5246 from jodersky/javadocAdriaan Moors2016-07-1812-74/+171
|\ \ \ \ \ | | | | | | | | | | | | SI-4826 Retain javadoc comments in scaladoc [ci: last-only]
| * | | | | Retain javadoc comments in scaladocJakob Odersky2016-07-1512-74/+171
| | |/ / / | |/| | | | | | | | | | | | | | | | | | * Hook into java parser to generate doc comments * Generate empty trees for java implementation bodies
* | | | | Merge pull request #5285 from szeiger/wip/sbt-bootstrapAdriaan Moors2016-07-188-70/+164
|\ \ \ \ \ | | | | | | | | | | | | Switch the bootstrap build over to sbt
| * | | | | Switch the bootstrap build over to sbtStefan Zeiger2016-07-158-70/+164
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the individual ant builds that occured during `bootstrap` are replaced by equivalent sbt builds. - Allow extra dashes in version suffix when using SPLIT - Clean up ScriptCommands - Building an extra `locker` for stability testing with ant was not necessary but sbt also drops `strap`, so we need to build again with `quick` to get the equivalent of `strap`. The script for checking stability is invoked directly from the bootstrap script, not from sbt. - `STARR` and `locker` build output is still logged to `logs/builds`, the main build runs log directly to the main console with colored output. - Allow `—show-log` option on partest command line in sbt - Normalize inferred LUB in `run/t7747-repl.scala` - Add `normalize` feature from `ReplTest` to `InteractiveTest` - Normalize inferred LUBs in `presentation/callcc-interpreter`
* | | | | Merge pull request #5273 from retronym/ticket/9855Adriaan Moors2016-07-184-17/+32
|\ \ \ \ \ | | | | | | | | | | | | SI-9855 Fix regression in extractor pattern translation
| * | | | | SI-9855 Fix regression in extractor pattern translationJason Zaugg2016-07-144-17/+32
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In faa5ae6, I changed the pattern matchers code generator to use stable references (`Ident`-s with the singleton type, rather than the widened type) to the synthetic vals used to store intermediate results ("binders"). In the case where the scrutinee matched the unapply parameter type of some extractor pattern, but the pattern subsequently failed, this led to an regression. It turns out that this was due to the way that the type of the binder was mutated to upcast to the exact type of a subsequent pattern in `ensureConformsTo`: https://github.com/scala/scala/blob/953559988/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala#L165-L174 This was added in 32c57329a as a workaround for the problem caused in t6664.scala, when the binder type was `KList with KCons`, and the code generator wasn't able to find the case field accessors for `KCons` in the decls. The change to use stable references meant that this mutation was now observed in another part of the tree, as opposed to the 2.11.8 situation, where we had used the original, sharper type of the binder eagerly to assign to the `Ident` that referred to it. This led to a tree: Assign(Ident(x3), Ident(x1).setType(x1.tpe) Now that we instead refer generate: Assign(Ident(x3), Ident(x1).setType(stableTypeFor(x1)) and we don't typecheck this until after the mutation of `x1.symbol.info`, we can get a type error. This commit removes this mutation of the binder type altogether, and instead uses `aligner.wholeType`, which is based on the result type of the `Apply(TypeTree(MethodType(params, resultType))` that encodes a typechecked constructor pattern. In `t6624.scala`, this is `KCons`, the case class that has the extractors as its decls.
* | | | | Merge pull request #5275 from dwijnand/somexStefan Zeiger2016-07-183-8/+10
|\ \ \ \ \ | | | | | | | | | | | | Deprecated and rename Some#x to Some#value