Permalink
Browse files

A square can't have different width and height

  • Loading branch information...
1 parent 518a807 commit 8b66bf7fcbae5648002facf25f58052fbee6ae03 @mmcgrana committed Apr 19, 2015
Showing with 23 additions and 23 deletions.
  1. +10 −10 examples/interfaces/interfaces.go
  2. +2 −2 examples/interfaces/interfaces.hash
  3. +11 −11 public/interfaces
View
20 examples/interfaces/interfaces.go
@@ -13,8 +13,8 @@ type geometry interface {
}
// For our example we'll implement this interface on
-// `square` and `circle` types.
-type square struct {
+// `rect` and `circle` types.
+type rect struct {
width, height float64
}
type circle struct {
@@ -23,12 +23,12 @@ type circle struct {
// To implement an interface in Go, we just need to
// implement all the methods in the interface. Here we
-// implement `geometry` on `square`s.
-func (s square) area() float64 {
- return s.width * s.height
+// implement `geometry` on `rect`s.
+func (r rect) area() float64 {
+ return r.width * r.height
}
-func (s square) perim() float64 {
- return 2*s.width + 2*s.height
+func (r rect) perim() float64 {
+ return 2*r.width + 2*r.height
}
// The implementation for `circle`s.
@@ -50,13 +50,13 @@ func measure(g geometry) {
}
func main() {
- s := square{width: 3, height: 4}
+ r := rect{width: 3, height: 4}
c := circle{radius: 5}
- // The `circle` and `square` struct types both
+ // The `circle` and `rect` struct types both
// implement the `geometry` interface so we can use
// instances of
// these structs as arguments to `measure`.
- measure(s)
+ measure(r)
measure(c)
}
View
4 examples/interfaces/interfaces.hash
@@ -1,2 +1,2 @@
-9bafbade1f5effc38be233c3fd12cbdd7c6e226d
-guxTzcucR-
+3547b935d1e0322c0fb696726c27cae53a275e0a
+313UebA3rD
View
22 public/interfaces
@@ -40,7 +40,7 @@ signatures.</p>
</td>
<td class="code leading">
- <a href="http://play.golang.org/p/guxTzcucR-"><img title="Run code" src="play.png" class="run" /></a>
+ <a href="http://play.golang.org/p/313UebA3rD"><img title="Run code" src="play.png" class="run" /></a>
<div class="highlight"><pre><span class="kn">package</span> <span class="nx">main</span>
</pre></div>
@@ -79,12 +79,12 @@ signatures.</p>
<tr>
<td class="docs">
<p>For our example we&rsquo;ll implement this interface on
-<code>square</code> and <code>circle</code> types.</p>
+<code>rect</code> and <code>circle</code> types.</p>
</td>
<td class="code leading">
- <div class="highlight"><pre><span class="kd">type</span> <span class="nx">square</span> <span class="kd">struct</span> <span class="p">{</span>
+ <div class="highlight"><pre><span class="kd">type</span> <span class="nx">rect</span> <span class="kd">struct</span> <span class="p">{</span>
<span class="nx">width</span><span class="p">,</span> <span class="nx">height</span> <span class="kt">float64</span>
<span class="p">}</span>
<span class="kd">type</span> <span class="nx">circle</span> <span class="kd">struct</span> <span class="p">{</span>
@@ -99,16 +99,16 @@ signatures.</p>
<td class="docs">
<p>To implement an interface in Go, we just need to
implement all the methods in the interface. Here we
-implement <code>geometry</code> on <code>square</code>s.</p>
+implement <code>geometry</code> on <code>rect</code>s.</p>
</td>
<td class="code leading">
- <div class="highlight"><pre><span class="kd">func</span> <span class="p">(</span><span class="nx">s</span> <span class="nx">square</span><span class="p">)</span> <span class="nx">area</span><span class="p">()</span> <span class="kt">float64</span> <span class="p">{</span>
- <span class="k">return</span> <span class="nx">s</span><span class="p">.</span><span class="nx">width</span> <span class="o">*</span> <span class="nx">s</span><span class="p">.</span><span class="nx">height</span>
+ <div class="highlight"><pre><span class="kd">func</span> <span class="p">(</span><span class="nx">r</span> <span class="nx">rect</span><span class="p">)</span> <span class="nx">area</span><span class="p">()</span> <span class="kt">float64</span> <span class="p">{</span>
+ <span class="k">return</span> <span class="nx">r</span><span class="p">.</span><span class="nx">width</span> <span class="o">*</span> <span class="nx">r</span><span class="p">.</span><span class="nx">height</span>
<span class="p">}</span>
-<span class="kd">func</span> <span class="p">(</span><span class="nx">s</span> <span class="nx">square</span><span class="p">)</span> <span class="nx">perim</span><span class="p">()</span> <span class="kt">float64</span> <span class="p">{</span>
- <span class="k">return</span> <span class="mi">2</span><span class="o">*</span><span class="nx">s</span><span class="p">.</span><span class="nx">width</span> <span class="o">+</span> <span class="mi">2</span><span class="o">*</span><span class="nx">s</span><span class="p">.</span><span class="nx">height</span>
+<span class="kd">func</span> <span class="p">(</span><span class="nx">r</span> <span class="nx">rect</span><span class="p">)</span> <span class="nx">perim</span><span class="p">()</span> <span class="kt">float64</span> <span class="p">{</span>
+ <span class="k">return</span> <span class="mi">2</span><span class="o">*</span><span class="nx">r</span><span class="p">.</span><span class="nx">width</span> <span class="o">+</span> <span class="mi">2</span><span class="o">*</span><span class="nx">r</span><span class="p">.</span><span class="nx">height</span>
<span class="p">}</span>
</pre></div>
@@ -160,7 +160,7 @@ to work on any <code>geometry</code>.</p>
<td class="code leading">
<div class="highlight"><pre><span class="kd">func</span> <span class="nx">main</span><span class="p">()</span> <span class="p">{</span>
- <span class="nx">s</span> <span class="o">:=</span> <span class="nx">square</span><span class="p">{</span><span class="nx">width</span><span class="p">:</span> <span class="mi">3</span><span class="p">,</span> <span class="nx">height</span><span class="p">:</span> <span class="mi">4</span><span class="p">}</span>
+ <span class="nx">r</span> <span class="o">:=</span> <span class="nx">rect</span><span class="p">{</span><span class="nx">width</span><span class="p">:</span> <span class="mi">3</span><span class="p">,</span> <span class="nx">height</span><span class="p">:</span> <span class="mi">4</span><span class="p">}</span>
<span class="nx">c</span> <span class="o">:=</span> <span class="nx">circle</span><span class="p">{</span><span class="nx">radius</span><span class="p">:</span> <span class="mi">5</span><span class="p">}</span>
</pre></div>
@@ -169,15 +169,15 @@ to work on any <code>geometry</code>.</p>
<tr>
<td class="docs">
- <p>The <code>circle</code> and <code>square</code> struct types both
+ <p>The <code>circle</code> and <code>rect</code> struct types both
implement the <code>geometry</code> interface so we can use
instances of
these structs as arguments to <code>measure</code>.</p>
</td>
<td class="code">
- <div class="highlight"><pre> <span class="nx">measure</span><span class="p">(</span><span class="nx">s</span><span class="p">)</span>
+ <div class="highlight"><pre> <span class="nx">measure</span><span class="p">(</span><span class="nx">r</span><span class="p">)</span>
<span class="nx">measure</span><span class="p">(</span><span class="nx">c</span><span class="p">)</span>
<span class="p">}</span>
</pre></div>

0 comments on commit 8b66bf7

Please sign in to comment.