summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--go.html.markdown12
-rw-r--r--typescript.html.markdown2
2 files changed, 11 insertions, 3 deletions
diff --git a/go.html.markdown b/go.html.markdown
index 9b9758b4..34b855e3 100644
--- a/go.html.markdown
+++ b/go.html.markdown
@@ -64,7 +64,11 @@ func beyondHello() {
learnTypes() // < y minutes, learn more!
}
-// Functions can have parameters and (multiple!) return values.
+/* <- multiline comment
+Functions can have parameters and (multiple!) return values.
+Here `x`, `y` are the arguments and `sum`, `prod` is the signature (what's returned).
+Note that `x` and `sum` receive the type `int`.
+*/
func learnMultiple(x, y int) (sum, prod int) {
return x + y, x * y // Return two values.
}
@@ -83,7 +87,7 @@ can include line breaks.` // Same string type.
f := 3.14195 // float64, an IEEE-754 64-bit floating point number.
c := 3 + 4i // complex128, represented internally with two float64's.
- // Var syntax with an initializers.
+ // var syntax with initializers.
var u uint = 7 // Unsigned, but implementation dependent size as with int.
var pi float32 = 22. / 7
@@ -177,6 +181,10 @@ func learnFlowControl() {
case 1:
case 42:
// Cases don't "fall through".
+ /*
+ There is a `fallthrough` keyword however, see:
+ https://github.com/golang/go/wiki/Switch#fall-through
+ */
case 43:
// Unreached.
default:
diff --git a/typescript.html.markdown b/typescript.html.markdown
index 27a1f71a..e9135510 100644
--- a/typescript.html.markdown
+++ b/typescript.html.markdown
@@ -9,7 +9,7 @@ TypeScript is a language that aims at easing development of large scale applicat
TypeScript adds common concepts such as classes, modules, interfaces, generics and (optional) static typing to JavaScript.
It is a superset of JavaScript: all JavaScript code is valid TypeScript code so it can be added seamlessly to any project. The TypeScript compiler emits JavaScript.
-This article will focus only on TypeScript extra syntax, as oposed to [JavaScript] (../javascript/).
+This article will focus only on TypeScript extra syntax, as opposed to [JavaScript] (../javascript/).
To test TypeScript's compiler, head to the [Playground] (http://www.typescriptlang.org/Playground) where you will be able to type code, have auto completion and directly see the emitted JavaScript.