summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [backport] Rewrite explanation of doc-source-url option more clearly, and ↵Masato Sogame2014-08-111-1/+1
| | | | | | fix encoding to show euro-sign correctly. (cherry picked from commit 13054daa658484df30b71447dbe684f475537252)
* [backport] Update javadoc tag to new scaladoc tags.Masato Sogame2014-08-113-12/+20
| | | | (cherry picked from commit 68b16a0992877b4ebbb7c967804edbb72c05ceb5)
* [backport] Fixes cut sentences in the generated scaladocsDominik Gruntz2014-08-1111-18/+18
| | | | | | | | | | | | | | | | | This commit changes all first sentences of library functions which contain `i.e.` or `e.g.` and adds a `,` to prevent that the scaladoc summary sentence is cut after this abbreviation. This is possible as pull/3824 fixed how Scaladoc parses the first sentence of a method description into a sumary sentence(now the first sentence has to end with a dot followed by whitespace). Only docs in the core library are changed (src/library/**/*.scala) and only if they occur in the first sentence. Review by @heathermiller (cherry picked from commit 72721ff5dd06dea1235ecb71acae0bd61aee4814)
* [backport] Refactored example to Option.collect method.jxcoder2014-08-111-3/+3
| | | | (cherry picked from commit 7cca7635b392cb533d0f8e26b74d7362c0dd3891)
* [backport] Fixed mathematically wrong statement in the documentation of ↵Malte Isberner2014-08-111-5/+12
| | | | | | | | | scala.math.PartialOrdering. - Previous (misleading) documentation suggested that a partial ordering *is* an equivalence relation. This has now been clarified. - Existing documentation on properties of partial orderings (reflexive, transitive, antisymmetric) had several formatting inconsistencies that have now been remove. (cherry picked from commit 528df5becee03175e7462b64d7c22460cc5992f7)
* [backport] Fix scaladoc typoLukas Elmer2014-08-111-1/+1
| | | | (cherry picked from commit 0a1694d8048f01b7f0812cedaa341813e9044e7f)
* [backport] Did not know of the fix for SI-8672. Followed the recommendation ↵Dominik Gruntz2014-08-111-2/+2
| | | | | | given by som-snytt. (cherry picked from commit ec4abf5483e890976ae460252e80a66a95674e61)
* [backport] Fixes first sentence delimitersdgruntz2014-08-111-2/+2
| | | | | | Scaladoc places the first sentence in the method summary table and index. The first sentence is defined as the sequence of chars up to the first period (not as in JavaDoc where the sentence ends with the first period *followed by a blank*). As a consequence, the clause starting with `i.e.` is interpreted as sentende delimiter. This request replaces `i.e.` with `i.e.`. Alghough a valid HTML code, I do not know whether this change is compatible with other tools. And I assume that this is not the only source file affected. (cherry picked from commit c2e4da674d8c40e2d220854a966b0510fb6d459e)
* [backport] [scaladoc] Changed align of example code to Option.contains and ↵Maks Atygaev2014-08-111-16/+16
| | | | | | Option.collect methods. (cherry picked from commit e3311073bbad6f6f0dfdd3ea09628d324b4b3614)
* [backport] SI-8705 Added example to Option.contains method.jxcoder2014-08-111-0/+11
| | | | (cherry picked from commit 1e2a21681a4a55469faa59b07473a3b269e70258)
* [backport] Added example to Option.collect method.jxcoder2014-08-111-0/+11
| | | | (cherry picked from commit 6c698089aeb55e649a65dd7ae1bce2b4514ee865)
* [backport] Change StringContext scaladocEvgeny Vereshchagin2014-08-111-1/+1
| | | | | | | | | See e2a3498 commit message for explanation Explicit private declaration better than implicit Thanks to @som-snytt (cherry picked from commit d071abe8dd9035d8dd246ecb6b207e584b6437fa)
* [backport] som-snytt's update to wordingMax Bileschi2014-08-111-3/+3
| | | | (cherry picked from commit 80a9e908fd7b591a6fe452d908407d537675a999)
* [backport] Revised comment to appeal to lchoran's and som-snytts commentsMax Bileschi2014-08-111-5/+4
| | | | (cherry picked from commit 71bc2e5f4c49463a754a6f23e3abd2d27467fca4)
* [backport] Update PartialFunction documentation to include the fact that the ↵Max Bileschi2014-08-111-1/+1
| | | | | | caller is responsible for checking 'isDefinedAt' (cherry picked from commit 455bcd65c055119f928b3367839f0093cf0e251a)
* [backport] Update PartialFunction documentation to include the fact that the ↵Max Bileschi2014-08-111-1/+7
| | | | | | caller is responsible for checking 'isDefinedAt' (cherry picked from commit f7d2cec3a0c31836747a25e3cc5949d1f3cbdff4)
* [backport] Make comment consistent with codeEvgeny Vereshchagin2014-08-111-1/+1
| | | | (cherry picked from commit fd001811c662f6daecf91319b36c1ad14a87ff72)
* [backport] Update AnyVals.scalaharryhuk2014-08-111-2/+2
| | | | | | Corrected api doc for >> operator to say it bit-shifts right rather than left, and fills the left bits rather than the right bit (cherry picked from commit 17b99e2587251cdb02e9d96fc2f87143be3160b8)
* Merge pull request #3914 from som-snytt/issue/orphan-checkGrzegorz Kossakowski2014-08-071-1/+0
|\ | | | | Orphan check file
| * Orphan check fileSom Snytt2014-08-031-1/+0
| | | | | | | | | | | | Orphaned by the override check reversion that deleted the test source. 2524fdde3edc7b668fdb4bf68e990141d3ec18d6
* | Merge pull request #3921 from gourlaysama/goodbye-jlineGrzegorz Kossakowski2014-08-0754-7654/+0
|\ \ | | | | | | remove jline sources from src/ now that we use a released jline.
| * | remove jline sources from src/ now that we use a released jline.Antoine Gourlay2014-08-0754-7654/+0
| |/ | | | | | | | | | | We don't need those, right? We don't even build that folder anymore (since 1b0fa91), it is just dead code.
* | Merge pull request #3916 from retronym/ticket/8781Grzegorz Kossakowski2014-08-074-1/+23
|\ \ | |/ |/| SI-8781 Avoid double-expansion under -Ymacro-expand:discard
| * SI-8781 Avoid double-expansion under -Ymacro-expand:discardJason Zaugg2014-08-064-1/+23
|/ | | | | | | | | | | | | | | | | | | | | | This mode of macro expansion is used by the presentation compiler to leave the original macro applications ("expandees") in the type checked trees, annotated with the types of the expansions. However, under some circumstances involving implicits, we would re-expand the macro. If the macro wasn't stable, this could lead to a type mismatch. The originally reported problem was with the shapeless `mkSingletonOps` macro. Its expansion had the type of a freshly-named class local to the expansion. Upon the re-expansion, a new class was generated, which lead to errors like: client/Client.scala:4: error: type mismatch; found : fresh$macro$2 required: fresh$macro$1 This commit suppressed re-expansion of the expandee by use of the existing, tree attachment driven mechanism.
* Merge pull request #3895 from lrytz/jline-updateGrzegorz Kossakowski2014-07-251-0/+2
|\ | | | | Also update jline.version when update.versions is set during build
| * Also update jline.version when update.versions is set during buildLukas Rytz2014-07-221-0/+2
| |
* | Merge pull request #3894 from adriaanm/depmsgGrzegorz Kossakowski2014-07-256-21/+25
|\ \ | | | | | | Better error message than 'bad symbolic reference'.
| * | Better error message than 'bad symbolic reference'.Adriaan Moors2014-07-226-21/+25
| |/ | | | | | | | | | | Let's not scare people, and try to give them some advice. PS: we should really come up with a better mechanism for testing errors/warnings
* | Merge pull request #3897 from lrytz/2.11.2-bumpGrzegorz Kossakowski2014-07-252-7/+7
|\ \ | | | | | | Bump versions for Scala 2.11.2
| * | Bump versions for Scala 2.11.2Lukas Rytz2014-07-232-7/+7
| |/
* | Merge pull request #3890 from dhgarrette/2.11.xGrzegorz Kossakowski2014-07-251-3/+1
|\ \ | | | | | | Remove "throws InvalidEscapeException" from StringContext.raw doc
| * | Fixed incorrect example in StringContext.raw docDan Garrette2014-07-211-1/+1
| | | | | | | | | As pointed out by @som-snytt, \u0023 is #, not \u0025.
| * | Remove "throws InvalidEscapeException" from StringContext.raw docDan Garrette2014-07-211-2/+0
| |/ | | | | Since StringContext.raw doesn't escape its input, it does not call `treatEscapes` and cannot throw the InvalidEscapeException.
* | Merge pull request #3884 from mpociecha/remove-invalidation-from-globalGrzegorz Kossakowski2014-07-252-238/+0
|\ \ | | | | | | Remove invalidation from Global.scala
| * | Remove invalidation from Global.scalampociecha2014-07-172-238/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invalidation has been introduced in these commits: https://github.com/scala/scala/commit/167309afd10f9b65b35e6874a30ea6340a1ddc44 https://github.com/scala/scala/commit/ace051ff0abe112b767c3912f846eb4d50e52cf5 https://github.com/scala/scala/commit/e156d4a7cf4afdab91b7c281a0e8ae6e4743cc4a It's safe to remove this functionality. It was added originally to support an experiment with resident compilation. The experiment was performed in sbt and dropped in https://github.com/sbt/sbt/commit/6def08e029e474dc35af04b7403a2aeaddd0dec6 Since then Scala team concluded to not work on resident compilation so it's safe to delete unused code.
* | | Merge pull request #3826 from lrytz/opt/refactorTrackedGrzegorz Kossakowski2014-07-2515-89/+481
|\ \ \ | | | | | | | | Assortiment of cleanups and comments around the backend
| * | | Documentation for isModuleClassLukas Rytz2014-07-081-0/+3
| | | |
| * | | Support writing classfile of version 52Lukas Rytz2014-07-083-1/+3
| | | |
| * | | Clean up and document some usages of flags in the backendLukas Rytz2014-07-089-44/+154
| | | |
| * | | Pattern matching on ClassBType extracts the inernalNameLukas Rytz2014-07-081-22/+27
| | | |
| * | | Remove unnessecary check when computing InnerClass attribute flagsLukas Rytz2014-07-081-2/+13
| | | | | | | | | | | | | | | | The final flag is computed correctly by javaFlags.
| * | | Comment summarizing the JVM spec for InnerClass / EnclosingMethodLukas Rytz2014-07-081-0/+199
| | | |
| * | | Minor cleanups and comments in GenBCodeLukas Rytz2014-07-086-21/+83
| | | |
* | | | Merge pull request #3896 from retronym/ticket/8743Grzegorz Kossakowski2014-07-256-34/+35
|\ \ \ \ | |_|_|/ |/| | | SI-8743 Fix crasher with poly-methods annotated with @varargs
| * | | SI-8743 Fix crasher with poly-methods annotated with @varargsJason Zaugg2014-07-236-34/+35
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that generated the Java varargs forwarder was basing things on the `ValDef-s` of the parameters of the source method. But, their types refer to a type parameter skolems of the enclosing method, which led to a type mismatch when typechecking the forwarder. Instead, I've reworked the code to simply use the `DefDef`-s symbol's info, which *doesn't* refer to skolems. This actually simplifies the surrounding code somewhat; rather than repeated symbols in a map we can just time travel the pre-uncurry method signatures to figure out which params are releated.
* | | Merge pull request #3888 from som-snytt/issue/8736v2.11.2Lukas Rytz2014-07-2110-9/+54
|\ \ \ | | | | | | | | SI-8736 Restore -language to former glory
| * | | SI-8736 Error if no arg and no defaultSom Snytt2014-07-201-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now `-language` with no option will emit an error: ``` $ skalac -feature -language unused.scala scalac error: '-language' requires an option. See '-language:help'. scalac -help gives more information ```
| * | | SI-8736 Restore -language to former glorySom Snytt2014-07-2010-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MultiChoice allows -language to work like -Xlint. The bug as described was that the setting value was set instead of updated (++=) with additional flags. The unreported bug was that `_` no longer set all settings. The corrected behavior is that "contains" means "it was enabled, or _ was set and it was not disabled explicitly." That is the behavior of `-Xlint` but with a different mechanism, since each lint option is a Setting. A semantic difference is that -Xlint enables all the lint options, but -language does not enable all the language features. `scalac -X` does not explain this additional behavior of the `-Xlint` flag. Also worth noting that `scalac -feature -language unused.scala` failed in 2.11.1 but succeeds silently now.
* | | | Merge pull request #3887 from Ichoran/issue/8738Lukas Rytz2014-07-202-9/+26
|\ \ \ \ | |/ / / |/| | | SI-8738 Regression in range equality
| * | | SI-8738 Regression in range equalityRex Kerr2014-07-202-9/+26
|/ / / | | | | | | | | | | | | | | | Missed the case of comparing a non-empty range to an empty one. Fixed by checking nonEmpty/isEmpty on other collection. Added a test to verify the behavior.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 18:06:16 +0000