Skip to content

Commit dcb6417

Browse files
committed
Rewrite toString to match Node internals
1 parent 0d7a328 commit dcb6417

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

stackframe.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,20 @@
6868
},
6969

7070
toString: function() {
71-
var functionName = this.getFunctionName() || '{anonymous}';
72-
var args = '(' + (this.getArgs() || []).join(',') + ')';
73-
var fileName = this.getFileName() ? ('@' + this.getFileName()) : '';
74-
var lineNumber = _isNumber(this.getLineNumber()) ? (':' + this.getLineNumber()) : '';
75-
var columnNumber = _isNumber(this.getColumnNumber()) ? (':' + this.getColumnNumber()) : '';
76-
return functionName + args + fileName + lineNumber + columnNumber;
71+
var fileName = this.getFileName() || '';
72+
var lineNumber = this.getLineNumber() || '';
73+
var columnNumber = this.getColumnNumber() || '';
74+
var functionName = this.getFunctionName() || '';
75+
if (this.isEval()) {
76+
if (fileName) {
77+
return ' at [eval] (' + fileName + ':' + lineNumber + ':' + columnNumber + ')';
78+
}
79+
return ' at [eval]:' + lineNumber + ':' + columnNumber;
80+
}
81+
if (functionName) {
82+
return ' at ' + functionName + ' (' + fileName + ':' + lineNumber + ':' + columnNumber + ')';
83+
}
84+
return ' at ' + fileName + ':' + lineNumber + ':' + columnNumber;
7785
}
7886
};
7987

0 commit comments

Comments
 (0)