Fixing findFunctionName regex to conform to spec, closes stacktracejs#42

eriwen · eriwen · commit d614fedaae8e · 2012-10-03T08:46:31.000-06:00
diff --git a/stacktrace.js b/stacktrace.js
@@ -402,14 +402,13 @@ printStackTrace.implementation.prototype = {
     findFunctionName: function(source, lineNo) {
         // FIXME findFunctionName fails for compressed source
         // (more than one function on the same line)
-        // TODO use captured args
         // function {name}({args}) m[1]=name m[2]=args
         var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
         // {name} = function ({args}) TODO args capture
         // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
-        var reFunctionExpression = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function\b/;
+        var reFunctionExpression = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*function\b/;
         // {name} = eval()
-        var reFunctionEvaluation = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
+        var reFunctionEvaluation = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
         // Walk backwards in the source lines until we find
         // the line which matches one of the patterns above
         var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
