Changeset 17619 in webkit

Timestamp:

Nov 6, 2006 9:08:16 AM (17 years ago)

Author:

thatcher

Message:

Reviewed by Maciej.

Bug 11525: [Drosera] function menu doesn't understand object.method = function() {} syntax
​http://bugs.webkit.org/show_bug.cgi?id=11525

• Drosera/debugger.js: imporved the function name code

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Drosera/debugger.js (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2006-11-05  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Maciej.
+
+        Bug 11525: [Drosera] function menu doesn't understand object.method = function() {} syntax
+        http://bugs.webkit.org/show_bug.cgi?id=11525
+
+        * Drosera/debugger.js: imporved the function name code
+
 2006-11-06  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebKitTools/Drosera/debugger.js

@@ -801 +801 @@
             if (keywords[keyword]) {
                 var functionName = "";
+                var functionIsAnonymous = false;
                 if (keyword == "function") {
                     var functionKeywordOffset = 8;
-                    var functionNameChar = "";
-                    
-                    if (code.charAt(i + functionKeywordOffset) == " ") { 
-                        functionNameChar = code.charAt(i + functionKeywordOffset + 1);
-                        functionKeywordOffset++;
-                    } else
-                        functionNameChar = code.charAt(i + functionKeywordOffset);
-                    
-                    if (functionNameChar == "(") {
+                    for (var j = i + functionKeywordOffset; j < code.length; j++) {
+                        cj = code.charAt(j);
+                        if (cj == " ")
+                            continue;
+                        if (cj == "(")
+                            break;
+                        functionName += cj;
+                    }
+
+                    if (!functionName.length) {
+                        functionIsAnonymous = true;
+                        var functionAssignmentFound = false;
+                        var functionNameStart = -1;
+                        var functionNameEnd = -1;
+
+                        for (var j = i - 1; j >= 0; j--) {
+                            cj = code.charAt(j);
+                            if (cj == ":" || cj == "=") {
+                                functionAssignmentFound = true;
+                                continue;
+                            }
+
+                            var curCharIsSpace = (cj == " " || cj == "\t" || cj == "\n");
+                            if (functionAssignmentFound && functionNameEnd == -1 && !curCharIsSpace) {
+                                functionNameEnd = j + 1;
+                            } else if (!functionAssignmentFound && !curCharIsSpace) {
+                                break;
+                            } else if (functionNameEnd != -1 && curCharIsSpace) {
+                                functionNameStart = j;
+                                break;
+                            }
+                        }
+
+                        if (functionNameStart != -1 && functionNameEnd != -1)
+                            functionName = code.substring(functionNameStart, functionNameEnd);
+                    }
+
+                    if (!functionName.length)
                         functionName = "function";
-                        file.functionNames.push(functionName);
-                    } else {
-                        while (functionNameChar != "(") {
-                            functionName += functionNameChar;                        
-                            functionKeywordOffset++;
-                            functionNameChar = code.charAt(i + functionKeywordOffset);
-                            if ((i + functionKeywordOffset) >= code.length || functionNameChar == " " || functionNameChar == "\n") break;
-                        }
-                    }
+
+                    file.functionNames.push(functionName);
                 }
 
                 var fileIndex = filesLookup[file.url];
 
-                if (functionName == "function") 
+                if (keyword == "function") 
                     result += "<span class=\"keyword\"><a name=\"function-" + fileIndex + "-" + file.functionNames.length + "\" id=\"" + fileIndex + "-" + file.functionNames.length + "\">" + keyword + "</a></span>";
                 else
                     result += "<span class=\"keyword\">" + keyword + "</span>";
-                
-                if (functionName.length > 0 && functionName != "function") {
-                    file.functionNames.push(functionName);
+
+                if (functionName.length && !functionIsAnonymous) {
                     result += " <a name=\"function-" + fileIndex + "-" + file.functionNames.length + "\" id=\"" + fileIndex + "-" + file.functionNames.length + "\">" + functionName + "</a>";
                     i += keyword.length + functionName.length;
                 } else
                     i += keyword.length - 1;
-                
+
                 continue;
             }