Changeset 282

Timestamp:

Mar 31, 2007, 12:23:12 PM (18 years ago)

Author:

cinc

Message:

Some fixes for check funtions handling

File:

• trunk/idl-compiler/h-emitter_c/h_file_emitter.c (modified) (4 diffs)

trunk/idl-compiler/h-emitter_c/h_file_emitter.c

@@ -160 +160 @@
 
       fprintf(fh, " NOMLINK nomTP_%s_%s(%s* nomSelf,\n", pif->chrName,  pm->chrName, pif->chrName);
-
       /* Do parameters */
       emitMethodParams(pLocalPI, pif, pm->pParamArray);
-
       fprintf(fh, "    CORBA_Environment *ev);\n");
       fprintf(fh, "typedef nomTP_%s_%s *nomTD_%s_%s;\n", pif->chrName,  pm->chrName,
@@ -176 +174 @@
       fprintf(fh, "#ifdef %s_%s_ParmCheck_h /* Extended parameter check enabled */\n",
               pif->chrName, pm->chrName);
+      /* Forward declaration of parameter test function */
       fprintf(fh, "NOMEXTERN gboolean NOMLINK parmCheckFunc_%s_%s(%s *nomSelf,\n",
               pif->chrName,  pm->chrName, pif->chrName);
@@ -181 +180 @@
       emitMethodParams(pLocalPI, pif, pm->pParamArray);
       fprintf(fh, "    CORBA_Environment *ev);\n");
-
+      /* Macro to be used when several parameters are checked */
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
       /* Do parameters */
       emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
       fprintf(fh, " ev) \\\n");
-      fprintf(fh, "        (parmCheckFunc_%s_%s(nomSelf,", pif->chrName, pm->chrName);
-      /* Do parameters */
-      emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
-      fprintf(fh, " ev) ? \\\n");
-      fprintf(fh, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", pif->chrName, pm->chrName);
-      fprintf(fh, "        (nomSelf,");
-      /* Do parameters */
-      emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
-      fprintf(fh, " ev)) : %s_%s_retval)\n", pif->chrName, pm->chrName);
-      fprintf(fh, "#else /* Extended parameter check */\n");
+
+      if(strcmp(pm->chrName, "nomIsObject"))
+        {
+          fprintf(fh, "        (parmCheckFunc_%s_%s(nomSelf,", pif->chrName, pm->chrName);
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev) ? \\\n");
+          fprintf(fh, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", pif->chrName, pm->chrName);
+          fprintf(fh, "        (nomSelf,");
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev)) : %s_%s_retval)\n", pif->chrName, pm->chrName);
+        }
+      else
+        {
+          /* No check for nomIsObject or otherwise we have a recursion */
+          fprintf(fh, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", pif->chrName, pm->chrName);
+          fprintf(fh, "        (nomSelf,");
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev))\n");
+        }
+      fprintf(fh, "#else /* Extended parameter check */\n"); /* else NOM_NO_PARAM_CHECK */
+      /* Check object only  */
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
       /* Do parameters */
       emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
       fprintf(fh, " ev) \\\n");
-      if(strcmp(pif->chrName , "NOMObject"))
-        fprintf(fh, "        (nomCheckObjectPtr((NOMObject*)nomSelf, %sClassData.classObject,",pif->chrName);
+      if(strcmp(pm->chrName, "nomIsObject"))
+        {
+          if(strcmp(pif->chrName , "NOMObject"))
+            fprintf(fh, "        (nomCheckObjectPtr((NOMObject*)nomSelf, %sClassData.classObject,",pif->chrName);
+          else
+            fprintf(fh, "        (nomCheckNOMObjectPtr(nomSelf, %sClassData.classObject,",pif->chrName);
+          fprintf(fh, "\"%s_%s\", ev) ? \\\n", pif->chrName, pm->chrName);
+          fprintf(fh, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", pif->chrName, pm->chrName);
+          fprintf(fh, "        (nomSelf,");
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev)) : (%s", pm->mpReturn.chrType);
+          for(b=0;b<pm->mpReturn.uiStar;b++)
+            fprintf(fh, "*");
+          fprintf(fh, ") NULL)\n");
+        }
       else
-        fprintf(fh, "        (nomCheckNOMObjectPtr(nomSelf, %sClassData.classObject,",pif->chrName);
-      fprintf(fh, "\"%s_%s\", ev) ? \\\n", pif->chrName, pm->chrName);
-
-      fprintf(fh, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", pif->chrName, pm->chrName);
-      fprintf(fh, "        (nomSelf,");
-      /* Do parameters */
-      emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
-      fprintf(fh, " ev)) : (%s", pm->mpReturn.chrType);
-      for(b=0;b<pm->mpReturn.uiStar;b++)
-        fprintf(fh, "*");
-      fprintf(fh, ") NULL)\n");
+        {
+          /* No check for nomIsObject or otherwise we have a recursion */
+          fprintf(fh, "        (NOM_Resolve(nomSelf, %s, %s) \\\n", pif->chrName, pm->chrName);
+          fprintf(fh, "        (nomSelf,");
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev))\n");
+        }
       fprintf(fh, "#endif\n");
       fprintf(fh, "#else /* NOM_NO_PARAM_CHECK */\n");
@@ -239 +263 @@
           pif->chrName);
   
-  fprintf(fh, "#define _%s (%s*)%sClassData.classObject\n\n",
-          pif->chrName, pif->chrMetaClass, pif->chrName);
-  
+#if 0
+  if(pif->chrMetaClass)
+    fprintf(fh, "#define _%s (%s*)%sClassData.classObject\n\n",
+            pif->chrName, pif->chrMetaClass, pif->chrName);
+  else
+#endif
+    fprintf(fh, "#define _%s %sClassData.classObject\n\n",
+            pif->chrName,  pif->chrName);
+
   fprintf(fh, "/*\n * New macro for WPObject\n */\n\n");
   fprintf(fh, "#define %sNew() \\\n", pif->chrName);
   fprintf(fh, "        ((%s*)_nomNew((_%s ? _%s : ", pif->chrName, pif->chrName, pif->chrName);
-  fprintf(fh, "(%s*)%sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n\n",
-          pif->chrName, pif->chrName, pif->chrName, pif->chrName);
+  fprintf(fh, "%sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n\n",
+          pif->chrName, pif->chrName, pif->chrName);
 
 }