Changeset 350 for trunk/idl-compiler

Timestamp:

Jun 7, 2008, 10:19:02 AM (17 years ago)

Author:

cinc

Message:

Fixed method macros so nomSelf parameter is evaluated only once.

File:

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

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

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2007
+* Portions created by the Initial Developer are Copyright (C) 2007-2008
 * the Initial Developer. All Rights Reserved.
 *
@@ -205 +205 @@
       emitMethodParams(pLocalPI, pif, pm->pParamArray);
       fprintf(fh, "    CORBA_Environment *ev);\n");
+      fprintf(fh, "#error The macro is broken. It does not support ˚recursive˚ calls (Line: %d)\n", __LINE__);
       /* Macro to be used when several parameters are checked */
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
@@ -241 +242 @@
         {
           if(strcmp(pif->chrName , "NOMObject"))
-            fprintf(fh, "        (nomCheckObjectPtr((NOMObject*)nomSelf, %sClassData.classObject,",pif->chrName);
+            fprintf(fh, "        ({ %s* %s_nomSelf_ = (nomSelf) ;nomCheckObjectPtr((NOMObject*)%s_nomSelf_, %sClassData.classObject,", pif->chrName, pif->chrName, pif->chrName, pif->chrName);
           else
-            fprintf(fh, "        (nomCheckNOMObjectPtr(nomSelf, %sClassData.classObject,",pif->chrName);
+            fprintf(fh, "        (nomCheckNOMObjectPtr(%s_nomSelf_, %sClassData.classObject,",pif->chrName, 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,");
+          fprintf(fh, "        (NOM_Resolve(%s_nomSelf_, %s, %s) \\\n", pif->chrName, pif->chrName, pm->chrName);
+          fprintf(fh, "        (%s_nomSelf_,", pif->chrName);
           /* Do parameters */
           emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
@@ -252 +253 @@
           for(b=0;b<pm->mpReturn.uiStar;b++)
             fprintf(fh, "*");
-          fprintf(fh, ") NULL)\n");
+          fprintf(fh, ") NULL; })\n");
         }
       else