summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3672 from retronym/topic/binary-versionv2.11.0-RC4Grzegorz Kossakowski2014-04-033-1/+8
|\ | | | | Further tweak version of continuations plugin in scala-dist.pom
| * Further tweak version of continuations plugin in scala-dist.pomJason Zaugg2014-04-033-1/+8
|/ | | | | | | | | | | | | | | | | | | | While we must use full version, rather than the cross version (12720e699), we need to use latest non-snapshot version. This should avoid failures like: https://jenkins.scala-ide.org:8496/jenkins/view/Scala%20Xsource%20flag%20nightlies/job/Akka/63/console Such as: [warn] :::::::::::::::::::::::::::::::::::::::::::::: [warn] :: UNRESOLVED DEPENDENCIES :: [warn] :::::::::::::::::::::::::::::::::::::::::::::: [warn] :: org.scala-lang.plugins#scala-continuations-plugin_2.11.0-SNAPSHOT;1.0.1: not found [warn] :::::::::::::::::::::::::::::::::::::::::::::: sbt.ResolveException: unresolved dependency: org.scala-lang.plugins#scala-continuations-plugin_2.11.0-SNAPSHOT;1.0.1:
* Merge pull request #3671 from densh/si/8466Jason Zaugg2014-04-023-5/+20
|\ | | | | SI-8466 fix quasiquote crash on recursively iterable unlifting
| * SI-8466 fix quasiquote crash on recursively iterable unliftingDenys Shabalin2014-04-023-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | In order to handle unquoting quasiquotes needs to know if type is iterable and whats the depth of the iterable nesting which is called rank. (e.g. List[List[Tree]] is rank 2 iterable of Tree) The logic that checks depth of iterable nesting didn't take a situation where T is in fact Iterable[T] which caused infinite recursion in stripIterable function. In order to fix it stripIterable now always recurs no more than non-optional limit times.
* | Merge pull request #3669 from adriaanm/rebase-3667Jason Zaugg2014-04-023-42/+92
|\ \ | |/ |/| SI-8460 Fix regression in implicit divergence recovery
| * Refactor rankImplicits, add some more docsAdriaan Moors2014-04-011-24/+26
| |
| * Refactor: keep DivergentImplicitRecovery logic together.Adriaan Moors2014-04-011-12/+12
| |
| * SI-8460 Fix regression in divergent implicit recoveryJason Zaugg2014-03-313-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit search detects likely cycles by looking at the stack of open implicits and checking the same implicit appears twice, and if the second occurrence is trying satisfy an implicit search for a "dominant" type. Originally, this condition immediately failed the entire implicit search. However, since Scala 2.10, this mechanism has been refined to continue searching after the first divergent implicit is detected. If a second divergence is found, we fail immediately. If the followup search fails, we report the first divergence. Otherwise, we take the successful result. This mechanism was originally built around exceptions. This proved to be fragile, and was refactored in SI-7291 / accaa314 to instead use the `Context.errors` to control the process. But, since that change, the pattern of implicits in scalanlp/breeze and Shapeless have been prone to reporting the divergent implicit errors where they used to recover. So long as we left the `DivergentImplictTypeError` that originates from a nested implicit search in `context.errors`, we are unable to successfully typecheck other candidates. This commit instead stashes the first such error away in `DivergentImplicitRecovery`, to clear the way for the alternative path to succeed. We must retain any other divergent implicit errors, as witnessed by test/files/neg/t2031.scala, which loops unless we retain divergent implicit errors that we don't stash in `DivergentImplicitRecovery`.
| * Refactor handling of failures in implicit searchJason Zaugg2014-03-312-18/+49
| | | | | | | | | | | | | | | | | | | | Better encapsulation for `DivergentImplicitRecovery` by replacing the vars `countDown` and `implicitSym` with a single var holding `Option[DivergentImplicitTypeError]`. Also adds a pending test for SI-8460 that will be addressed in the next commit. This commit is just groundwork and should not change any results of implicit search.
* | Rebase #3665Adriaan Moors2014-03-311-3/+3
|/
* Merge pull request #3668 from retronym/topic/travis-sshAdriaan Moors2014-03-311-3/+1
|\ | | | | Disable more of the Travis spec build for PR validation
| * Disable more of the Travis spec build for PR validationJason Zaugg2014-03-311-3/+1
| | | | | | | | | | | | | | | | | | | | So as to avoid: $ ssh-add -D All identities removed. $ ssh-add spec/id_dsa_travis Enter passphrase for spec/id_dsa_travis: No output has been received in the last 10 minutes, this potentially indicates a stalled build or something wrong with the build itself.
* | 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
| |
* | Merge pull request #3666 from adriaanm/specAdriaan Moors2014-03-304-71/+46
|\ \ | |/ |/| Spec cleanups
| * 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
|/
* Merge pull request #3663 from adriaanm/specAdriaan Moors2014-03-2820-217/+244
|\ | | | | More cleanup for the spec. Ported over @som-snytt's PRs.
| * 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
| |
| * Skip step bound to fail in Travis PR validationAdriaan Moors2014-03-281-1/+1
|/
* Merge pull request #3661 from adriaanm/plugin-not-in-scala-libraryJason Zaugg2014-03-282-5/+10
|\ | | | | Remove scala-continuations-plugin from scala-library-all
| * Remove scala-continuations-plugin from scala-library-allAdriaan Moors2014-03-282-5/+10
| | | | | | | | | | | | The continuations plugin should instead be a dependency of scala-dist, as scala-library-all should be a drop-in replacement for scala-library, and as such should not (indirectly) depend on plugins/the compiler.
* | Merge pull request #3662 from scala/specAdriaan Moors2014-03-2826-0/+9371
|\ \ | |/ |/| Import markdown spec under spec/
| * Start ssh-agentAdriaan Moors2014-03-271-1/+2
| |
| * Disable strict host checkingAdriaan Moors2014-03-271-1/+1
| |
| * Import markdown spec under spec/Adriaan Moors2014-03-2726-0/+9370
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2747-1016/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Add language to code blocks. Shorter Example title.Adriaan Moors2014-03-2615-369/+367
| | |
| | * Fix #6: automatic section numbering.Adriaan Moors2014-03-2617-330/+468
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add chapter number to YAML, which is replace in numbering.css. Use CSS counters for chapters, sections, subsections | examples. Examples are detected by looking at the H3 element's id, which redcarpet derives from the heading's title. It must start with "Example:", and the whole title is suppressed by a little javascript, so we can make Examples look like in the pdf. For example, `### Example:` becomes `Example 3.2.10`, if it's the 10th example in Section 3.2.
| | * #9 try to avoid double slashes in urlAdriaan Moors2014-03-261-1/+1
| | |
| | * require redcarpet 3.1 for user-friendly anchorsAdriaan Moors2014-03-261-0/+2
| | | | | | | | | | | | | | | | | | with_toc_data was updated in https://github.com/vmg/redcarpet/pull/186 to generate pretty ID attributes for Hn headers, which is what we use for cross-linking
| | * use simple quotes, fix indent, escape dollarAdriaan Moors2014-03-265-52/+48
| | |
| | * liquid requires SSA?Adriaan Moors2014-03-261-1/+2
| | |
| | * sort pages in indexAdriaan Moors2014-03-261-1/+1
| | |
| | * base urlAdriaan Moors2014-03-262-3/+2
| | |
| | * formattingAdriaan Moors2014-03-269-255/+234
| | |
| | * TODO: number headings using cssAdriaan Moors2014-03-261-0/+14
| | |
| | * mathjax escape dollarAdriaan Moors2014-03-261-1/+2
| | |
| | * TODO: binding exampleAdriaan Moors2014-03-251-3/+6
| | |
| | * fix indentation for footnotesAdriaan Moors2014-03-251-2/+2
| | |
| | * allow math in codeAdriaan Moors2014-03-251-1/+1
| | |
| | * redcarpetAdriaan Moors2014-03-251-2/+2
| | |
| | * formattingAdriaan Moors2014-03-251-2/+4
| | |
| | * Jekyll 2 config for redcarpet 3.1.1Adriaan Moors2014-03-252-4/+13
| | | | | | | | | | | | | | | To mimic github flavored markdown for local viewing. Note that this requires a development version of jekyll.
| | * That was fun: fix internal links.Adriaan Moors2014-03-1312-134/+134
| | | | | | | | | | | | | | | | | | | | | After some dirty grepping, regexing and perling, I present to you: internal links! I wish there was a way to make this more robust, these will only work on the html version, and assume we don't change filenames...
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 11:54:33 +0000