summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4631 from janekdb/2.11.x-typos-t-vSeth Tisue2015-07-2019-23/+23
|\ | | | | Fix 23 typos (t-v)
| * Fix 23 typos (t-v)Janek Bogucki2015-07-1519-23/+23
| |
* | Merge pull request #4642 from janekdb/2.11.x-typos-w-zSeth Tisue2015-07-204-6/+6
|\ \ | | | | | | Fix 6 typos (w-z)
| * | Fix 6 typos (w-z)Janek Bogucki2015-07-174-6/+6
| | |
* | | Merge pull request #4643 from janekdb/2.11.x-names-w-zSeth Tisue2015-07-201-2/+2
|\ \ \ | | | | | | | | Fix typo in val name
| * | | Fix typo in val nameJanek Bogucki2015-07-171-2/+2
| |/ /
* | | Merge pull request #4632 from janekdb/2.11.x-names-t-vSeth Tisue2015-07-203-4/+4
|\ \ \ | | | | | | | | Improve some names (t-v)
| * | | Improve some names (t-v)Janek Bogucki2015-07-153-4/+4
| | |/ | |/|
* | | Merge pull request #4646 from SethTisue/issue/9409Seth Tisue2015-07-181-1/+0
|\ \ \ | | | | | | | | SI-9409 Scaladoc: remove link to nonexistent diagram doc
| * | | SI-9409 Scaladoc: remove link to nonexistent diagram docSeth Tisue2015-07-181-1/+0
| | |/ | |/|
* | | Merge pull request #4645 from SethTisue/issue/9406Seth Tisue2015-07-181-1/+1
|\ \ \ | |/ / |/| | SI-9406 fix doc for Range.takeRight
| * | SI-9406 fix doc for Range.takeRightSeth Tisue2015-07-181-1/+1
|/ /
* | Merge pull request #4595 from som-snytt/issue/9370Lukas Rytz2015-07-165-2/+45
|\ \ | | | | | | SI-9370 Xplugin scans plugin path for descriptor
| * | SI-9370 Xplugin scans plugin path for descriptorSom Snytt2015-06-305-2/+45
| | | | | | | | | | | | | | | Keep on scanning if the first entry doesn't yield a plugin.xml descriptor.
* | | Merge pull request #4615 from parambirs/patch-1Lukas Rytz2015-07-161-1/+1
|\ \ \ | | | | | | | | Update scaladoc for Any.scala#equals()
| * | | Update scaladoc for Any.scala#equals()Parambir Singh2015-07-091-1/+1
| | |/ | |/| | | | The transitive requirement for `Any` shouldn't mention `AnyRef`
* | | Merge pull request #4637 from retronym/ticket/9401Lukas Rytz2015-07-163-1/+9
|\ \ \ | | | | | | | | SI-9401 Avoid SOE with array + missing classtag
| * | | SI-9401 Avoid SOE with array + missing classtagJason Zaugg2015-07-163-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit classtags required by the Array constructor are not expressed in the type signature of its constructor, and instead are summoned by a special case in the typechecker. This special case entails replacing the `new Array` tree with `implicitly[T].newArray(size)`, handled in `ArrayInstantiation`. This tree is recursively typechecked. However, if the implicit materialization/search fails, an error is issued to the current reporter and the original tree is marked with an error type. As above, this is recursively typechecked. In the normal course of affairs, the recursive typecheck of the erroneous tree would be a noop (the tree already has a type!). However, if we are both in silent mode (in which errors are buffered) and in retyping mode (in which the typer clears the type and symbols of trees), we were getting into an cycle. In the enclosed test, retyping mode was trying to recover from: Resetting.this.gencastarray_=(new Array[T](0).<ERROR>) By inserting a suitable a view: implicitly[Resetting => { def gencastarray_=(AT)}]( Resetting.this ).gencastarray_=(new Array[T](0)) Where AT is the type found by retypechecking the argument. It is during the argument retypechecking that we fell into cycle. Crazily enough, in 2.11.0, the ensuing `StackOverflowError` was being caught and treated as a failure. We would then back out of the retyping mode, and issue the error from the the very first attempt at the implicit search. This fragile state of affairs was disrupted by a refactoring to the error reporting system in 725c5c9, after which the SOE crashed the compiler. This commit avoids recursively typechecking error typed trees.
* | | | Merge pull request #4628 from SethTisue/issue/8744Lukas Rytz2015-07-161-1/+1
|\ \ \ \ | |/ / / |/| | | SI-8744 fix version.number in scaladoc.properties
| * | | SI-8744 fix version.number in scaladoc.propertiesSeth Tisue2015-07-131-1/+1
| |/ / | | | | | | | | | the fix is as suggested by Adriaan in the ticket
* | | Merge pull request #4633 from SethTisue/upgrade-redcarpetAdriaan Moors2015-07-153-4/+2
|\ \ \ | | | | | | | | use newer Redcarpet to build spec
| * | | use newer Redcarpet to build specSeth Tisue2015-07-153-4/+2
| |/ / | | | | | | | | | | | | now that https://github.com/vmg/redcarpet/issues/494 is fixed we don't need to stay pinned to an outdated version anymore
* | | Merge pull request #4634 from SethTisue/travis-container-infrastructureAdriaan Moors2015-07-151-1/+4
|\ \ \ | |/ / |/| | opt-in to Travis's newer/faster container-based infrastructure
| * | opt-in to Travis's newer/faster container-based infrastructureSeth Tisue2015-07-151-1/+4
|/ / | | | | | | this is the way Travis is headed, so let's get on board
* | Merge pull request #4604 from vergenzt/update-eclipse-filesAdriaan Moors2015-07-063-3/+3
|\ \ | | | | | | Update Eclipse classpath entries
| * | Update Eclipse classpath entriesTim Vergenz2015-07-043-3/+3
| | |
* | | Merge pull request #4605 from janekdb/2.11.x-typos-sDick Wall2015-07-0618-24/+24
|\ \ \ | |/ / |/| | Fix 25 typos (s) - LGTM - thanks, smiles
| * | Fix 25 typos (s)Janek Bogucki2015-07-0618-24/+24
|/ /
* | Merge pull request #4600 from adriaanm/fixup-4564-checkinitAdriaan Moors2015-07-021-1/+7
|\ \ | | | | | | Correct init order between Pasted and ILoop#pasted
| * | Correct init order between Pasted and ILoop#pastedAdriaan Moors2015-07-021-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | `testBoth` cannot be a val in `Pasted`, as `Pasted` is inherited by `object paste` in ILoop, which would cause `val testBoth` to be initialized before `val PromptString` was: ``` object paste extends Pasted { val PromptString = prompt.lines.toList.last ``` See https://scala-webapps.epfl.ch/jenkins/job/scala-nightly-checkinit-2.11.x/417. Introduced by #4564.
* | Merge pull request #4596 from janekdb/2.11.x-typos-p-rSeth Tisue2015-07-0121-26/+26
|\ \ | | | | | | Fix 27 typos (p-r)
| * | Fix 27 typos (p-r)Janek Bogucki2015-06-3021-26/+26
| | |
* | | Merge pull request #4576 from som-snytt/issue/9206-moreSeth Tisue2015-07-0193-265/+174
|\ \ \ | |/ / |/| | SI-9206 REPL custom bits
| * | SI-9206 De-perk the welcome messageSom Snytt2015-06-256-40/+68
| | | | | | | | | | | | | | | The welcome message defaults to a sober header followed by one line of instructions.
| * | SI-9206 Update REPL welcome messageSom Snytt2015-06-2486-219/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everyone knows that a `help` command will result in `more information`. This commit moves the version string to the second line and adds some verve to the welcome. If anyone can't live without the old banner, they are now able to configure it explicitly, so there is still no blood on our hands. ``` $ scala Welcome to Scala version 2.11.6 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_40). Type in expressions to have them evaluated. Type :help for more information. scala> :quit $ skala Welcome to Scala! version 2.11.7-20150623-155244-eab44dd092 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_40). Type in expressions for evaluation. Or try :help. scala> :quit ``` REPL tests now lop off the actual length of the welcome header; or, if necessary, remove the version number from a header embedded in output.
| * | SI-9206 REPL custom continuation promptSom Snytt2015-06-232-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because who doesn't want to customize their continuation prompt? `scala -Dscala.repl.continue="..."` looks especially nice with `-Dscala.color`. Somewhat works when pasting, but the test rig for running a transcript does not seek to support custom secondary prompts.
| * | SI-9206: REPL custom history fileIgor Racic2015-06-231-6/+6
| | | | | | | | | | | | Specify it with -Dscala.shell.histfile=/path/to/file.
| * | SI-9206: REPL custom welcome messageSom Snytt2015-06-237-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | Can be specified by `-Dscala.repl.welcome=Greeting` or in properties file. It takes the same format arguments as the prompt, viz, version, Java version and JVM name. It can be disabled by `-Dscala.repl.welcome` with no text.
| * | SI-9206: No REPL message on :silent, unless -Dscala.repl.infoIgor Racic2015-06-232-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Anyone who doesn't understand why result printing was turned off after they entered `:silent` mode will start the REPL with `-Dscala.repl.debug` and be enlightened. For infotainment purposes, the verbose message is also emitted under info mode.
* | | Merge pull request #4569 from retronym/ticket/6985Adriaan Moors2015-06-309-2/+102
|\ \ \ | | | | | | | | SI-6895 Test cases to explain the limitations in tcpoly inference
| * | | SI-8892 Fix incorrect qualification in error messageJason Zaugg2015-06-233-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since beadafa2, we've ended up with nutty error messages for type errors involving aliases that target types in `java.lang` and `scala` packages. I think the intent of that change was to force the error messages to qualify types like `String` when needed, but to leave them unqualified by default. However, this led to this flat out wrong message in the enclosed test. found : B required: C.this.java.lang.B (which expands to) String I've changed the heuristic slightly limit this code to aliases that are eponymous with their targets. Still feels pretty kludgy, but we can at least book a little progress.
| * | | SI-8777 Avoid redundant disambiguation in error messagesJason Zaugg2015-06-234-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When printing types in error messages, we attempt to disambiguate symbol names by qualifying them in various ways. Type paramters symbols are qualified by adding `(in someMethod)`. However, the type errors generated by higher kinded subtyping can contain clones of type parameter symbols, as creater in `isPolySubType`. The disambiguation tries fruitlessly to distinguish them but ended up adding the same suffix to both names repeatedly. ``` found : [F[_]]Foo[[X(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)]Bar[F,X(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)]] required: Foo[[X(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)]Bar[[X]Or[String,X],X(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)(in type L)]] ``` This commit limits the post qualification of type parameter symbols to a single attempt to limit the damage. An alternative might be to mark a clone (we could determine its status by checking whether it is a type parameter of its owner.) But I'm not sure how to present this information in a comphrenensible way, so for now I'm limiting my ambitions to stopping the stutter.
| * | | SI-6895 Test cases to explain the limitations in tcpoly inferenceJason Zaugg2015-06-234-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've determined that the failure in this bug report boils down to SI-2712. Submitting my working as neg tests for posterity. The type error disabmiguator develops a serious stutter with this example. I'll fix that in the following commit.
* | | | Merge pull request #4591 from vsalvis/vsalvis-stringdocSeth Tisue2015-06-302-4/+8
|\ \ \ \ | |_|_|/ |/| | | SI-8140 Documentation references java.lang.String directly
| * | | SI-8140 Documentation references java.lang.String directlyvsalvis2015-06-292-4/+8
| | | |
* | | | Merge pull request #4588 from retronym/topic/icodishAdriaan Moors2015-06-292-0/+47
|\ \ \ \ | | | | | | | | | | GenBCode: fix incrementatal compilation by mimicing GenASM
| * | | | GenBCode: fix incrementatal compilation by mimicing GenASMJason Zaugg2015-06-282-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The incremental compiler in SBT uses an implementation detail of the compiler backend to enumerate the classes that are actually written to disk. This commit mimics this in GenBCode by populating `Run#icode` with an `IClass` for each `ClassDef` processed. We should revisit this by creating a dedicated API for this purpose and migrating SBT to use that. We should also revisit this code as we implement closure elimination in the GenBCode; this commit assumes that all `ClassDef`s that enter the backend will generate classfile products. The enclosed test is extracted from the incrementatl compiler. I've also manually integration tested this with SBT: https://gist.github.com/retronym/fabf6f92787ea9c1ce67
* | | | | Merge pull request #4586 from som-snytt/issue/missing-argsSeth Tisue2015-06-294-21/+55
|\ \ \ \ \ | | | | | | | | | | | | Improved message for missing argument list
| * | | | | Improved message for missing argument listSom Snytt2015-06-274-21/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifies the language and rules for eta-expansion. A missing argument in a list, as opposed to a missing argument list, results in a different message. The comical expansion in parens does not attempt to show what was already applied, but succeeds in showing at a glance the shape of the method in question. ``` scala> def m(i: Int, j: Int)(x: Int) = ??? m: (i: Int, j: Int)(x: Int)Nothing scala> m <console>:12: error: missing argument list for method m Unapplied methods are only converted to functions when a function type is expected. You can make this conversion explicit by writing `m _` or `m(_,_)(_)` instead of `m`. m ^ ``` The original submission was due to sschaef and the wording due to adriaanm, with a minor tweak.
* | | | | | Merge pull request #4589 from janekdb/2.11.x-method-names-m-oJason Zaugg2015-06-294-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve method names (m-o)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-01 17:24:56 +0000