summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* 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".
* Update 04-basic-declarations-and-definitions.mdroberthoedicke2014-10-081-2/+2
| | | Corrected the claimed outcome of the example in the section on repeated parameters. The example method sum sums up the _squares_ of the arguments.
* Update 03-types.mdroberthoedicke2014-10-081-1/+1
| | | Inserted missing word "bounds".
* Update 03-types.mdroberthoedicke2014-10-081-1/+1
| | | Fixed typo.
* Update 02-identifiers-names-and-scopes.mdroberthoedicke2014-10-081-1/+1
| | | Fixed typo.
* SI-8870 Fix markup errors in the Types section of the specJason Zaugg2014-10-011-5/+5
| | | | | Bad: `T'_n` Good: `T_n'`
* spec: a header that links to the index, with a scala logoAntoine Gourlay2014-09-236-5/+60
| | | | ...and a Scala favicon.
* spec: a print stylesheet to remove the TOC when printingAntoine Gourlay2014-09-232-0/+16
|
* spec: generated TOC with linkable headersAntoine Gourlay2014-09-229-7/+615
| | | | | | | | | | | | | This adds a table of contents to the spec, with a way to get the link of a header on hover (like on GitHub) and a "return to top" small icon at the end of each section. Jekyll generates the H1-level table of contents, and then the current one is expended using jQuery all the way down to H5 titles. Examples and H6 headers are ignored. GitHub's (MIT licensed) octicons are used for nice "link" and "up" icons.
* Particular formatting improvement in the specSom Snytt2014-09-191-1/+1
| | | | | | | | | | | | | | Fixes the titularity of the "Overloading resolution" header under 6.26.1 "Value conversions" to match "Type instantiation." Hopefully this makes the link to the actual 6.26.3 overloading resolution section work without further renaming. (Edit: changed the minor heading to say "Static overload resolution", which is sufficiently redundant.) Possibly that is the oftenest-cited section of the entire document. At least on Stack Overflow, if not in Proceedings of the ACM.
* spec: fix broken links and anchors, including examplesAntoine Gourlay2014-09-176-15/+16
| | | | | | | For examples, the "name" of the example (like "Example Ordered") is only used to derived its html id so that one can link to it (see `layouts/default.yml`). Ideally all examples should have a name; here I only added enough to satisfy existing links.
* spec: remove trailing whitespace everywhereAntoine Gourlay2014-09-1716-660/+497
|
* spec: fix latex formatting all over the placeAntoine Gourlay2014-09-179-101/+104
| | | | | | | | | Two things worth mentioning: - `\em` and `emph` are not supported by MathJax, - and things like `\mathcal{C}_0` require escaping the `_`, otherwise markdown sees it as the beginning of `_some string_`. It doesn't happen without the closing bracket in front, e.g. in `b_0`.
* spec: add syntax highlighting for scala code with highlight.jsAntoine Gourlay2014-09-173-0/+42
| | | | | | | | | | | This adds syntax highlighting for all code scala blocks. Highlighting is done after MathJax is done rendering so that latex can be used in code blocks (and it currently *is* used). Sadly Scala isn't common enough to be bundled in the highlight.min.js available from CDNs, so we commit a local version of version 8.2 with only scala bundled in it. The only other language used (ebnf) isn't supported by highlight.js.
* spec: use the yaml title as the HTML titleAntoine Gourlay2014-09-152-4/+4
|
* Fix broken URL for MathJAX Javascript dependency.Jason Zaugg2014-09-081-1/+1
| | | | | | | | Loaded using an DNS alias for the CDN, as per the [instructions](http://docs.mathjax.org/en/latest/configuration.html) I also switched from `latest` to `2.3-latest`, so that we don't automatically perform major upgrades.
* SI-8325 Spec accepts infix type *Som Snytt2014-05-071-2/+1
| | | | | | Remove the clause in 3.2.8 that reserves `*` as a postfix modifier thing. For emphasis, the language that an infix type name can be an arbitrary identifier is retained, sans buts.
* Rebase #3665Adriaan Moors2014-03-311-3/+3
|
* Merge pull request #3664 from iainmcgin/lexicalfixAdriaan Moors2014-03-311-19/+20
|\ | | | | Minor typographical fixes for lexical syntax chapter
| * Minor typographical fixes for lexical syntax chapterIain McGinniss2014-03-281-19/+20
| |
* | Don't mention C#Adriaan Moors2014-03-302-6/+5
| |
* | Reducing overlap of code and math.Adriaan Moors2014-03-281-36/+33
| | | | | | | | | | | | Prefer smaller islands of `code` in bigger sections of $math$. Do not include $`code` in math$, and avoid `$math$ in code`.
* | Simplify CSS, bigger monospace to match mathAdriaan Moors2014-03-281-29/+8
|/
* SI-6054 Modern eta-expansion examples that almost runSom Snytt2014-03-281-9/+8
| | | | | | | | | | This wasn't so easy after all. The clever one is to show that `Option.fold(=>Z)` preserves the by-nameness of the zero value, which may or may not be in the spec yet. The addition to 6.26.5 was (I think) rejected as implementation-specific; it should use the wording from 6.6 about "preserving by-nameness" or "by-namity" (the latter has the advantage of sounding both more technical and somewhat inane).
* SI-6069 Preserve by-name during eta-expansionSom Snytt2014-03-281-0/+4
| | | | | | | | This wording attempts to describe the behavior change in SI-5610 while remaining non-committal about the mechanism. It refers to the section on function applications and attempts to use similar language.
* Stubs for references chapter, remains TODOAdriaan Moors2014-03-281-0/+14
|
* Number files like chapters. Consolidate toc & preface.Adriaan Moors2014-03-2818-206/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aside from the consolidation of title & preface in index.md, this commit was produced as follows: ``` cd spec/ g mv 03-lexical-syntax.md 01-lexical-syntax.md g mv 04-identifiers-names-and-scopes.md 02-identifiers-names-and-scopes.md g mv 05-types.md 03-types.md g mv 06-basic-declarations-and-definitions.md 04-basic-declarations-and-definitions.md g mv 07-classes-and-objects.md 05-classes-and-objects.md g mv 08-expressions.md 06-expressions.md g mv 09-implicit-parameters-and-views.md 07-implicit-parameters-and-views.md g mv 10-pattern-matching.md 08-pattern-matching.md g mv 11-top-level-definitions.md 09-top-level-definitions.md g mv 12-xml-expressions-and-patterns.md 10-xml-expressions-and-patterns.md g mv 13-user-defined-annotations.md 11-user-defined-annotations.md g mv 14-the-scala-standard-library.md 12-the-scala-standard-library.md g mv 15-syntax-summary.md 13-syntax-summary.md g mv 16-references.md 14-references.md perl -pi -e 's/03-lexical-syntax/01-lexical-syntax/g' *.md perl -pi -e 's/04-identifiers-names-and-scopes/02-identifiers-names-and-scopes/g' *.md perl -pi -e 's/05-types/03-types/g' *.md perl -pi -e 's/06-basic-declarations-and-definitions/04-basic-declarations-and-definitions/g' *.md perl -pi -e 's/07-classes-and-objects/05-classes-and-objects/g' *.md perl -pi -e 's/08-expressions/06-expressions/g' *.md perl -pi -e 's/09-implicit-parameters-and-views/07-implicit-parameters-and-views/g' *.md perl -pi -e 's/10-pattern-matching/08-pattern-matching/g' *.md perl -pi -e 's/11-top-level-definitions/09-top-level-definitions/g' *.md perl -pi -e 's/12-xml-expressions-and-patterns/10-xml-expressions-and-patterns/g' *.md perl -pi -e 's/13-user-defined-annotations/11-user-defined-annotations/g' *.md perl -pi -e 's/14-the-scala-standard-library/12-the-scala-standard-library/g' *.md perl -pi -e 's/15-syntax-summary/13-syntax-summary/g' *.md perl -pi -e 's/16-references/14-references/g' *.md ```
* Minor cleanup in aisle READMEAdriaan Moors2014-03-281-1/+5
|
* Import markdown spec under spec/Adriaan Moors2014-03-276-236/+42
| | | | | | | | | | | | | The bulk of the effort was done in: https://github.com/iainmcgin/scala-ref-markdown/ I just ported it to redcarpet 3.1, added a jekyll build to run on Travis, and fixed some long-standing spec bugs. As described in spec/README.md, for now we're only generating an html page per each chapter with a rudimentary toc index. We'll focus on presenting this more nicely first, and then look into a pdf / single-page html version.
* Jekyll generated html in spec/ directoryAdriaan Moors2014-03-2723-0/+9536
To avoid confusion, removing artifacts for currently unsupported targets (pdf/single-page html). I'd like to bring those back, but in the mean time let's avoid distractions. Add Travis build.