summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Restarr on 2.11.8-18269eaAdriaan Moors2017-01-051-1/+1
|
* Merge pull request #5612 from adriaanm/patmat_cleanupAdriaan Moors2017-01-0414-32/+139
|\ | | | | Cleanup in aisle patmat
| * SI-9630 Fix spurious warning related to same-named case accessors [backport]Jason Zaugg2016-12-2111-7/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hash consing of trees within pattern match analysis was broken, and considered `x1.foo#1` to be the same tree as `x1.foo#2`, even though the two `foo`-s referred to different symbols. The hash consing was based on `Tree#correspondsStructure`, but the predicate in that function cannot veto correspondance, it can only supplement the default structural comparison. I've instead created a custom tree comparison method for use in the pattern matcher that handles the tree shapes that we use. (cherry picked from commit 79a52e6807d2797dee12bab1730765441a0e222d)
| * More robust outer test for patmatAdriaan Moors2016-12-211-10/+8
| | | | | | | | While investigating https://github.com/scala/scala-dev/issues/251
| * Small cleanups to pattern matcherAdriaan Moors2016-12-212-15/+19
| | | | | | | | While investigating https://github.com/scala/scala-dev/issues/251
* | Merge pull request #5624 from Jasper-M/patch-1Lukas Rytz2017-01-031-1/+1
|\ \ | |/ |/| Fix documentation of immutable.Queue
| * Fix documentation of immutable.QueueJasper-M2017-01-031-1/+1
|/ | | `enqueue` appends elements to the `Queue`, it doesn't prepend them.
* Merge pull request #5605 from szeiger/wip/fix-07-linksAdriaan Moors2016-12-192-4/+4
|\ | | | | Fix spec links to `07-implicits.html`
| * Fix spec links to `07-implicits.html`Stefan Zeiger2016-12-182-4/+4
| | | | | | | | | | The file referenced by the current links actually exists under http://www.scala-lang.org/files/archive/spec/2.11/ but with a different design than the rest. It seems to be left over from an older version.
* | Merge pull request #5604 from sjrd/scalajs-friendly-assertthrowsLukas Rytz2016-12-171-5/+4
|\ \ | | | | | | Use ClassTag instead of Manifest in AssertUtil.assertThrows.
| * | Use ClassTag instead of Manifest in AssertUtil.assertThrows.Sébastien Doeraene2016-12-171-5/+4
|/ / | | | | | | | | This allows it to work in Scala.js, which supports `ClassTag`s but not `Manifest`s.
* | Merge pull request #5487 from lrytz/java-constantsAdriaan Moors2016-12-1522-2/+341
|\ \ | | | | | | SI-3236 constant types for literal final static java fields
| * | neg test for parsing constants in Java sourcesLukas Rytz2016-11-027-0/+104
| | |
| * | Support implicit converstions from java literalsLukas Rytz2016-11-021-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | For example, public static final byte b = 127 is allowed, but 128 is not. Also factor out a method that parses a literal. It could be used to parse annotations (and their literal arguments) in Java sources.
| * | SI-3236 constant types for literal final static java fieldsJohannes Rudolph2016-10-2815-2/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't parse Java expressions, fields of Java classes coming from source files never have constant types. This prevents using static java fields in annotation arguments in mixed compilation This PR assigns constant types to final static java fields if the initializer is a simple literal.
* | | Merge pull request #5454 from som-snytt/issue/9834-2.11Adriaan Moors2016-12-157-16/+78
|\ \ \ | | | | | | | | SI-9834 Improve error on failed op=
| * | | SI-9834 Show expansion of update on errorSom Snytt2016-11-252-3/+5
| | | |
| * | | SI-9834 Improve error on failed op=Som Snytt2016-11-257-16/+76
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If rewriting `x += y` fails to typecheck, emit error messages for both the original tree and the assignment. If rewrite is not attempted because `x` is a val, then say so. The error message at `tree.pos` is updated with the additional advice. SI-8763 Crash in update conversion When there are already errors, don't attempt mechanical rewrites.
* | | Merge pull request #5590 from 2m/mima-0.1.13-scala-2.11Seth Tisue2016-12-123-26/+2
|\ \ \ | | | | | | | | Upgrade MiMa to 0.1.13
| * | | Upgrade MiMa to 0.1.13Martynas Mickevičius2016-12-083-26/+2
| | | |
* | | | Merge pull request #5574 from ptrcarta/patch-1Lukas Rytz2016-12-121-1/+1
|\ \ \ \ | | | | | | | | | | fix eBNF error by removing wrong closing brace
| * | | | fix eBNF error by removing wrong closing braceptrcarta2016-12-021-1/+1
| |/ / /
* / / / SI-10086 NumericRange.min|max with custom Integral (#5575)Tobias Schlatter2016-12-122-2/+46
|/ / / | | | | | | SI-10086 NumericRange.min|max with custom Integral
* | | Merge pull request #5571 from SethTisue/mima-upgradeSeth Tisue2016-12-014-2/+263
|\ \ \ | | | | | | | | upgrade MiMa to 0.1.12
| * | | upgrade MiMa to 0.1.12Seth Tisue2016-12-014-2/+263
|/ / / | | | | | | | | | | | | dogfooding the latest. upgrading all the way from 0.1.8 -- there have been a bunch of improvements since then.
* | | Update to mathjax 2.6-latest [2.12.x backport]Adriaan Moors2016-11-291-1/+1
| | | | | | | | | | | | This fixes the vertical bar problem on Chrome (https://github.com/mathjax/MathJax/issues/1300);
* | | Merge pull request #5553 from retronym/ticket/SD-271Jason Zaugg2016-11-292-1/+10
|\ \ \ | | | | | | | | Improve performance of REPL autocompletion
| * | | Improve performance of REPL autocompletionJason Zaugg2016-11-222-1/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code used to fuzzily match, e.g, `declasses` with `getDeclaredClasses` was exploring fruitless parts of the search space. The enclosed test case was hanging the REPL. This commit improves this by performing a prefix match of the unconsumed input against the current chunk of the candidate before exploring the `inits`. Fixes scala/scala-dev#271
* | | Merge pull request #5559 from szeiger/wip/mathjax-httpsAdriaan Moors2016-11-281-2/+2
|\ \ \ | |/ / |/| | Use https links to JS and CSS in the spec when serving from https
| * | Use https links to JS and CSS in the spec when serving from httpsStefan Zeiger2016-11-281-2/+2
|/ / | | | | | | | | | | | | | | | | | | The spec is published on a server that supports https (https://www.scala-lang.org/files/archive/spec/2.11/) and this comes up as the default in search results (as it should) but the link to MathJAX is hardcoded to http, which prevents any web browser that cares about security from loading it. This commit changes the links to MathJAX and to the Highlight.js stylesheet to be scheme-relative (like the link to JQuery already was).
* | Merge pull request #5518 from som-snytt/issue/10037-2.11Jason Zaugg2016-11-116-5/+23
|\ \ | | | | | | SI-10037 ASR/LSR switched in ICodeReader
| * | [nomerge] SI-10037 ASR/LSR switched in ICodeReaderSom Snytt2016-11-106-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed when inlining from a class file. The test doesn't work because inlining fails with bytecode unavailable due to: ``` scala.reflect.internal.MissingRequirementError: object X in compiler mirror not found. ```
* | | Merge pull request #5491 from SethTisue/akka-bumpSeth Tisue2016-11-101-1/+1
|\ \ \ | |/ / |/| | move to latest Akka 2.3.x release
| * | move to latest Akka 2.3.x releaseSeth Tisue2016-10-311-1/+1
| | | | | | | | | | | | | | | Akka 2.3.16 was released in October 2016: http://akka.io/news/2016/10/30/akka-2.3.16-released.html
* | | Merge pull request #5511 from SethTisue/stop-no-dont-delete-everything-arghSeth Tisue2016-11-081-1/+1
|\ \ \ | | | | | | | | don't mass-delete old nightlies at release time
| * | | don't mass-delete old nightlies at release timeSeth Tisue2016-11-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | as happened with 2.12.0, for gory details see https://github.com/scala/scala-dev/issues/257 fix suggested by Stefan Zeiger
* | | Merge pull request #5504 from retronym/topic/sbt-macro-warnSeth Tisue2016-11-071-0/+4
|\ \ \ | | | | | | | | Silence SBT logging about macros and incremental compilation.
| * | | Silence SBT logging about macros and incremental compilation.Jason Zaugg2016-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since upgrading to SBT 0.13.12, clean builds have incurred warnings like: Because JavaMirrors.scala contains a macro definition, the following dependencies are invalidated unconditionally: .... This commit disables this behaviour of the SBT incremental compiler in the library and reflect projects, as these aren't regular macros (the macro implementations are hard coded in the compiler in `FastTrack`) so the new behaviour isn't actually improving correctness of inc. compilation.
* | | | Merge pull request #5478 from dragos/backport/remove-println-SI-8717Adriaan Moors2016-10-283-6/+4
|\ \ \ \ | |_|_|/ |/| | | [backport] Replace println with log calls in BrowsingLoaders
| * | | [backport] Replace println with log calls in BrowsingLoadersIulian Dragos2016-10-253-6/+4
| | |/ | |/| | | | | | | | | | | | | | | | This alternative symbol loader is used in the presentation compiler and may generate output even when the compiler should be silent. See SI-8717 for more context, even though this does not really fix the ticket.
* | | Merge pull request #5378 from som-snytt/issue/9913Seth Tisue2016-10-262-13/+16
|\ \ \ | |/ / |/| | SI-9913 Lead span iterator finishes at state -1
| * | SI-9913 Tighten bolts on span iteratorSom Snytt2016-09-061-13/+10
| | | | | | | | | | | | | | | Extra privacy, and the tricky state transition is made more tabular.
| * | SI-9913 Lead span iterator finishes at state -1Som Snytt2016-09-052-1/+7
| | | | | | | | | | | | | | | Even if no elements fail the predicate (so that the trailing iterator is empty).
* | | Merge pull request #5464 from retronym/backport/5386Seth Tisue2016-10-193-2/+7
|\ \ \ | | | | | | | | [backport] Bump sbt.version to 0.13.12, without breaking
| * | | [backport] Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-10-193-2/+7
| | | |
* | | | Merge pull request #5467 from som-snytt/issue/9832-2.11-cleanupSeth Tisue2016-10-191-18/+22
|\ \ \ \ | | | | | | | | | | SI-9832 Fix line endings in junit test
| * | | | SI-9832 Fix line endings in junit testSom Snytt2016-10-191-18/+22
| | | | |
* | | | | Merge pull request #5343 from milessabin/topic/si-2712-backportAdriaan Moors2016-10-1835-6/+509
|\ \ \ \ \ | | | | | | | | | | | | SI-2712 Add support for higher order unification
| * | | | | SI-2712 Add support for higher order unificationMiles Sabin2016-08-1535-6/+509
| | |_|/ / | |/| | |
* | | | | Merge pull request #5453 from som-snytt/issue/9832-2.11Adriaan Moors2016-10-182-5/+76
|\ \ \ \ \ | | |/ / / | |/| | | SI-9832 -Xlint:help shows default