Commit 934c7680 authored by Rob Pike's avatar Rob Pike

doc: update tutorial.

Fix for new regexp library ($ isn't end of line any more).
Don't assume . is in PATH.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/5175052
parent bba7396f
...@@ -95,7 +95,7 @@ Here's how to compile and run our program. With <code>6g</code>, say, ...@@ -95,7 +95,7 @@ Here's how to compile and run our program. With <code>6g</code>, say,
<pre> <pre>
$ 6g helloworld.go # compile; object goes into helloworld.6 $ 6g helloworld.go # compile; object goes into helloworld.6
$ 6l helloworld.6 # link; output goes into 6.out $ 6l helloworld.6 # link; output goes into 6.out
$ 6.out $ ./6.out
Hello, world; or Καλημέρα κόσμε; or こんにちは 世界 Hello, world; or Καλημέρα κόσμε; or こんにちは 世界
$ $
</pre> </pre>
...@@ -544,13 +544,12 @@ composite literal, as is done here in the <code>return</code> statement from <co ...@@ -544,13 +544,12 @@ composite literal, as is done here in the <code>return</code> statement from <co
<p> <p>
We can use the factory to construct some familiar, exported variables of type <code>*File</code>: We can use the factory to construct some familiar, exported variables of type <code>*File</code>:
<p> <p>
<pre><!--{{code "progs/file.go" `/var/` `/^.$/`}} <pre><!--{{code "progs/file.go" `/var/` `/^\)/`}}
-->var ( -->var (
Stdin = newFile(syscall.Stdin, &#34;/dev/stdin&#34;) Stdin = newFile(syscall.Stdin, &#34;/dev/stdin&#34;)
Stdout = newFile(syscall.Stdout, &#34;/dev/stdout&#34;) Stdout = newFile(syscall.Stdout, &#34;/dev/stdout&#34;)
Stderr = newFile(syscall.Stderr, &#34;/dev/stderr&#34;) Stderr = newFile(syscall.Stderr, &#34;/dev/stderr&#34;)
) )
</pre> </pre>
<p> <p>
The <code>newFile</code> function was not exported because it's internal. The proper, The <code>newFile</code> function was not exported because it's internal. The proper,
......
...@@ -87,7 +87,7 @@ Here's how to compile and run our program. With <code>6g</code>, say, ...@@ -87,7 +87,7 @@ Here's how to compile and run our program. With <code>6g</code>, say,
<pre> <pre>
$ 6g helloworld.go # compile; object goes into helloworld.6 $ 6g helloworld.go # compile; object goes into helloworld.6
$ 6l helloworld.6 # link; output goes into 6.out $ 6l helloworld.6 # link; output goes into 6.out
$ 6.out $ ./6.out
Hello, world; or Καλημέρα κόσμε; or こんにちは 世界 Hello, world; or Καλημέρα κόσμε; or こんにちは 世界
$ $
</pre> </pre>
...@@ -470,7 +470,7 @@ composite literal, as is done here in the <code>return</code> statement from <co ...@@ -470,7 +470,7 @@ composite literal, as is done here in the <code>return</code> statement from <co
<p> <p>
We can use the factory to construct some familiar, exported variables of type <code>*File</code>: We can use the factory to construct some familiar, exported variables of type <code>*File</code>:
<p> <p>
{{code "progs/file.go" `/var/` `/^.$/`}} {{code "progs/file.go" `/var/` `/^\)/`}}
<p> <p>
The <code>newFile</code> function was not exported because it's internal. The proper, The <code>newFile</code> function was not exported because it's internal. The proper,
exported factory to use is <code>OpenFile</code> (we'll explain that name in a moment): exported factory to use is <code>OpenFile</code> (we'll explain that name in a moment):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment