From 6edacddbb3e585fdc7e6d98fb62720b02ecb0431 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 11 Feb 2017 12:27:17 +0800 Subject: [PATCH] fix: coding style and file format for chapter 8. --- eBook/exercises/chapter_8/map_days.go | 71 ++++++------ eBook/exercises/chapter_8/map_drinks.go | 147 ++++++++++++------------ 2 files changed, 110 insertions(+), 108 deletions(-) diff --git a/eBook/exercises/chapter_8/map_days.go b/eBook/exercises/chapter_8/map_days.go index 7c4fa70..6fdc729 100755 --- a/eBook/exercises/chapter_8/map_days.go +++ b/eBook/exercises/chapter_8/map_days.go @@ -1,35 +1,36 @@ -// map_days.go -package main - -import ( - "fmt" -) - -var Days = map[int]string{1:"monday", - 2:"tuesday", - 3: "wednesday", - 4: "thursday", - 5: "friday", - 6: "saturday", - 7: "sunday"} - -func main() { - fmt.Println(Days) - // fmt.Printf("%v", Days) - flagHolliday := false - for k, v := range Days { - if v == "thursday" || v == "holliday" { - fmt.Println(v, " is the ", k , "th day in the week") - if v == "holliday" { - flagHolliday = true - } - } - } - if !flagHolliday { - fmt.Println("holliday is not a day!") - } -} -/* Output: -thursday is the 4 th day in the week -holliday is not a day! -*/ \ No newline at end of file +// map_days.go +package main + +import ( + "fmt" +) + +var Days = map[int]string{1: "monday", + 2: "tuesday", + 3: "wednesday", + 4: "thursday", + 5: "friday", + 6: "saturday", + 7: "sunday"} + +func main() { + fmt.Println(Days) + // fmt.Printf("%v", Days) + flagHolliday := false + for k, v := range Days { + if v == "thursday" || v == "holliday" { + fmt.Println(v, " is the ", k, "th day in the week") + if v == "holliday" { + flagHolliday = true + } + } + } + if !flagHolliday { + fmt.Println("holliday is not a day!") + } +} + +/* Output: +thursday is the 4 th day in the week +holliday is not a day! +*/ diff --git a/eBook/exercises/chapter_8/map_drinks.go b/eBook/exercises/chapter_8/map_drinks.go index e048055..1e3f65b 100755 --- a/eBook/exercises/chapter_8/map_drinks.go +++ b/eBook/exercises/chapter_8/map_drinks.go @@ -1,73 +1,74 @@ -// map_drinks.go -package main - -import ( - "fmt" - "sort" -) - -func main() { - drinks := map[string]string{ - "beer": "bière", - "wine": "vin", - "water": "eau", - "coffee": "café", - "thea": "thé"} - sdrinks := make([]string, len(drinks)) - ix := 0 - - fmt.Printf("The following drinks are available:\n") - for eng := range drinks { - sdrinks[ix] = eng - ix++ - fmt.Println(eng) - } - - fmt.Println("") - for eng, fr := range drinks { - fmt.Printf("The french for %s is %s\n", eng, fr) - } - - // SORTING: - fmt.Println("") - fmt.Println("Now the sorted output:") - sort.Strings(sdrinks) - - fmt.Printf("The following sorted drinks are available:\n") - for _, eng := range sdrinks { - fmt.Println(eng) - } - - fmt.Println("") - for _, eng := range sdrinks { - fmt.Printf("The french for %s is %s\n", eng, drinks[eng]) - } -} -/* Output: -The following drinks are available: -wine -beer -water -coffee -thea - -The french for wine is vin -The french for beer is bière -The french for water is eau -The french for coffee is café -The french for thea is thé - -Now the sorted output: -The following sorted drinks are available: -beer -coffee -thea -water -wine - -The french for beer is bière -The french for coffee is café -The french for thea is thé -The french for water is eau -The french for wine is vin -*/ +// map_drinks.go +package main + +import ( + "fmt" + "sort" +) + +func main() { + drinks := map[string]string{ + "beer": "bière", + "wine": "vin", + "water": "eau", + "coffee": "café", + "thea": "thé"} + sdrinks := make([]string, len(drinks)) + ix := 0 + + fmt.Printf("The following drinks are available:\n") + for eng := range drinks { + sdrinks[ix] = eng + ix++ + fmt.Println(eng) + } + + fmt.Println("") + for eng, fr := range drinks { + fmt.Printf("The french for %s is %s\n", eng, fr) + } + + // SORTING: + fmt.Println("") + fmt.Println("Now the sorted output:") + sort.Strings(sdrinks) + + fmt.Printf("The following sorted drinks are available:\n") + for _, eng := range sdrinks { + fmt.Println(eng) + } + + fmt.Println("") + for _, eng := range sdrinks { + fmt.Printf("The french for %s is %s\n", eng, drinks[eng]) + } +} + +/* Output: +The following drinks are available: +wine +beer +water +coffee +thea + +The french for wine is vin +The french for beer is bière +The french for water is eau +The french for coffee is café +The french for thea is thé + +Now the sorted output: +The following sorted drinks are available: +beer +coffee +thea +water +wine + +The french for beer is bière +The french for coffee is café +The french for thea is thé +The french for water is eau +The french for wine is vin +*/