Changeset 328 for trunk/zoo-project/zoo-kernel/service_internal_js.c

Timestamp:

Aug 26, 2011, 3:53:26 PM (13 years ago)

Author:

djay

Message:

Fix bug #62. Use the same data structure in JS as in Python. Fix again bug #42.

File:

• trunk/zoo-project/zoo-kernel/service_internal_js.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_internal_js.c

@@ -77 +77 @@
 
   /* Create the global object. */
-  //global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
-  global = JS_NewObject(cx, &global_class, NULL,NULL);
+  //#ifdef JS_NewCompartmentAndGlobalObject
+  global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
+  //#else
+  //global = JS_NewObject(cx, &global_class, NULL,NULL);
+  //#endif
 
   /* Populate the global object with the standard globals,
@@ -284 +287 @@
 
 JSObject* JSObject_FromMaps(JSContext *cx,maps* t){
-  JSObject *res = JS_NewArrayObject(cx, 0, NULL);
+
+  JSObject* res=JS_NewObject(cx, NULL, NULL, NULL);
+  //JSObject *res = JS_NewArrayObject(cx, 0, NULL);
   if(res==NULL)
     fprintf(stderr,"Array Object is NULL!\n");
   maps* tmp=t;
+
   while(tmp!=NULL){
     jsuint len;
@@ -293 +299 @@
     JSObject *pval=JSObject_FromMap(cx,tmp->content);
     jsval pvalj=OBJECT_TO_JSVAL(pval);
-    JS_SetProperty(cx, res1, tmp->name, &pvalj);
-    JS_GetArrayLength(cx, res, &len);
-    jsval res1j = OBJECT_TO_JSVAL(res1);
-    JS_SetElement(cx,res,len,&res1j);
+    JS_SetProperty(cx, res, tmp->name, &pvalj);
+
 #ifdef JS_DEBUG
     fprintf(stderr,"Length of the Array %d, element : %s added \n",len,tmp->name);