/gobyexample

Permalink
Browse files

Rebuild

  • Loading branch information...
1 parent e5ff8ba commit 7a06385ccfc61b01e82b0939979c0a5afe384bdf @mmcgrana committed Dec 19, 2013
Unified Split
Showing with 24 additions and 38 deletions.
  1. +4 −4 examples/line-filters/line-filters.go
  2. +2 −2 examples/line-filters/line-filters.hash
  3. +18 −32 public/line-filters
View
8 examples/line-filters/line-filters.go
@@ -22,16 +22,16 @@ func main() {
// advances the scanner to the next token; which is
// the next line in the default scanner.
scanner := bufio.NewScanner(os.Stdin)
-
+
for scanner.Scan() {
// `Text` returns the current token, here the next line,
- // from the input.
+ // from the input.
ucl := strings.ToUpper(scanner.Text())
-
+
// Write out the uppercased line.
fmt.Println(ucl)
}
-
+
// Check for errors during `Scan`. End of file is
// expected and not reported by `Scan` as an error.
if err := scanner.Err(); err != nil {
View
4 examples/line-filters/line-filters.hash
@@ -1,2 +1,2 @@
-fe6d70a3115bd0974aa6f3f8444bb539d17fc027
-OSS71nSpkV
+87f4a67edf741979f8ff6da85947aa177547f9ef
+mpYwOHj2ma
View
50 public/line-filters
@@ -45,7 +45,7 @@ pattern to write your own Go line filters.</p>
</td>
<td class="code leading">
- <a href="http://play.golang.org/p/OSS71nSpkV"><img title="Run code" src="play.png" class="run" /></a>
+ <a href="http://play.golang.org/p/mpYwOHj2ma"><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>
@@ -61,7 +61,6 @@ pattern to write your own Go line filters.</p>
<div class="highlight"><pre><span class="kn">import</span> <span class="p">(</span>
<span class="s">&quot;bufio&quot;</span>
<span class="s">&quot;fmt&quot;</span>
- <span class="s">&quot;io&quot;</span>
<span class="s">&quot;os&quot;</span>
<span class="s">&quot;strings&quot;</span>
<span class="p">)</span>
@@ -85,83 +84,70 @@ pattern to write your own Go line filters.</p>
<tr>
<td class="docs">
<p>Wrapping the unbuffered <code>os.Stdin</code> with a buffered
-reader gives us a convenient <code>ReadString</code> method
-that we&rsquo;ll use to read input line-by-line.</p>
+scanner gives us a convenient <code>Scan</code> method that
+advances the scanner to the next token; which is
+the next line in the default scanner.</p>
</td>
<td class="code leading">
- <div class="highlight"><pre> <span class="nx">rdr</span> <span class="o">:=</span> <span class="nx">bufio</span><span class="p">.</span><span class="nx">NewReader</span><span class="p">(</span><span class="nx">os</span><span class="p">.</span><span class="nx">Stdin</span><span class="p">)</span>
- <span class="nx">out</span> <span class="o">:=</span> <span class="nx">os</span><span class="p">.</span><span class="nx">Stdout</span>
+ <div class="highlight"><pre> <span class="nx">scanner</span> <span class="o">:=</span> <span class="nx">bufio</span><span class="p">.</span><span class="nx">NewScanner</span><span class="p">(</span><span class="nx">os</span><span class="p">.</span><span class="nx">Stdin</span><span class="p">)</span>
</pre></div>
</td>
</tr>
<tr>
<td class="docs">
- <p><code>ReadString</code> returns the next string from the
-input up to the given separator byte. We give the
-newline byte <code>'\n'</code> as our separator so we&rsquo;ll get
-successive input lines.</p>
+ <p><code>Text</code> returns the current token, here the next line,
+from the input.</p>
</td>
<td class="code leading">
- <div class="highlight"><pre> <span class="k">for</span> <span class="p">{</span>
- <span class="k">switch</span> <span class="nx">line</span><span class="p">,</span> <span class="nx">err</span> <span class="o">:=</span> <span class="nx">rdr</span><span class="p">.</span><span class="nx">ReadString</span><span class="p">(</span><span class="sc">&#39;\n&#39;</span><span class="p">);</span> <span class="nx">err</span> <span class="p">{</span>
+ <div class="highlight"><pre> <span class="k">for</span> <span class="nx">scanner</span><span class="p">.</span><span class="nx">Scan</span><span class="p">()</span> <span class="p">{</span>
</pre></div>
</td>
</tr>
<tr>
<td class="docs">
- <p>If the read succeeded (the read <code>err</code> is nil),
-write out out the uppercased line. Check for an
-error on this write as we do on the read.</p>
-
+
</td>
<td class="code leading">
- <div class="highlight"><pre> <span class="k">case</span> <span class="kc">nil</span><span class="p">:</span>
- <span class="nx">ucl</span> <span class="o">:=</span> <span class="nx">strings</span><span class="p">.</span><span class="nx">ToUpper</span><span class="p">(</span><span class="nx">line</span><span class="p">)</span>
- <span class="k">if</span> <span class="nx">_</span><span class="p">,</span> <span class="nx">err</span> <span class="p">=</span> <span class="nx">out</span><span class="p">.</span><span class="nx">WriteString</span><span class="p">(</span><span class="nx">ucl</span><span class="p">);</span> <span class="nx">err</span> <span class="o">!=</span> <span class="kc">nil</span> <span class="p">{</span>
- <span class="nx">fmt</span><span class="p">.</span><span class="nx">Fprintln</span><span class="p">(</span><span class="nx">os</span><span class="p">.</span><span class="nx">Stderr</span><span class="p">,</span> <span class="s">&quot;error:&quot;</span><span class="p">,</span> <span class="nx">err</span><span class="p">)</span>
- <span class="nx">os</span><span class="p">.</span><span class="nx">Exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
- <span class="p">}</span>
+ <div class="highlight"><pre> <span class="nx">ucl</span> <span class="o">:=</span> <span class="nx">strings</span><span class="p">.</span><span class="nx">ToUpper</span><span class="p">(</span><span class="nx">scanner</span><span class="p">.</span><span class="nx">Text</span><span class="p">())</span>
</pre></div>
</td>
</tr>
<tr>
<td class="docs">
- <p>The <code>EOF</code> error is expected when we reach the
-end of input, so exit gracefully in that case.</p>
+ <p>Write out the uppercased line.</p>
</td>
<td class="code leading">
- <div class="highlight"><pre> <span class="k">case</span> <span class="nx">io</span><span class="p">.</span><span class="nx">EOF</span><span class="p">:</span>
- <span class="nx">os</span><span class="p">.</span><span class="nx">Exit</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
+ <div class="highlight"><pre> <span class="nx">fmt</span><span class="p">.</span><span class="nx">Println</span><span class="p">(</span><span class="nx">ucl</span><span class="p">)</span>
+ <span class="p">}</span>
</pre></div>
</td>
</tr>
<tr>
<td class="docs">
- <p>Otherwise there&rsquo;s a problem; print the
-error and exit with non-zero status.</p>
+ <p>Check for errors during <code>Scan</code>. End of file is
+expected and not reported by <code>Scan</code> as an error.</p>
</td>
<td class="code">
- <div class="highlight"><pre> <span class="k">default</span><span class="p">:</span>
- <span class="nx">fmt</span><span class="p">.</span><span class="nx">Fprintln</span><span class="p">(</span><span class="nx">os</span><span class="p">.</span><span class="nx">Stderr</span><span class="p">,</span> <span class="s">&quot;error:&quot;</span><span class="p">,</span> <span class="nx">err</span><span class="p">)</span>
- <span class="nx">os</span><span class="p">.</span><span class="nx">Exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
- <span class="p">}</span>
+ <div class="highlight"><pre> <span class="k">if</span> <span class="nx">err</span> <span class="o">:=</span> <span class="nx">scanner</span><span class="p">.</span><span class="nx">Err</span><span class="p">();</span> <span class="nx">err</span> <span class="o">!=</span> <span class="kc">nil</span> <span class="p">{</span>
+ <span class="nx">fmt</span><span class="p">.</span><span class="nx">Fprintln</span><span class="p">(</span><span class="nx">os</span><span class="p">.</span><span class="nx">Stderr</span><span class="p">,</span> <span class="s">&quot;error:&quot;</span><span class="p">,</span> <span class="nx">err</span><span class="p">)</span>
+ <span class="nx">os</span><span class="p">.</span><span class="nx">Exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
<span class="p">}</span>
<span class="p">}</span>
</pre></div>

0 comments on commit 7a06385

Please sign in to comment.