Changeset 255 for trunk/ORBit2-2.14.0/src

Timestamp:

Mar 15, 2007, 9:42:22 PM (19 years ago)

Author:

cinc

Message:

Parameter checking for object pointer working.

Location:

trunk/ORBit2-2.14.0/src/idl-compiler

Files:

• orbit-idl-c-headers.c (modified) (3 diffs)
• orbit-idl-c-skelimpl.c (modified) (3 diffs)

trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-headers.c

@@ -1321 +1321 @@
     doWriteParametersOnly(of, tree);
     fprintf(of, "ev) \\\n");
-    fprintf(of, "        (parmCheckFunc_%s(nomSelf, ", id);
-    /* Parameters for call */
-    doWriteParametersOnly(of, tree);
-
-    fprintf(of, "ev) ? \\\n");
-    fprintf(of, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", id2, id3);
-    fprintf(of, "        (nomSelf,");
-    /* add the parms */
-    doWriteParametersOnly(of, tree);
-    fprintf(of, "ev)) : %s_retval)\n", id);
-
+    if(!strstr(id, "_nomIsObject"))
+      {
+        /* No check for _nomIsObject or otherwise we have a recursion */
+        fprintf(of, "        (parmCheckFunc_%s(nomSelf, ", id);
+        /* Parameters for call */
+        doWriteParametersOnly(of, tree);        
+        fprintf(of, "ev) ? \\\n");
+        fprintf(of, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", id2, id3);
+        fprintf(of, "        (nomSelf,");
+        /* add the parms */
+        doWriteParametersOnly(of, tree);
+        fprintf(of, "ev)) : %s_retval)\n", id);
+      }
+    else
+      {
+        fprintf(of, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", id2, id3);
+        fprintf(of, "        (nomSelf,");
+        /* add the parms */
+        doWriteParametersOnly(of, tree);
+        fprintf(of, "ev))\n");
+      }
     /* else NOM_NO_PARAM_CHECK */
     fprintf(of, "#else /* Extended parameter check */\n");
@@ -1340 +1350 @@
     doWriteParametersOnly(of, tree);
     fprintf(of, "ev) \\\n");
-    fprintf(of, "        (objectCheckFunc_%s(nomSelf, ", id2);
-    fprintf(of, " \"%s\") ? \\\n", id);
-    fprintf(of, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", id2, id3);
-    fprintf(of, "        (nomSelf,");
-    /* add the parms */
-    doWriteParametersOnly(of, tree);
-    fprintf(of, "ev)) : (");
-    orbit_cbe_write_param_typespec(of, tree);
-    fprintf(of, ") NULL)\n");
+    if(!strstr(id, "_nomIsObject"))
+      {
+        /* No check for _nomIsObject or otherwise we have a recursion */
+        if(!strcmp(id2, "NOMObject"))
+          fprintf(of, "        (nomCheckNOMObjectPtr((NOMObject*)nomSelf, %sClassData.classObject,", id2);
+        else
+          fprintf(of, "        (nomCheckObjectPtr((NOMObject*)nomSelf, %sClassData.classObject,", id2);
+        fprintf(of, " \"%s\", ev) ? \\\n", id); /* method name */
+        fprintf(of, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", id2, id3);
+        fprintf(of, "        (nomSelf,");
+        /* add the parms */
+        doWriteParametersOnly(of, tree);
+        fprintf(of, "ev)) : (");
+        orbit_cbe_write_param_typespec(of, tree);
+        fprintf(of, ") NULL)\n");
+      }
+    else
+      {
+        fprintf(of, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", id2, id3);
+        fprintf(of, "        (nomSelf,");
+        /* add the parms */
+        doWriteParametersOnly(of, tree);
+        fprintf(of, "ev))\n");
+      }
     fprintf(of, "#endif\n");
 
@@ -1480 +1505 @@
       /******* Print generic object check function  *******/
 
-      fprintf(ci->fh, "NOMEXTERN gboolean NOMLINK objectCheckFunc_%s(%s *nomSelf, gchar* chrMethodName);\n\n", id, id);
-
+      if(!strcmp(id, "NOMObject"))
+        fprintf(ci->fh, "NOMEXTERN gboolean NOMLINK nomCheckNOMObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev);\n\n");
+      else
+        fprintf(ci->fh, "NOMEXTERN gboolean NOMLINK nomCheckObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev);\n\n");
       
       /******* Print introduced methods *******/

trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-skelimpl.c

@@ -460 +460 @@
          check the object pointer. */
       fprintf(ski->of, "\n/* Function to check if an object is valid before calling a method on it */\n");
-      fprintf(ski->of, "#ifndef NOM_NO_PARAM_CHECK\n");
+      fprintf(ski->of, "#ifdef NOM_NO_PARAM_CHECK /* Disabled by now because not working */\n");
       fprintf(ski->of, "NOMEXTERN ");                
       fprintf(ski->of, "gboolean NOMLINK objectCheckFunc_%s(%s *nomSelf, gchar* chrMethodName)\n",
@@ -466 +466 @@
       fprintf(ski->of, "{\n");
       
-      fprintf(ski->of, "if(!nomIsObj(nomSelf) || !_nomIsA(nomSelf , %sClassData.classObject, NULLHANDLE))\n", id2);
+      fprintf(ski->of, "if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf , %sClassData.classObject, NULLHANDLE))\n", id2);
       fprintf(ski->of, "  {\n");
       fprintf(ski->of, "  nomPrintObjectPointerError(nomSelf, \"%s\", chrMethodName);\n", id2);
@@ -1134 +1134 @@
                 fprintf(ski->of, "{\n");
 
-                fprintf(ski->of, "if(!nomIsObj(nomSelf) || !_nomIsA(nomSelf , %sClassData.classObject, NULLHANDLE))\n", id2);
+                fprintf(ski->of, "if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf , %sClassData.classObject, NULLHANDLE))\n", id2);
                 fprintf(ski->of, "  {\n");
                 fprintf(ski->of, "  nomPrintObjectPointerError(nomSelf, \"%s\", \"%s\");\n", id2, id);