|
17 | 17 | } |
18 | 18 |
|
19 | 19 | function _capitalize(str) { |
20 | | - if (str.length > 0) { |
21 | | - return str[0].toUpperCase() + str.substring(1); |
22 | | - } else { |
23 | | - return str; |
24 | | - } |
| 20 | + return str[0].toUpperCase() + str.substring(1); |
| 21 | + } |
| 22 | + |
| 23 | + function _getter(p) { |
| 24 | + return function () { |
| 25 | + return this[p]; |
| 26 | + }; |
25 | 27 | } |
26 | 28 |
|
27 | | - var booleanProps = ['constructor', 'eval', 'native', 'toplevel']; |
| 29 | + var booleanProps = ['isConstructor', 'isEval', 'isNative', 'isToplevel']; |
28 | 30 | var numericProps = ['columnNumber', 'lineNumber']; |
29 | 31 | var stringProps = ['fileName', 'functionName', 'source']; |
30 | 32 | var arrayProps = ['args']; |
31 | 33 |
|
32 | 34 | function StackFrame(obj) { |
33 | 35 | if (obj instanceof Object) { |
34 | | - var props = numericProps.concat(stringProps.concat(arrayProps)); |
| 36 | + var props = booleanProps.concat(numericProps.concat(stringProps.concat(arrayProps))); |
35 | 37 | for (var i = 0; i < props.length; i++) { |
36 | 38 | if (obj.hasOwnProperty(props[i])) { |
37 | 39 | this['set' + _capitalize(props[i])](obj[props[i]]); |
38 | 40 | } |
39 | 41 | } |
40 | | - |
41 | | - for (var j = 0; j < booleanProps.length; j++) { |
42 | | - if (obj.hasOwnProperty(booleanProps[j])) { |
43 | | - this['setIs' + _capitalize(booleanProps[j])](obj[booleanProps[j]]); |
44 | | - } |
45 | | - } |
46 | 42 | } |
47 | 43 | } |
48 | 44 |
|
|
81 | 77 | }; |
82 | 78 |
|
83 | 79 | for (var i = 0; i < booleanProps.length; i++) { |
84 | | - StackFrame.prototype['getIs' + _capitalize(booleanProps[i])] = (function (p) { |
85 | | - return function () { |
86 | | - return this['is' + p]; |
87 | | - }; |
88 | | - })(_capitalize(booleanProps[i])); |
89 | | - StackFrame.prototype['setIs' + _capitalize(booleanProps[i])] = (function (p) { |
| 80 | + StackFrame.prototype['get' + _capitalize(booleanProps[i])] = _getter(booleanProps[i]); |
| 81 | + StackFrame.prototype['set' + _capitalize(booleanProps[i])] = (function (p) { |
90 | 82 | return function (v) { |
91 | | - this['is' + p] = !!v; |
| 83 | + this[p] = Boolean(v); |
92 | 84 | }; |
93 | | - })(_capitalize(booleanProps[i])); |
| 85 | + })(booleanProps[i]); |
94 | 86 | } |
95 | 87 |
|
96 | 88 | for (var j = 0; j < numericProps.length; j++) { |
97 | | - StackFrame.prototype['get' + _capitalize(numericProps[j])] = (function (p) { |
98 | | - return function () { |
99 | | - return this[p]; |
100 | | - }; |
101 | | - })(numericProps[j]); |
| 89 | + StackFrame.prototype['get' + _capitalize(numericProps[j])] = _getter(numericProps[j]); |
102 | 90 | StackFrame.prototype['set' + _capitalize(numericProps[j])] = (function (p) { |
103 | 91 | return function (v) { |
104 | 92 | if (!_isNumber(v)) { |
105 | 93 | throw new TypeError(p + ' must be a Number'); |
106 | 94 | } |
107 | 95 | this[p] = Number(v); |
108 | 96 | }; |
109 | | - })(numericProps[j], j); |
| 97 | + })(numericProps[j]); |
110 | 98 | } |
111 | 99 |
|
112 | 100 | for (var k = 0; k < stringProps.length; k++) { |
113 | | - StackFrame.prototype['get' + _capitalize(stringProps[k])] = (function (p) { |
114 | | - return function () { |
115 | | - return this[p]; |
116 | | - }; |
117 | | - })(stringProps[k]); |
| 101 | + StackFrame.prototype['get' + _capitalize(stringProps[k])] = _getter(stringProps[k]); |
118 | 102 | StackFrame.prototype['set' + _capitalize(stringProps[k])] = (function (p) { |
119 | 103 | return function (v) { |
120 | 104 | this[p] = String(v); |
|
0 commit comments