From f8ed65b151c6d9e535c2ed70e5409644dcd7c497 Mon Sep 17 00:00:00 2001
From: Mark McGranaghan <mmcgrana@gmail.com>
Date: Thu, 25 Oct 2012 21:50:54 -0400
Subject: [PATCH] publish number-parsing

---
 examples.txt                                  |  4 +--
 examples/number-parsing/number-parsing.go     | 35 +++++++++++++------
 examples/number-parsing/number-parsing.sh     |  5 +--
 .../urls.go => url-parsing/url-parsing.go}    |  0
 .../urls.sh => url-parsing/url-parsing.sh}    |  2 +-
 5 files changed, 30 insertions(+), 16 deletions(-)
 rename examples/{urls/urls.go => url-parsing/url-parsing.go} (100%)
 rename examples/{urls/urls.sh => url-parsing/url-parsing.sh} (87%)

diff --git a/examples.txt b/examples.txt
index f4a0aa1..2d611e6 100644
--- a/examples.txt
+++ b/examples.txt
@@ -52,8 +52,8 @@ Defer
 # Epochs
 # Elapsed Time
 # Random Numbers
-# Number Parsing
-URLs
+Number Parsing
+URL Parsing
 SHA1 Hashes
 Base64 Encoding
 # Reading Files
diff --git a/examples/number-parsing/number-parsing.go b/examples/number-parsing/number-parsing.go
index 9c20c51..a2a71bd 100644
--- a/examples/number-parsing/number-parsing.go
+++ b/examples/number-parsing/number-parsing.go
@@ -1,29 +1,42 @@
+// Parsing numbers from strings is a basic but common task
+// in many programs; here's how to do it in Go.
+
 package main
 
-// Package `strconv` provides the number parsing.
+// The built-in package `strconv` provides the number
+// parsing.
 import "strconv"
 import "fmt"
 
 func main() {
-    // `64` tells how many bits of precision to parse.
+
+    // With `ParseFloat`, this `64` tells how many bits of
+    // precision to parse.
     f, _ := strconv.ParseFloat("1.234", 64)
     fmt.Println(f)
 
-    // `0` means infer the base from the string.
-    // `64` requires that the result fit in 64 bits.
+    // For `ParseInt`, the `0` means infer the base from
+    // the string. `64` requires that the result fit in 64
+    // bits.
     i, _ := strconv.ParseInt("123", 0, 64)
-    println(i)
+    fmt.Println(i)
 
     // `ParseInt` will recognize hex-formatted numbers.
-    d, _ := strconv.ParseInt("0x1b3e", 0, 64)
-    println(d)
+    d, _ := strconv.ParseInt("0x1c8", 0, 64)
+    fmt.Println(d)
 
-    // `Atoi` is a convenienice function for `int`
-    // parsing.
-    k, _ := strconv.Atoi("456")
-    println(k)
+    // A `ParseUint` is also available.
+    u, _ := strconv.ParseUint("789", 0, 64)
+    fmt.Println(u)
+
+    // `Atoi` is a convenience function for basic base-10
+    // `int` parsing.
+    k, _ := strconv.Atoi("135")
+    fmt.Println(k)
 
     // Parse functions return an error on bad input.
     _, e := strconv.Atoi("wat")
     fmt.Println(e)
 }
+
+// Next we'll look at another common parsing task: URLs.
diff --git a/examples/number-parsing/number-parsing.sh b/examples/number-parsing/number-parsing.sh
index ed5819d..f400856 100644
--- a/examples/number-parsing/number-parsing.sh
+++ b/examples/number-parsing/number-parsing.sh
@@ -1,6 +1,7 @@
-$ go run xx-number-parsing.go
+$ go run number-parsing.go 
 1.234
 123
-6974
 456
+789
+135
 strconv.ParseInt: parsing "wat": invalid syntax
diff --git a/examples/urls/urls.go b/examples/url-parsing/url-parsing.go
similarity index 100%
rename from examples/urls/urls.go
rename to examples/url-parsing/url-parsing.go
diff --git a/examples/urls/urls.sh b/examples/url-parsing/url-parsing.sh
similarity index 87%
rename from examples/urls/urls.sh
rename to examples/url-parsing/url-parsing.sh
index 40e7e53..9323124 100644
--- a/examples/urls/urls.sh
+++ b/examples/url-parsing/url-parsing.sh
@@ -1,6 +1,6 @@
 # Running our URL parsing program shows all the different
 # pieces that we extracted.
-$ go run urls.go 
+$ go run url-parsing.go 
 postgres
 user:pass
 user