summaryrefslogtreecommitdiffhomepage
path: root/kotlin.html.markdown
diff options
context:
space:
mode:
Diffstat (limited to 'kotlin.html.markdown')
-rw-r--r--kotlin.html.markdown8
1 files changed, 4 insertions, 4 deletions
diff --git a/kotlin.html.markdown b/kotlin.html.markdown
index 5bbf6847..a6fac518 100644
--- a/kotlin.html.markdown
+++ b/kotlin.html.markdown
@@ -26,7 +26,7 @@ any parameters.
*/
fun main(args: Array<String>) {
/*
- Declaring values is done using either "var" or "val".
+ Declaring variables is done using either "var" or "val".
"val" declarations cannot be reassigned, whereas "vars" can.
*/
val fooVal = 10 // we cannot later reassign fooVal to something else
@@ -180,7 +180,7 @@ fun helloWorld(val name : String) {
// destructuring in "for" loop
for ((a, b, c) in listOf(fooData)) {
- println("$a $b $c") // => 1 100 4
+ println("$a $b $c") // => 1 2 4
}
val mapData = mapOf("a" to 1, "b" to 2)
@@ -297,7 +297,7 @@ fun helloWorld(val name : String) {
else -> println("none of the above")
}
- // "when" can be used as a function that returns a value.
+ // "when" can be used as an expression that returns a value.
var result = when (i) {
0, 21 -> "0 or 21"
in 1..20 -> "in the range 1 to 20"
@@ -426,7 +426,7 @@ data class Counter(var value: Int) {
operator fun invoke() = println("The value of the counter is $value")
}
-/* You can also overload operators through an extension methods */
+/* You can also overload operators through extension methods */
// overload -Counter
operator fun Counter.unaryMinus() = Counter(-this.value)