Changeset 31956 in webkit

Timestamp:

Apr 16, 2008 12:34:29 PM (16 years ago)

Author:

Adam Roben

Message:

Make String.format return an array of unused substitutions

String.format now returns an object with two properties:
formattedResult and unusedSubstitutions.

Reviewed by Tim Hatcher.

• page/inspector/utilities.js: (String.vsprintf): Updated for changes to String.format. We throw away the array of unused substitutions. (String.format): Changed to keep track of which substitutions are used when formatting. We then return both the formatted result and the array of unused substitutions.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-15  Adam Roben  <aroben@apple.com>
+
+        Make String.format return an array of unused substitutions
+
+        String.format now returns an object with two properties:
+        formattedResult and unusedSubstitutions.
+
+        Reviewed by Tim Hatcher.
+
+        * page/inspector/utilities.js:
+        (String.vsprintf): Updated for changes to String.format. We throw away
+        the array of unused substitutions.
+        (String.format): Changed to keep track of which substitutions are used
+        when formatting. We then return both the formatted result and the
+        array of unused substitutions.
+
 2008-04-15  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/inspector/utilities.js

@@ -838 +838 @@
 String.vsprintf = function(format, substitutions)
 {
-    return String.format(format, substitutions, String.standardFormatters, "", function(a, b) { return a + b; });
+    return String.format(format, substitutions, String.standardFormatters, "", function(a, b) { return a + b; }).formattedResult;
 }
 
@@ -844 +844 @@
 {
     if (!format || !substitutions || !substitutions.length)
-        return append(initialValue, format);
+        return { formattedResult: append(initialValue, format), unusedSubstitutions: substitutions };
 
     function prettyFunctionName()
@@ -863 +863 @@
     var result = initialValue;
     var tokens = String.tokenizeFormatString(format);
+    var usedSubstitutionIndexes = {};
 
     for (var i = 0; i < tokens.length; ++i) {
@@ -885 +886 @@
         }
 
+        usedSubstitutionIndexes[token.substitutionIndex] = true;
+
         if (!(token.specifier in formatters)) {
             // Encountered an unsupported format character, treat as a string.
@@ -895 +898 @@
     }
 
-    return result;
-}
+    var unusedSubstitutions = [];
+    for (var i = 0; i < substitutions.length; ++i) {
+        if (i in usedSubstitutionIndexes)
+            continue;
+        unusedSubstitutions.push(substitutions[i]);
+    }
+
+    return { formattedResult: result, unusedSubstitutions: unusedSubstitutions };
+}