summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel C. Sobral <dcsobral@gmail.com>2013-05-13 16:32:41 -0300
committerDaniel C. Sobral <dcsobral@gmail.com>2013-05-13 16:32:41 -0300
commit80f1fa5abe2115f0850d07876ed393ff0a3c45ac (patch)
tree3b6aa47991a17e219c5048eefb0519c8a4c76e37 /src
parentda91728a0b1d5e449eb13b697993d056e7ad53d6 (diff)
downloadscala-80f1fa5abe2115f0850d07876ed393ff0a3c45ac.tar.gz
scala-80f1fa5abe2115f0850d07876ed393ff0a3c45ac.tar.bz2
scala-80f1fa5abe2115f0850d07876ed393ff0a3c45ac.zip
Fix formatting for couple of docs in the compiler
Source code on scaladoc for the virtual pattern matcher was not being correctly identified as such. Also, I had to use an html code tag instead of backticks when referring to the __match identifier, otherwise the double underscore would be treated as start-of-underline wiki markup.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala b/src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala
index 8be8b72130..63834ae51e 100644
--- a/src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala
+++ b/src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala
@@ -129,8 +129,9 @@ trait Interface extends ast.TreeDSL {
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/** Interface with user-defined match monad?
- * if there's a `__match` in scope, we use this as the match strategy, assuming it conforms to MatchStrategy as defined below:
+ * if there's a <code>__match</code> in scope, we use this as the match strategy, assuming it conforms to MatchStrategy as defined below:
+ {{{
type Matcher[P[_], M[+_], A] = {
def flatMap[B](f: P[A] => M[B]): M[B]
def orElse[B >: A](alternative: => M[B]): M[B]
@@ -144,12 +145,14 @@ trait Interface extends ast.TreeDSL {
def one[T](x: P[T]): M[T]
def guard[T](cond: P[Boolean], then: => P[T]): M[T]
}
+ }}}
* P and M are derived from one's signature (`def one[T](x: P[T]): M[T]`)
- * if no `__match` is found, we assume the following implementation (and generate optimized code accordingly)
+ * if no <code>__match</code> is found, we assume the following implementation (and generate optimized code accordingly)
+ {{{
object __match extends MatchStrategy[({type Id[x] = x})#Id, Option] {
def zero = None
def one[T](x: T) = Some(x)
@@ -157,6 +160,7 @@ trait Interface extends ast.TreeDSL {
def guard[T](cond: Boolean, then: => T): Option[T] = if(cond) Some(then) else None
def runOrElse[T, U](x: T)(f: T => Option[U]): U = f(x) getOrElse (throw new MatchError(x))
}
+ }}}
*/
trait MatchMonadInterface {