Changeset 31954 in webkit

Timestamp:

Apr 16, 2008 12:20:21 PM (16 years ago)

Author:

Adam Roben

Message:

Add String.format

String.format is a more generic form of String.vsprintf that takes a
set of formatter functions, one for each supported format specifier.
Each formatter function is passed the relevant token and substitution
value, and returns the formatted result.

Reviewed by Tim Hatcher.

• page/inspector/utilities.js: (String.standardFormatters): Added. (String.vsprintf): Changed to call through to String.format. (String.format): Added. Most of the code came from String.vsprintf, except that we use the passed-in formatters to format the substitutions rather than hard-coding how to handle each format specifier.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/utilities.js (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-15  Adam Roben  <aroben@apple.com>
+
+        Add String.format
+
+        String.format is a more generic form of String.vsprintf that takes a
+        set of formatter functions, one for each supported format specifier.
+        Each formatter function is passed the relevant token and substitution
+        value, and returns the formatted result.
+
+        Reviewed by Tim Hatcher.
+
+        * page/inspector/utilities.js:
+        (String.standardFormatters): Added.
+        (String.vsprintf): Changed to call through to String.format.
+        (String.format): Added. Most of the code came from String.vsprintf,
+        except that we use the passed-in formatters to format the
+        substitutions rather than hard-coding how to handle each format
+        specifier.
+
 2008-04-15  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/inspector/utilities.js

@@ -815 +815 @@
 }
 
+String.standardFormatters = {
+    d: function(substitution)
+    {
+        substitution = parseInt(substitution);
+        return !isNaN(substitution) ? substitution : 0;
+    },
+
+    f: function(substitution, token)
+    {
+        substitution = parseFloat(substitution);
+        if (substitution && token.precision > -1)
+            substitution = substitution.toFixed(token.precision);
+        return !isNaN(substitution) ? substitution : (token.precision > -1 ? Number(0).toFixed(token.precision) : 0);
+    },
+
+    s: function(substitution)
+    {
+        return substitution;
+    },
+};
+
 String.vsprintf = function(format, substitutions)
+{
+    return String.format(format, substitutions, String.standardFormatters);
+}
+
+String.format = function(format, substitutions, formatters)
 {
     if (!format || !substitutions || !substitutions.length)
@@ -822 +848 @@
     function prettyFunctionName()
     {
-        return "String.vsprintf(\"" + format + "\", \"" + substitutions.join("\", \"") + "\")";
+        return "String.format(\"" + format + "\", \"" + substitutions.join("\", \"") + "\")";
     }
 
@@ -859 +885 @@
         }
 
-        switch (token.specifier) {
-        case "d":
-            var substitution = parseInt(substitutions[token.substitutionIndex]);
-            result += (!isNaN(substitution) ? substitution : 0);
-            break;
-        case "f":
-            var substitution = parseFloat(substitutions[token.substitutionIndex]);
-            if (substitution && token.precision > -1)
-                substitution = substitution.toFixed(token.precision);
-            result += (!isNaN(substitution) ? substitution : (token.precision > -1 ? Number(0).toFixed(token.precision) : 0));
-            break;
-        default:
+        if (!(token.specifier in formatters)) {
             // Encountered an unsupported format character, treat as a string.
             warn("unsupported format character \u201C" + token.specifier + "\u201D. Treating as a string.");
-            // Fall through to treat this like a string.
-        case "s":
             result += substitutions[token.substitutionIndex];
-            break;
-        }
+            continue;
+        }
+
+        result += formatters[token.specifier](substitutions[token.substitutionIndex], token);
     }