cleanups of compile errors and subtle\n changes to the call structure so progammers see what the \n template pattern implemenation looks like at runtime

codethought2 · ochococo · commit b8a9cba9f131 · 2020-10-01T08:03:25.000+02:00
diff --git a/Design-Patterns.playground.zip b/Design-Patterns.playground.zip
diff --git a/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift b/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift
@@ -636,9 +636,9 @@ protocol Garden {
 extension Garden {
 
     func prepareGarden() {
-        func prepareSoil()
-        func plantSeeds()
-        func waterPlants()
+        prepareSoil()
+        plantSeeds()
+        waterPlants()
     }
 }
 
@@ -649,15 +649,15 @@ final class RoseGarden: Garden {
     }
 
     func prepareSoil() {
-        // Implementation
+        print ("prepare soil for rose garden")
     }
 
     func plantSeeds() {
-        // Implementation
+        print ("plant seeds for rose garden")
     }
 
     func waterPlants() {
-        // Implementation
+       print ("water the rose garden")
     }
 }
 
diff --git a/README.md b/README.md
@@ -706,9 +706,9 @@ protocol Garden {
 extension Garden {
 
     func prepareGarden() {
-        func prepareSoil()
-        func plantSeeds()
-        func waterPlants()
+        prepareSoil()
+        plantSeeds()
+        waterPlants()
     }
 }
 
@@ -719,15 +719,15 @@ final class RoseGarden: Garden {
     }
 
     func prepareSoil() {
-        // Implementation
+        print ("prepare soil for rose garden")
     }
 
     func plantSeeds() {
-        // Implementation
+        print ("plant seeds for rose garden")
     }
 
     func waterPlants() {
-        // Implementation
+       print ("water the rose garden")
     }
 }
 
diff --git a/source/behavioral/template_method.swift b/source/behavioral/template_method.swift
@@ -16,9 +16,9 @@ protocol Garden {
 extension Garden {
 
     func prepareGarden() {
-        func prepareSoil()
-        func plantSeeds()
-        func waterPlants()
+        prepareSoil()
+        plantSeeds()
+        waterPlants()
     }
 }
 
@@ -29,15 +29,15 @@ final class RoseGarden: Garden {
     }
 
     func prepareSoil() {
-        // Implementation
+        print ("prepare soil for rose garden")
     }
 
     func plantSeeds() {
-        // Implementation
+        print ("plant seeds for rose garden")
     }
 
     func waterPlants() {
-        // Implementation
+       print ("water the rose garden")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -636,9 +636,9 @@ protocol Garden {`
`636`	`636`	`extension Garden {`
`637`	`637`
`638`	`638`	`func prepareGarden() {`
`639`		`- func prepareSoil()`
`640`		`- func plantSeeds()`
`641`		`- func waterPlants()`
	`639`	`+ prepareSoil()`
	`640`	`+ plantSeeds()`
	`641`	`+ waterPlants()`
`642`	`642`	`}`
`643`	`643`	`}`
`644`	`644`
`@@ -649,15 +649,15 @@ final class RoseGarden: Garden {`
`649`	`649`	`}`
`650`	`650`
`651`	`651`	`func prepareSoil() {`
`652`		`- // Implementation`
	`652`	`+ print ("prepare soil for rose garden")`
`653`	`653`	`}`
`654`	`654`
`655`	`655`	`func plantSeeds() {`
`656`		`- // Implementation`
	`656`	`+ print ("plant seeds for rose garden")`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`func waterPlants() {`
`660`		`- // Implementation`
	`660`	`+ print ("water the rose garden")`
`661`	`661`	`}`
`662`	`662`	`}`
`663`	`663`
Original file line number	Diff line number	Diff line change
`@@ -706,9 +706,9 @@ protocol Garden {`
`706`	`706`	`extension Garden {`
`707`	`707`
`708`	`708`	`func prepareGarden() {`
`709`		`- func prepareSoil()`
`710`		`- func plantSeeds()`
`711`		`- func waterPlants()`
	`709`	`+ prepareSoil()`
	`710`	`+ plantSeeds()`
	`711`	`+ waterPlants()`
`712`	`712`	`}`
`713`	`713`	`}`
`714`	`714`
`@@ -719,15 +719,15 @@ final class RoseGarden: Garden {`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`func prepareSoil() {`
`722`		`- // Implementation`
	`722`	`+ print ("prepare soil for rose garden")`
`723`	`723`	`}`
`724`	`724`
`725`	`725`	`func plantSeeds() {`
`726`		`- // Implementation`
	`726`	`+ print ("plant seeds for rose garden")`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`func waterPlants() {`
`730`		`- // Implementation`
	`730`	`+ print ("water the rose garden")`
`731`	`731`	`}`
`732`	`732`	`}`
`733`	`733`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ protocol Garden {`
`16`	`16`	`extension Garden {`
`17`	`17`
`18`	`18`	`func prepareGarden() {`
`19`		`- func prepareSoil()`
`20`		`- func plantSeeds()`
`21`		`- func waterPlants()`
	`19`	`+ prepareSoil()`
	`20`	`+ plantSeeds()`
	`21`	`+ waterPlants()`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`@@ -29,15 +29,15 @@ final class RoseGarden: Garden {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func prepareSoil() {`
`32`		`- // Implementation`
	`32`	`+ print ("prepare soil for rose garden")`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func plantSeeds() {`
`36`		`- // Implementation`
	`36`	`+ print ("plant seeds for rose garden")`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func waterPlants() {`
`40`		`- // Implementation`
	`40`	`+ print ("water the rose garden")`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`