diff --git a/basics.md b/basics.md index 874ee360..23af640e 100644 --- a/basics.md +++ b/basics.md @@ -16,7 +16,7 @@ World" in Go. {callout="//"} <{{src/basics/helloworld.go}} -Lets look at the program line by line. This first line is just required <1>. All +Let's look at the program line by line. This first line is just required <1>. All Go files start with `package `, and `package main` is required for a standalone executable. @@ -625,7 +625,7 @@ With `a[:]` <4> we create a slice with all the elements in the array. This is a And with `a[:4]` <5> we create a slice with the elements from index 0 to 3, this is short for: `a[0:4]`, and gives us a slices that contains: `1, 2, 3, 4`. With `s2[:]` we create a slice from the slice `s2` <6>, note that `s5` still refers to the array `a`. -Finally, we create a slice with the elements from index 3 to 3 *and* also set the cap to 4 <7>. +Finally, we create a slice with the elements from index 2 to 3 *and* also set the cap to 3 instead of 5<7>. When working with slices you can overrun the bounds, consider this code. @@ -635,7 +635,7 @@ When working with slices you can overrun the bounds, consider this code. At <1> we create an array with a 100 elements, indexed from 0 to 99. Then at <2> we create a slice that has index 0 to 98. We assign 1 to the 99th element <3> of the slice. This works as expected. But at <4> we dare to do the impossible, and -and try to allocate something beyond the length of the slice and we are greeted +try to allocate something beyond the length of the slice and we are greeted with a *runtime* error: `Error: "throw: index out of range".` If you want to extend a slice, there are a couple of built-in functions that diff --git a/ex/basics/fizzbuzz.md b/ex/basics/fizzbuzz.md index 204e98b3..e6de0472 100644 --- a/ex/basics/fizzbuzz.md +++ b/ex/basics/fizzbuzz.md @@ -4,7 +4,7 @@ 1. Solve this problem, called the Fizz-Buzz [@fizzbuzz_cite] problem: Write a program that prints the numbers from 1 to 100. But for multiples -of three print, "Fizz" instead of the number, and for multiples of +of three, print "Fizz" instead of the number, and for multiples of five, print "Buzz". For numbers which are multiples of both three and five, print "FizzBuzz".