summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
| * Update number of subsections in Value ConversionsFrank S. Thomas2015-11-231-1/+1
| |
| * "macro" is a reserved word since Scala 2.11kenji yoshida2015-11-021-5/+5
| |
* | merge 2.11.x onto 2.12.x, Oct 16 2015Seth Tisue2015-10-161-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there were merge conflicts in the Eclipse config that I resolved with --ours. I invite @performantdata to submit a followup PR bringing the Eclipse stuff into a good state on 2.12.x. there was a test failure in test/junit/scala/collection/mutable/OpenHashMapTest.scala due to the 2.12 compiler emitting the field backing a private var differently (with an unmangled name). Lukas says the difference is expected, so I just updated the code in the test. there were no other merge conflicts. % git log --decorate --oneline -1 origin/2.11.x | cat ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508 % git log --decorate --oneline -1 origin/2.12.x | cat c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request #4797 from lrytz/M3-versions % export MB=$(git merge-base 2.12.x origin/2.11.x) % echo $MB 42cafa21f3c4a08c6dd34608278f810b6ec2886f % git log --graph --oneline --decorate $MB...origin/2.11.x | cat * ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508 |\ | * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration * | fe76232 Merge pull request #4798 from performantdata/issue/9513 |\ \ | * | 9c97a7f (origin/pull/4798) Suppress unneeded import. | * | 30d704d Document some OpenHashMap internal methods. | * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused | |/ * | 14f875c Merge pull request #4788 from dk14/patch-1 |\ \ | * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs | / * | 68ce049 Merge pull request #4771 from som-snytt/issue/9492-here |\ \ | * | f290962 (origin/pull/4771) SI-9492 Line trimming paste | * | bc3589d SI-9492 REPL paste here doc | / * | 9834fc8 Merge pull request #4610 from todesking/spec-implicits-remove-obsolete |\ \ | * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule | * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10 | / * | d792e35 Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-operations |\ \ | |/ |/| | * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params. |/ * 648c7a1 Merge pull request #4790 from SethTisue/issue/9501 |\ | * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide * e0b5891 Merge pull request #4786 from performantdata/issue/9506 * 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs * 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs % git merge ae5f0de Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala Auto-merging src/library/scala/util/Either.scala Auto-merging src/library/scala/runtime/Tuple3Zipped.scala Auto-merging src/library/scala/runtime/Tuple2Zipped.scala Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala Auto-merging src/library/scala/collection/immutable/ListMap.scala Auto-merging src/library/scala/collection/TraversableLike.scala Auto-merging src/eclipse/test-junit/.classpath CONFLICT (content): Merge conflict in src/eclipse/test-junit/.classpath Auto-merging src/eclipse/scaladoc/.classpath CONFLICT (content): Merge conflict in src/eclipse/scaladoc/.classpath Auto-merging src/eclipse/scala-compiler/.classpath Auto-merging src/eclipse/repl/.classpath CONFLICT (content): Merge conflict in src/eclipse/repl/.classpath Auto-merging src/eclipse/partest/.classpath CONFLICT (content): Merge conflict in src/eclipse/partest/.classpath Auto-merging src/eclipse/interactive/.classpath Auto-merging README.md Automatic merge failed; fix conflicts and then commit the result. % git checkout --ours src/eclipse/partest/.classpath % git checkout --ours src/eclipse/repl/.classpath % git checkout --ours src/eclipse/scaladoc/.classpath % git checkout --ours src/eclipse/test-junit/.classpath % git add -u % emacs test/junit/scala/collection/mutable/OpenHashMapTest.scala % git diff test/junit/scala/collection/mutable/OpenHashMapTest.scala | cat ... - val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted") + val field = m.getClass.getDeclaredField("deleted") ... % git add -u
| * Merge pull request #4610 from todesking/spec-implicits-remove-obsoleteSeth Tisue2015-10-141-2/+10
| |\ | | | | | | Spec: Implicit parameters with context/view bound is allowed since 2.10
| | * Add view/context-bound parameter ordering ruletodesking2015-09-241-0/+10
| | |
| | * Spec: Implicit parameters with context/view bound is allowed since 2.10todesking2015-07-081-2/+0
| | |
* | | Merge commit 'bb3ded3' into merge-2.11-to-2.12-oct-5Lukas Rytz2015-10-051-1/+1
|\| |
| * | tiny fix to spec (pattern matching section)Seth Tisue2015-09-301-1/+1
| | |
| * | fix trivial error in specSeth Tisue2015-08-281-1/+1
| | |
| * | Fix typos in spec, docs and commentsMichał Pociecha2015-08-235-8/+8
| | |
* | | Merge remote-tracking branch 'origin/2.11.x' into 2.12.xSeth Tisue2015-09-086-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | only trivial merge conflicts here. not dealing with PR #4333 in this merge because there is a substantial conflict there -- so that's why I stopped at 63daba33ae99471175e9d7b20792324615f5999b for now
* | | Merge pull request #4590 from som-snytt/issue/6810Lukas Rytz2015-08-242-24/+30
|\ \ \ | |/ / |/| | SI-6810 Disallow EOL in char literal
| * | SI-6810 Spec reflects literal parsing literallySom Snytt2015-06-292-24/+30
| | | | | | | | | | | | | | | | | | | | | Emphasize that literal parsing accepts Unicode escapes as if they were escaped. In particular, a newline represented by its Unicode escape does not terminate the line in the middle of a literal.
* | | use newer Redcarpet to build specSeth Tisue2015-07-152-3/+1
| |/ |/| | | | | | | now that https://github.com/vmg/redcarpet/issues/494 is fixed we don't need to stay pinned to an outdated version anymore
* | Fix 23 typos (m-o)Janek Bogucki2015-06-281-1/+1
| |
* | Merge pull request #4570 from marconilanna/patch-1Seth Tisue2015-06-241-1/+1
|\ \ | |/ |/| Traits mistakenly set as 'Case Classes' subsection
| * Traits mistakenly set as 'Case Classes' subsectionMarconi Lanna2015-06-211-1/+1
| | | | | | | | | | Instead of being its own section, a minor formatting issue causes 'Traits' to be rendered and numbered as a subsection of the section 'Case Classes'. This patch changes the numbering on both 'Traits' and 'Object Definitions' sections.
* | Spec: Add lost references, cleanupSimon Ochsenreither2015-06-222-132/+154
|/
* Merge pull request #4550 from YawarRaza7349/patch-2Adriaan Moors2015-06-171-1/+1
|\ | | | | Fix missing quotes in EBNF of type alias
| * Fix missing quotes in EBNF of type aliasYawarRaza73492015-06-111-1/+1
| |
* | Merge pull request #4551 from soc/topic/spec-default-argsAdriaan Moors2015-06-171-8/+20
|\ \ | | | | | | spec: Add 'Default Arguments' heading, sentence, example
| * | spec: Add 'Default Arguments' heading, sentence, exampleSimon Ochsenreither2015-06-121-8/+20
| |/ | | | | | | The sentence and the accompanying example were stolen from SID-1.
* / Clarify the definition of inheritance closureYawarRaza73492015-06-051-0/+1
|/ | | | The definition now specifically mentions that C is an element of the inheritance closure of C.
* fix typokenji yoshida2015-05-281-1/+1
|
* Merge pull request #4520 from xuwei-k/patch-1Jason Zaugg2015-05-261-1/+1
|\ | | | | fix typo
| * fix typokenji yoshida2015-05-251-1/+1
| |
* | SI-9321 Clarify spec for inheritance of qualified privateJason Zaugg2015-05-221-4/+3
|/ | | | | | | | | I checked the intent with Martin, who said: > [...] qualified private members are inherited like other members, > it’s just that their access is restricted. I've locked this in with a test as well.
* spec: Remove obsolete rules related to scala.NotNullGuillaume Martres2015-04-282-6/+1
| | | | | These rules were removed in #2244 and scala.NotNull itself was deprecated.
* Spec improvementsSimon Ochsenreither2015-04-2541-465/+1618
|
* Move all modifiers to the same levelsoc2015-03-191-7/+7
|
* Quote `_` properly in lexical syntax.Adriaan Moors2015-03-051-1/+1
| | | Avoid spurious italics...
* Merge pull request #4257 from 193s/2.11.xAdriaan Moors2015-01-301-1/+1
|\ | | | | fix definition of TRY in the language specification
| * fix definition of TRY in the language specIkumi Shimizu2015-01-171-1/+1
| |
* | Merge pull request #4226 from jhegedus42/patch-1Adriaan Moors2015-01-301-2/+2
|\ \ | |/ |/| Update 03-types.md
| * Update 03-types.mdjhegedus422014-12-301-2/+2
| | | | | | Using U_i instead of T_i is confusing. See http://stackoverflow.com/questions/26803244/is-this-a-typo-in-the-scala-language-specification-on-parameterized-types
* | Merge pull request #4201 from mpociecha/fix-typos-in-docs-and-commentsGrzegorz Kossakowski2015-01-145-6/+6
|\ \ | |/ |/| Fix many typos in docs and comments
| * Fix many typos in docs and commentsmpociecha2014-12-145-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit corrects many typos found in scaladocs, comments and documentation. It should reduce a bit number of PRs which fix one typo. There are no changes in the 'real' code except one corrected name of a JUnit test method and some error messages in exceptions. In the case of typos in other method or field names etc., I just skipped them. Obviously this commit doesn't fix all existing typos. I just generated in IntelliJ the list of potential typos and looked through it quickly.
* | Merge pull request #4139 from retronym/ticket/7965Adriaan Moors2014-12-231-0/+13
|\ \ | |/ |/| SI-7965 Support calls to MethodHandle.{invoke,invokeExact}
| * Spec update for signature polymorphic methodsLukas Rytz2014-12-181-0/+13
| |
* | Merge pull request #4154 from smarter/patch-1Adriaan Moors2014-12-101-0/+2
|\ \ | | | | | | spec: Add a link to the sources from the main page
| * | spec: Add a link to the sources from the main pageGuillaume Martres2014-11-241-0/+2
| |/
* | add 0X...hex number literal in syntax summaryYe Xianjin2014-11-301-1/+1
| |
* | add 0X... for hex number literalYe Xianjin2014-11-291-1/+1
| |
* | SI-5205 Finish applying octal deletionSom Snytt2014-11-231-3/+1
|/ | | | | | The original PR was partially applied to markdown. https://github.com/scala/scala-dist/pull/103
* Add curly brace (zero-or-more) in grammar for Bindingssoc2014-11-161-1/+1
| | | Missing closing curly brace as reported by Andre at https://groups.google.com/forum/#!topic/scala-language/4Zb6dc6EEFM.
* Update 04-basic-declarations-and-definitions.mdRobert Hoedicke2014-10-101-3/+3
| | | Reverted the claimed result values of the example in the section on repeated parameters and changed the code of the example method instead.
* Update 12-the-scala-standard-library.mdroberthoedicke2014-10-091-1/+1
| | | Changed "in" to "by the".
* Update 10-xml-expressions-and-patterns.mdroberthoedicke2014-10-091-1/+1
| | | Changed two wrong plurals to singulars, and inserted a comma in an enumeration of alternatives before the last "or".
* Update 08-pattern-matching.mdroberthoedicke2014-10-081-2/+2
| | | | Elided superfluous "a". Corrected "no" to "not".
* Update 06-expressions.mdroberthoedicke2014-10-081-3/+3
| | | | Inserted two missing instances of the word "the". Corrected "invokeDynamic" to "applyDynamic".
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 05:15:33 +0000