Changeset 10207 in webkit for trunk/JavaScriptCore/kjs/function_object.cpp
- Timestamp:
- Aug 15, 2005, 5:47:46 PM (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/kjs/function_object.cpp
r10178 r10207 89 89 fprintf(stderr,"attempted toString() call on null or non-function object\n"); 90 90 #endif 91 ObjectImp *err = Error::create(exec,TypeError); 92 exec->setException(err); 93 return err; 91 return throwError(exec, TypeError); 94 92 } 95 93 if (thisObj->inherits(&DeclaredFunctionImp::info)) { … … 112 110 ObjectImp *func = thisObj; 113 111 114 if (!func->implementsCall()) { 115 ObjectImp *err = Error::create(exec,TypeError); 116 exec->setException(err); 117 return err; 118 } 112 if (!func->implementsCall()) 113 return throwError(exec, TypeError); 119 114 120 115 ObjectImp *applyThis; … … 135 130 applyArgs.append(argArrayObj->get(exec,i)); 136 131 } 137 else { 138 ObjectImp *err = Error::create(exec,TypeError); 139 exec->setException(err); 140 return err; 141 } 132 else 133 return throwError(exec, TypeError); 142 134 } 143 135 result = func->call(exec,applyThis,applyArgs); … … 148 140 ObjectImp *func = thisObj; 149 141 150 if (!func->implementsCall()) { 151 ObjectImp *err = Error::create(exec,TypeError); 152 exec->setException(err); 153 return err; 154 } 142 if (!func->implementsCall()) 143 return throwError(exec, TypeError); 155 144 156 145 ObjectImp *callThis; … … 223 212 224 213 // no program node == syntax error - throw a syntax error 225 if (!progNode) { 226 ObjectImp *err = Error::create(exec,SyntaxError,errMsg.ascii(),errLine); 214 if (!progNode) 227 215 // we can't return a Completion(Throw) here, so just set the exception 228 216 // and return it 229 exec->setException(err); 230 return err; 231 } 217 return throwError(exec, SyntaxError, errMsg, errLine, sid, &sourceURL); 232 218 233 219 ScopeChain scopeChain; … … 267 253 } // else error 268 254 } 269 ObjectImp *err = Error::create(exec,SyntaxError, 270 I18N_NOOP("Syntax error in parameter list"), 271 -1); 272 exec->setException(err); 273 return err; 255 return throwError(exec, SyntaxError, "Syntax error in parameter list"); 274 256 } 275 257
Note:
See TracChangeset
for help on using the changeset viewer.