Changeset 280 for trunk/idl-compiler/h-emitter_c

Timestamp:

Mar 30, 2007, 10:31:24 PM (18 years ago)

Author:

cinc

Message:

A load of fixes.

File:

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

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

@@ -80 +80 @@
   /* Include header of parent */
   if(pifParent){
-    char* chrTemp=strlwr(g_strdup(pifParent->chrName));
     fprintf(fh, "/* Include for the parent class */\n");
-    fprintf(fh, "#include \"%s.h\"\n\n", chrTemp);
-    g_free(chrTemp);
+    if(pifParent->chrFileStem)
+      fprintf(fh, "#include \"%s.h\"\n\n", pifParent->chrFileStem);
   }
 }
@@ -110 +109 @@
       fprintf(fh, "    nomMToken %s;\n", pm->chrName);
     }
-  fprintf(fh, "}%sClassData\n\n", pif->chrName);
+  fprintf(fh, "}%sClassData;\n\n", pif->chrName);
 
   fprintf(fh, "NOMEXTERN struct %sCClassDataStructure {\n", pif->chrName);
@@ -124 +123 @@
   FILE* fh=pLocalPI->outFile;
 
-  fprintf(fh, "/* This function is used to check if a given object is valid and the\n");
-  fprintf(fh, "   object supports the method */\n");
-  fprintf(fh, "NOMEXTERN gboolean NOMLINK nomCheckObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev);\n\n");
+  if(strcmp(pif->chrName , "NOMObject"))
+    {
+      fprintf(fh, "/* This function is used to check if a given object is valid and the\n");
+      fprintf(fh, "   object supports the method */\n");
+      fprintf(fh, "NOMEXTERN gboolean NOMLINK nomCheckObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev);\n\n");
+    }
+  else
+    {
+      fprintf(fh, "/* This function is used to check if the given object is valid and a NOMObject */\n");
+      fprintf(fh, "NOMEXTERN gboolean NOMLINK nomCheckNOMObjectPtr(NOMObject *nomSelf, NOMClass* nomClass, gchar* chrMethodName, CORBA_Environment *ev);\n\n");
+    }
 }
 
@@ -157 +164 @@
       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,
+      fprintf(fh, "    CORBA_Environment *ev);\n");
+      fprintf(fh, "typedef nomTP_%s_%s *nomTD_%s_%s;\n", pif->chrName,  pm->chrName,
               pif->chrName,  pm->chrName);
       fprintf(fh, "/* define the name for this method */\n");
@@ -173 +180 @@
       /* Do parameters */
       emitMethodParams(pLocalPI, pif, pm->pParamArray);
-      fprintf(fh, "    Corba_Environment *ev);\n");
+      fprintf(fh, "    CORBA_Environment *ev);\n");
 
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
@@ -193 +200 @@
       emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
       fprintf(fh, " ev) \\\n");
-      fprintf(fh, "        (nomCheckObjectPtr((NOMObject*)nomSelf, %sClassData.classObject,",pif->chrName);
+      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);
 
@@ -200 +210 @@
       /* Do parameters */
       emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
-      fprintf(fh, " ev)) : (gpointer) NULL)\n");
+      fprintf(fh, " ev)) : (%s", pm->mpReturn.chrType);
+      for(b=0;b<pm->mpReturn.uiStar;b++)
+        fprintf(fh, "*");
+      fprintf(fh, ") NULL)\n");
       fprintf(fh, "#endif\n");
       fprintf(fh, "#else /* NOM_NO_PARAM_CHECK */\n");
@@ -285 +298 @@
           chrTemp=g_strconcat(pif->chrFileStem, ".h", NULL);
 
-          printInterface(pif);
+          //printInterface(pif);
           if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
             {