Changeset 15224 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jul 7, 2006, 7:02:47 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

More API action.

• Headerdoc finished

Semantic Changes:

• Added a JSContextRef argument to many functions, because you need a JSContextRef for doing virtually anything. I expect to add this argument to even more functions in a future patch.

• Removed the globalObjectPrototype argument to JSContextCreate because you can't create an object until you have a context, so it's impossible to pass a prototype object to JSContextCreate. That's OK because (1) there's no reason to give the global object a prototype and (2) if you really want to, you can just use a separate call to JSObjectSetPrototype.

• Removed the JSClassRef argument to JSClassCreate because it was unnecessary, and you need to be able to make the global object's class before you've created a JSContext.

• Added an optional exception parameter to JSFunctionMakeWithBody because anything less would be uncivilized.

• Made the return value parameter to JSObjectGetProperty optional to match all other return value parameters in the API.

• Made JSObjectSetPrivate/JSObjectGetPrivate work on JSCallbackFunctions and JSCallbackConstructors. You could use an abstract base class or strategic placement of m_privateData in the class structure to implement this, but the former seemed like overkill, and the latter seemed too dangerous.

• Fixed a bug where JSPropertyEnumeratorGetNext would skip the first property.

Cosmetic Changes:

• Reversed the logic of the JSChar #ifdef to avoid confusing headerdoc

• Removed function names from @function declarations because headeroc can parse them automatically, and I wanted to rule out manual mismatch.

• Changed Error::create to take a const UString& instead of a UString* because it was looking at me funny.

• Renamed JSStringBufferCreateWithCFString to JSStringBufferCreateCF because the latter is more concise and it matches JSStringBufferCreateUTF8.

• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::getPropertyList): (KJS::JSCallbackObject::toBoolean): (KJS::JSCallbackObject::toNumber): (KJS::JSCallbackObject::toString):
• API/JSClassRef.cpp: (JSClassCreate):
• API/JSContextRef.cpp: (JSContextCreate): (JSContextSetException):
• API/JSContextRef.h:
• API/JSNode.c: (JSNodePrototype_class): (JSNode_class):
• API/JSNodeList.c: (JSNodeListPrototype_class): (JSNodeList_class):
• API/JSObjectRef.cpp: (JSObjectGetProperty): (JSObjectGetPrivate): (JSObjectSetPrivate): (JSObjectCallAsFunction): (JSObjectCallAsConstructor): (JSPropertyEnumeratorGetNext):
• API/JSObjectRef.h:
• API/JSStringBufferRef.cpp: (JSStringBufferCreateCF):
• API/JSStringBufferRef.h:
• API/JSValueRef.cpp: (JSValueIsInstanceOf):
• API/JSValueRef.h:
• API/minidom.c: (main):
• API/minidom.js:
• API/testapi.c: (MyObject_hasProperty): (MyObject_setProperty): (MyObject_deleteProperty): (MyObject_getPropertyList): (MyObject_convertToType): (MyObject_class): (main):
• JavaScriptCore.exp:

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -196 +196 @@
 Completion Node::createErrorCompletion(ExecState* exec, ErrorType e, const char *msg)
 {
-    return Completion(Throw, Error::create(exec, e, msg, lineNo(), currentSourceId(exec), &currentSourceURL(exec)));
+    return Completion(Throw, Error::create(exec, e, msg, lineNo(), currentSourceId(exec), currentSourceURL(exec)));
 }
 
@@ -203 +203 @@
     UString message = msg;
     substitute(message, ident.ustring());
-    return Completion(Throw, Error::create(exec, e, message, lineNo(), currentSourceId(exec), &currentSourceURL(exec)));
+    return Completion(Throw, Error::create(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec)));
 }
 
 JSValue *Node::throwError(ExecState* exec, ErrorType e, const char *msg)
 {
-    return KJS::throwError(exec, e, msg, lineNo(), currentSourceId(exec), &currentSourceURL(exec));
+    return KJS::throwError(exec, e, msg, lineNo(), currentSourceId(exec), currentSourceURL(exec));
 }
 
@@ -216 +216 @@
     substitute(message, v->toString(exec));
     substitute(message, expr->toString());
-    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), &currentSourceURL(exec));
+    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec));
 }
 
@@ -224 +224 @@
     UString message = msg;
     substitute(message, label.ustring());
-    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), &currentSourceURL(exec));
+    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec));
 }
 
@@ -233 +233 @@
     substitute(message, e1->toString());
     substitute(message, e2->toString());
-    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), &currentSourceURL(exec));
+    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec));
 }
 
@@ -242 +242 @@
     substitute(message, expr->toString());
     substitute(message, label.ustring());
-    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), &currentSourceURL(exec));
+    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec));
 }
 
@@ -250 +250 @@
     substitute(message, v->toString(exec));
     substitute(message, label.ustring());
-    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), &currentSourceURL(exec));
+    return KJS::throwError(exec, e, message, lineNo(), currentSourceId(exec), currentSourceURL(exec));
 }