1 files changed, 58 insertions, 31 deletions

diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCNodeSetCustom.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCNodeSetCustom.cpp
index 1591310..98f563e 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCNodeSetCustom.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCNodeSetCustom.cpp
@@ -5,50 +5,77 @@
 namespace Arabica {
 namespace DOM {
 
-#if 0
-v8::Handle<v8::Value> V8NodeSet::indexedPropertyCustomGetter(uint32_t index, const v8::AccessorInfo &info) {
-	v8::Local<v8::Object> self = info.Holder();
-	V8NodeSetPrivate* privData = V8DOM::toClassPtr<V8NodeSetPrivate >(self->GetInternalField(0));
 
-	if (privData->nativeObj->size() >= index) {
-		switch((*privData->nativeObj)[index].getNodeType()) {
-		case Node_base::ELEMENT_NODE: {
-			Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>((*privData->nativeObj)[index]);
+bool JSCNodeSet::hasPropertyCustomCallback(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName) {
+	size_t propMaxSize = JSStringGetMaximumUTF8CStringSize(propertyName);
+	char* propBuffer = new char[propMaxSize];
+	JSStringGetUTF8CString(propertyName, propBuffer, propMaxSize);
+	std::string propName(propBuffer);
+	free(propBuffer);
 
-			v8::Handle<v8::Function> retCtor = V8Element::getTmpl()->GetFunction();
-			v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+	std::string base = "0123456789";
+	if (propName.find_first_not_of(base) != std::string::npos) {
+		return false;
+	}
+
+	int index = boost::lexical_cast<int>(propName);
+	struct JSCNodeSetPrivate* privData = (struct JSCNodeSetPrivate*)JSObjectGetPrivate(object);
+
+	if (privData->nativeObj->size() < index) {
+		return false;
+	}
+
+	return true;
+}
 
-			struct V8Element::V8ElementPrivate* retPrivData = new V8Element::V8ElementPrivate();
-			retPrivData->dom = privData->dom;
-			retPrivData->nativeObj = retVal;
+JSValueRef JSCNodeSet::getPropertyCustomCallback(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception) {
+	size_t propMaxSize = JSStringGetMaximumUTF8CStringSize(propertyName);
+	char* propBuffer = new char[propMaxSize];
+	JSStringGetUTF8CString(propertyName, propBuffer, propMaxSize);
+	std::string propName(propBuffer);
+	free(propBuffer);
 
-			retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+	std::string base = "0123456789";
+	if (propName.find_first_not_of(base) != std::string::npos) {
+		return JSValueMakeUndefined(ctx);
+	}
 
-			retObj.MakeWeak(0, V8Element::jsDestructor);
-			return retObj;
-		}
-		default: {
-			Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>((*privData->nativeObj)[index]);
+	int index = boost::lexical_cast<int>(propName);
+	struct JSCNodeSetPrivate* privData = (struct JSCNodeSetPrivate*)JSObjectGetPrivate(object);
+	if (privData->nativeObj->size() < index) {
+		return JSValueMakeUndefined(ctx);
+	}
 
-			v8::Handle<v8::Function> retCtor = V8Node::getTmpl()->GetFunction();
-			v8::Persistent<v8::Object> retObj = v8::Persistent<v8::Object>::New(retCtor->NewInstance());
+	switch((*privData->nativeObj)[index].getNodeType()) {
+	case Node_base::ELEMENT_NODE: {
+		Arabica::DOM::Element<std::string>* retVal = new Arabica::DOM::Element<std::string>((*privData->nativeObj)[index]);
+		JSClassRef retClass = JSCElement::getTmpl();
 
-			struct V8Node::V8NodePrivate* retPrivData = new V8Node::V8NodePrivate();
-			retPrivData->dom = privData->dom;
-			retPrivData->nativeObj = retVal;
+		struct JSCElement::JSCElementPrivate* retPrivData = new JSCElement::JSCElementPrivate();
+		retPrivData->dom = privData->dom;
+		retPrivData->nativeObj = retVal;
 
-			retObj->SetInternalField(0, V8DOM::toExternal(retPrivData));
+		JSObjectRef retObj = JSObjectMake(ctx, retClass, retPrivData);
 
-			retObj.MakeWeak(0, V8Node::jsDestructor);
-			return retObj;
-		}
-		}
+		return retObj;
+		break;
 	}
+	default: {
+		Arabica::DOM::Node<std::string>* retVal = new Arabica::DOM::Node<std::string>((*privData->nativeObj)[index]);
+		JSClassRef retClass = JSCNode::getTmpl();
+
+		struct JSCNode::JSCNodePrivate* retPrivData = new JSCNode::JSCNodePrivate();
+		retPrivData->dom = privData->dom;
+		retPrivData->nativeObj = retVal;
 
-	return v8::Undefined();
+		JSObjectRef retObj = JSObjectMake(ctx, retClass, retPrivData);
+
+		return retObj;
+	}
+	}
 
+	return JSValueMakeUndefined(ctx);
 }
-#endif
 
 }
 }
\ No newline at end of file