Bug fix for appropriate Go identifier names

Author: mholt

README.md

@@ -12,6 +12,6 @@ Contributions are welcome! Open a pull request to fix a bug, or open an issue to
 
 ### Credits
 
-JSON-to-Go is brought to you by Matt Holt.
+JSON-to-Go is brought to you by Matt Holt ([mholt6](https://twitter.com/mholt6)).
 
 The Go Gopher is originally by Renee French. This artwork is an adaptation.

json-to-go.js

@@ -27,7 +27,7 @@ function jsonToGo(json, typename)
 		};
 	}
 
-	typename = format(typename || "GIVE_ME_A_NAME");
+	typename = format(typename || "AutoGenerated");
 	append("type "+typename+" ");
 
 	parseScope(scope);
@@ -93,20 +93,24 @@ function jsonToGo(json, typename)
 		go += str;
 	}
 
+	// Sanitizes and formats a string to make an appropriate identifier in Go
 	function format(str)
 	{
-		if (str.match(/^\d+$/))
-			str = "Number" + str;
+		if (!str)
+			return "";
+		else if (str.match(/^\d+$/))
+			str = "Num" + str;
 		else if (str.charAt(0).match(/\d/))
 		{
 			var numbers = {'0': "Zero_", '1': "One_", '2': "Two_", '3': "Three_",
 				'4': "Four_", '5': "Five_", '6': "Six_", '7': "Seven_",
 				'8': "Eight_", '9': "Nine_"};
 			str = numbers[str.charAt(0)] + str.substr(1);
 		}
-		return toProperCase(str).replace(/\s|_|-/g, "");
+		return toProperCase(str).replace(/[^a-z0-9]/ig, "");
 	}
 
+	// Determines the most appropriate Go type
 	function goType(val)
 	{
 		if (val === null)
@@ -140,6 +144,7 @@ function jsonToGo(json, typename)
 		}
 	}
 
+	// Given two types, returns the more specific of the two
 	function mostSpecificPossibleGoType(typ1, typ2)
 	{
 		if (typ1.substr(0, 5) == "float"
@@ -152,6 +157,7 @@ function jsonToGo(json, typename)
 			return "interface{}";
 	}
 
+	// Proper cases a string according to Go conventions
 	function toProperCase(str)
 	{
 		// https://github.com/golang/lint/blob/39d15d55e9777df34cdffde4f406ab27fd2e60c0/lint.go#L695-L731
@@ -162,7 +168,7 @@ function jsonToGo(json, typename)
 			"URL", "UTF8", "VM", "XML", "XSRF", "XSS"
 		];
 
-		return str.replace(/(^|[\s_-])([a-z]+)/g, function(unused, sep, frag)
+		return str.replace(/(^|[^a-z])([a-z]+)/ig, function(unused, sep, frag)
 		{
 			if (commonInitialisms.indexOf(frag.toUpperCase()) >= 0)
 				return sep + frag.toUpperCase();