Added parseUnsignedInteger.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4906 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/as/com/threerings/util/StringUtil.as

@@ -101,45 +101,28 @@ public class StringUtil
      */
     public static function parseInteger (str :String, radix :uint = 0) :int
     {
-        if (str == null) {
+        return int(parseInt0(str, radix, true));
-            throw new ArgumentError("Cannot parseInt(null)");
+    }
+
+    /**
+     * Parse an integer more anally than the built-in parseInt() function,
+     * throwing an ArgumentError if there are any invalid characters.
+     *
+     * The built-in parseInt() will ignore trailing non-integer characters.
+     *
+     * @param str The string to parse.
+     * @param radix The radix to use, from 2 to 16. If not specified the radix will be 10,
+     *        unless the String begins with "0x" in which case it will be 16,
+     *        or the String begins with "0" in which case it will be 8.
+     */
+    public static function parseUnsignedInteger (str :String, radix :uint = 0) :uint
+    {
+        var result :Number = parseInt0(str, radix, false);
+        if (result < 0) {
+            throw new ArgumentError("parseUnsignedInteger parsed negative value [value=" + str +
+                "].");
         }
-
+        return uint(result);
-        if (radix == 0) {
-            if (startsWith(str, "0x")) {
-                str = str.substring(2);
-                radix = 16;
-
-            } else if (startsWith(str, "0")) {
-                str = str.substring(1);
-                radix = 8;
-
-            } else {
-                radix = 10;
-            }
-
-        } else if (radix == 16 && startsWith(str, "0x")) {
-            str = str.substring(2);
-
-        } else if (radix < 2 || radix > 16) {
-            throw new ArgumentError("Radix out of range: " + radix);
-        }
-
-        // now verify that str only contains valid chars for the radix
-        for (var ii :int = 0; ii < str.length; ii++) {
-            var dex :int = HEX.indexOf(str.charAt(ii).toLowerCase());
-            if (dex == -1 || dex >= radix) {
-                throw new ArgumentError("Invalid characters in String parseInt='" + arguments[0] +
-                    "', radix=" + radix);
-            }
-        }
-
-        var result :Number = parseInt(str, radix);
-        if (isNaN(result)) {
-            // this shouldn't happen..
-            throw new ArgumentError("Could not parseInt=" + arguments[0]);
-        }
-        return int(result);
     }
 
     /**
@@ -344,6 +327,60 @@ public class StringUtil
         return data;
     }
 
+    /**
+     * Internal helper function for parseInteger and parseUnsignedInteger.
+     */
+    protected static function parseInt0 (str :String, radix :uint, allowNegative :Boolean) :Number
+    {
+        if (str == null) {
+            throw new ArgumentError("Cannot parseInt(null)");
+        }
+
+        var negative :Boolean = (str.charAt(0) == "-");
+        if (negative) {
+            str = str.substring(1);
+        }
+
+        if (radix == 0) {
+            if (startsWith(str, "0x")) {
+                str = str.substring(2);
+                radix = 16;
+
+            } else if (startsWith(str, "0")) {
+                str = str.substring(1);
+                radix = 8;
+
+            } else {
+                radix = 10;
+            }
+
+        } else if (radix == 16 && startsWith(str, "0x")) {
+            str = str.substring(2);
+
+        } else if (radix < 2 || radix > 16) {
+            throw new ArgumentError("Radix out of range: " + radix);
+        }
+
+        // now verify that str only contains valid chars for the radix
+        for (var ii :int = 0; ii < str.length; ii++) {
+            var dex :int = HEX.indexOf(str.charAt(ii).toLowerCase());
+            if (dex == -1 || dex >= radix) {
+                throw new ArgumentError("Invalid characters in String parseInt='" + arguments[0] +
+                    "', radix=" + radix);
+            }
+        }
+
+        var result :Number = parseInt(str, radix);
+        if (isNaN(result)) {
+            // this shouldn't happen..
+            throw new ArgumentError("Could not parseInt=" + arguments[0]);
+        }
+        if (negative) {
+            result *= -1;
+        }
+        return result;
+    }
+
     /** Hexidecimal digits. */
     protected static const HEX :Array = [ "0", "1", "2", "3", "4",
         "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" ];