Merge pull request #104 from emma-burrows/patch-1

FRosner · web-flow · commit 0fdc5200267c · 2018-06-08T15:10:22.000+02:00
Clarify the purpose of getOrElse
diff --git a/src/main/scala/stdlib/Options.scala b/src/main/scala/stdlib/Options.scala
@@ -35,7 +35,7 @@ object Options extends FlatSpec with Matchers with org.scalaexercises.definition
    * }
    * }}}
    *
-   * Using `getOrElse` we can provide a default value ("No value") when the optional argument (`None`) does not exist:
+   * Using `getOrElse`, we can extract the value if it exists, or return a provided default value. If we have a `Some(x)` we return `x`, and for `None` we return the default value.
    */
   def getOrElseOptions(res0: String, res1: String, res2: String) {
     val value1 = maybeItWillReturnSomething(true)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ object Options extends FlatSpec with Matchers with org.scalaexercises.definition`
`35`	`35`	`* }`
`36`	`36`	`* }}}`
`37`	`37`	`*`
`38`		- * Using `getOrElse` we can provide a default value ("No value") when the optional argument (`None`) does not exist:
	`38`	+ * Using `getOrElse`, we can extract the value if it exists, or return a provided default value. If we have a `Some(x)` we return `x`, and for `None` we return the default value.
`39`	`39`	`*/`
`40`	`40`	`def getOrElseOptions(res0: String, res1: String, res2: String) {`
`41`	`41`	`val value1 = maybeItWillReturnSomething(true)`