This commit is contained in:
Mark McGranaghan 2012-09-29 13:56:18 -07:00
parent d5cf88f7e7
commit 1926596693
3 changed files with 20 additions and 20 deletions

View File

@ -114,8 +114,8 @@ table td {
td.linenos { background-color: #f0f0f0; padding-right: 10px; } td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; } span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
body .hll { background-color: #ffffcc } body .hll { background-color: #ffffcc }
body .c { color: #408080; font-style: italic } /* Comment */
body .err { border: 1px solid #FF0000 } /* Error */ body .err { border: 1px solid #FF0000 } /* Error */
body .c { color: #408080; font-style: italic } /* Comment */
body .k { color: #954121 } /* Keyword */ body .k { color: #954121 } /* Keyword */
body .o { color: #666666 } /* Operator */ body .o { color: #666666 } /* Operator */
body .cm { color: #408080; font-style: italic } /* Comment.Multiline */ body .cm { color: #408080; font-style: italic } /* Comment.Multiline */

View File

@ -13,7 +13,7 @@
<thead> <thead>
<tr><td class=docs></td><td class=code></td></tr> <tr><td class=docs></td><td class=code></td></tr>
</thead> </thead>
<tbody><tr><td class=docs><h2>Line Filters</h2> <tbody><tr><td class=docs><h2>golit</h2>
</td><td class=code><div class="highlight"><pre> </td><td class=code><div class="highlight"><pre>
</pre></div> </pre></div>
</td></tr> </td></tr>
@ -46,18 +46,18 @@ documentation form Go source files.</p>
</pre></div> </pre></div>
</td></tr> </td></tr>
<tr><td class=docs><p>For docs and code rendering: pipe source data <tr><td class=docs><p>We'll implement Markdown rendering and Pygments syntax
through binary at path with given argv, return highlighting by piping data through external programs.
the output.</p> This is a general helper for handling both cases.</p>
</td><td class=code><div class="highlight"><pre><span class="k">func</span> <span class="n">pipedCmd</span><span class="p">(</span><span class="n">path</span> <span class="nb">string</span><span class="p">,</span> <span class="n">argv</span> <span class="p">[]</span><span class="nb">string</span><span class="p">,</span> <span class="n">source</span> <span class="nb">string</span><span class="p">)</span> <span class="nb">string</span> <span class="p">{</span> </td><td class=code><div class="highlight"><pre><span class="k">func</span> <span class="n">pipedCmd</span><span class="p">(</span><span class="n">binary</span> <span class="nb">string</span><span class="p">,</span> <span class="n">argv</span> <span class="p">[]</span><span class="nb">string</span><span class="p">,</span> <span class="n">input</span> <span class="nb">string</span><span class="p">)</span> <span class="nb">string</span> <span class="p">{</span>
<span class="n">cmd</span> <span class="p">:=</span> <span class="n">exec</span><span class="p">.</span><span class="n">Command</span><span class="p">(</span><span class="n">path</span><span class="p">,</span> <span class="n">argv</span><span class="p">...)</span> <span class="n">cmd</span> <span class="p">:=</span> <span class="n">exec</span><span class="p">.</span><span class="n">Command</span><span class="p">(</span><span class="n">binary</span><span class="p">,</span> <span class="n">argv</span><span class="p">...)</span>
<span class="n">in</span><span class="p">,</span> <span class="n">err</span> <span class="p">:=</span> <span class="n">cmd</span><span class="p">.</span><span class="n">StdinPipe</span><span class="p">()</span> <span class="n">in</span><span class="p">,</span> <span class="n">err</span> <span class="p">:=</span> <span class="n">cmd</span><span class="p">.</span><span class="n">StdinPipe</span><span class="p">()</span>
<span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span>
<span class="n">out</span><span class="p">,</span> <span class="n">err</span> <span class="p">:=</span> <span class="n">cmd</span><span class="p">.</span><span class="n">StdoutPipe</span><span class="p">()</span> <span class="n">out</span><span class="p">,</span> <span class="n">err</span> <span class="p">:=</span> <span class="n">cmd</span><span class="p">.</span><span class="n">StdoutPipe</span><span class="p">()</span>
<span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span>
<span class="n">err</span> <span class="p">=</span> <span class="n">cmd</span><span class="p">.</span><span class="n">Start</span><span class="p">()</span> <span class="n">err</span> <span class="p">=</span> <span class="n">cmd</span><span class="p">.</span><span class="n">Start</span><span class="p">()</span>
<span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span>
<span class="n">in</span><span class="p">.</span><span class="n">Write</span><span class="p">([]</span><span class="nb">byte</span><span class="p">(</span><span class="n">source</span><span class="p">))</span> <span class="n">in</span><span class="p">.</span><span class="n">Write</span><span class="p">([]</span><span class="nb">byte</span><span class="p">(</span><span class="n">input</span><span class="p">))</span>
<span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span>
<span class="n">err</span> <span class="p">=</span> <span class="n">in</span><span class="p">.</span><span class="n">Close</span><span class="p">()</span> <span class="n">err</span> <span class="p">=</span> <span class="n">in</span><span class="p">.</span><span class="n">Close</span><span class="p">()</span>
<span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="n">check</span><span class="p">(</span><span class="n">err</span><span class="p">)</span>

View File

@ -1,4 +1,4 @@
// ## Line Filters // ## golit
// Generate literate-programming style HTML // Generate literate-programming style HTML
// documentation form Go source files. // documentation form Go source files.
@ -24,18 +24,18 @@ func check(err error) {
} }
} }
// For docs and code rendering: pipe source data // We'll implement Markdown rendering and Pygments syntax
// through binary at path with given argv, return // highlighting by piping data through external programs.
// the output. // This is a general helper for handling both cases.
func pipedCmd(path string, argv []string, source string) string { func pipedCmd(binary string, argv []string, input string) string {
cmd := exec.Command(path, argv...) cmd := exec.Command(binary, argv...)
in, err := cmd.StdinPipe() in, err := cmd.StdinPipe()
check(err) check(err)
out, err := cmd.StdoutPipe() out, err := cmd.StdoutPipe()
check(err) check(err)
err = cmd.Start() err = cmd.Start()
check(err) check(err)
in.Write([]byte(source)) in.Write([]byte(input))
check(err) check(err)
err = in.Close() err = in.Close()
check(err) check(err)