c2-m3

c2-m3/animal.go

@@ -27,43 +27,25 @@ func (animal *Animal) Speak() {
 }
 
 func main() {
-	cow := Animal{food: "grass", locomotion: "walk", noise: "moo"}
-	bird := Animal{"worms", "fly", "peep"}
-	snake := Animal{"mice", "slither", "hsss"}
+	animals := map[string]Animal{
+		"cow":   {food: "grass", locomotion: "walk", noise: "moo"},
+		"bird":  {"worms", "fly", "peep"},
+		"snake": {"mice", "slither", "hsss"},
+	}
+
 	for {
 		var s1, s2 string
 		fmt.Println("Please input request as 2 strings seperate by a space")
 		fmt.Print(">")
 		fmt.Scan(&s1, &s2)
-		switch s1 {
-		case "cow":
-			switch s2 {
-			case "eat":
-				cow.Eat()
-			case "move":
-				cow.Move()
-			case "speak":
-				cow.Speak()
-			}
-		case "bird":
-			switch s2 {
-			case "eat":
-				bird.Eat()
-			case "move":
-				bird.Move()
-			case "speak":
-				bird.Speak()
-			}
-		case "snake":
-			switch s2 {
-			case "eat":
-				snake.Eat()
-			case "move":
-				snake.Move()
-			case "speak":
-				snake.Speak()
-			}
-
+		animal := animals[s1]
+		switch s2 {
+		case "eat":
+			animal.Eat()
+		case "move":
+			animal.Move()
+		case "speak":
+			animal.Speak()
 		}
 	}
 }