Merge pull request #64 from sauntimo/patch-2

MaureenElsberry · web-flow · commit 447d044ecff6 · 2019-07-01T11:55:47.000-07:00
Added explanation of shadowing, grammar fix
diff --git a/src/main/scala/scalatutorial/sections/LexicalScopes.scala b/src/main/scala/scalatutorial/sections/LexicalScopes.scala
@@ -80,9 +80,10 @@ object LexicalScopes extends ScalaTutorialSection {
    * = Lexical Scoping =
    *
    * Definitions of outer blocks are visible inside a block unless they are shadowed.
+   * Shadowed defintions are ones which are redfined in a lower scope.
    *
    * Therefore, we can simplify `sqrt` by eliminating redundant occurrences of the `x` parameter, which means
-   * everywhere the same thing:
+   * the same thing everywhere:
    *
    * = The `sqrt` Function, Take 3 =
    *

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,10 @@ object LexicalScopes extends ScalaTutorialSection {`
`80`	`80`	`* = Lexical Scoping =`
`81`	`81`	`*`
`82`	`82`	`* Definitions of outer blocks are visible inside a block unless they are shadowed.`
	`83`	`+ * Shadowed defintions are ones which are redfined in a lower scope.`
`83`	`84`	`*`
`84`	`85`	* Therefore, we can simplify `sqrt` by eliminating redundant occurrences of the `x` parameter, which means
`85`		`- * everywhere the same thing:`
	`86`	`+ * the same thing everywhere:`
`86`	`87`	`*`
`87`	`88`	* = The `sqrt` Function, Take 3 =
`88`	`89`	`*`