Changeset 379 for trunk/idl-compiler

Timestamp:

Jul 1, 2008, 6:23:14 PM (17 years ago)

Author:

cinc

Message:

Put info for NOM compiler in emitted *.h files.

Location:

trunk/idl-compiler

Files:

• c/emitter.c (modified) (2 diffs)
• h-emitter_c/h_file_emitter.c (modified) (5 diffs)
• include/parser.h (modified) (1 diff)

trunk/idl-compiler/c/emitter.c

@@ -93 +93 @@
 }
 
+
+/*
+ \param pArray Pointer to the list of parameters.
+ */
+void emitMethodParamsForNOMCompiler(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray)
+{
+  FILE* fh=pLocalPI->outFile;
+  int a;
+  
+  for(a=0;a<pArray->len;a++)
+  {
+    int b;
+    gchar *chrType;
+    PMETHODPARAM pm=(PMETHODPARAM)g_ptr_array_index(pArray, a);
+    
+    chrType= pm->chrType;
+
+#if 0
+    /* For old IDL files using orbit IDL compiler */
+    if(!strcmp(pm->chrType, "string"))
+      chrType="CORBA_char*";
+    else if(!strcmp(pm->chrType, "long"))
+      chrType="CORBA_long";
+    else if(!strcmp(pm->chrType, "unsigned long"))
+      chrType="CORBA_unsigned_long";
+    else if(!strcmp(pm->chrType, "boolean"))
+      chrType="CORBA_boolean";
+#endif
+    
+    switch(pm->uiDirection)
+    {
+      case PARM_DIRECTION_IN:
+        fprintf(fh, " in %s", chrType);
+        break;
+      case PARM_DIRECTION_OUT:
+        fprintf(fh, " out  %s", chrType);
+        break;
+      case PARM_DIRECTION_INOUT:
+        fprintf(fh, " inout %s", chrType);
+        break;
+      default:
+      
+        break;
+    }
+    for(b=0;b<pm->uiStar;b++)
+      fprintf(fh, "*");
+    fprintf(fh, " %s", pm->chrName);
+    if(a<pArray->len-1)
+      fprintf(fh, ",");
+      
+  }
+}
+
+
 /*
   \param pArray Pointer to the list of parameters.
@@ -133 +187 @@
     fprintf(fh, "*");
 }
+
+
+void emitReturnTypeForNOMCompiler(PPARSEINFO pLocalPI, PINTERFACE pif, PMETHOD pm)
+{
+  FILE* fh=pLocalPI->outFile;
+  int b;
+  gchar* chrType;
+  
+  chrType= pm->mpReturn.chrType;
+
+#if 0
+  /* Support for orbit IDL files */
+  if(!strcmp(pm->mpReturn.chrType, "long"))
+    chrType="CORBA_long";
+  else if(!strcmp(pm->mpReturn.chrType, "boolean"))
+    chrType="CORBA_boolean";
+  else if(!strcmp(pm->mpReturn.chrType, "unsigned long"))
+    chrType="CORBA_unsigned_long";
+#endif
+  
+  if(!strcmp(pm->mpReturn.chrType, "boolean"))
+    chrType="gboolean";
+  
+  fprintf(fh, "%s", chrType);
+  for(b=0;b<pm->mpReturn.uiStar;b++)
+    fprintf(fh, "*");
+}

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

@@ -57 +57 @@
   fprintf(fh, "#ifndef %s_H\n#define %s_H\n\n", pif->chrName, pif->chrName);
 
+  fprintf(fh, "#ifndef NOMCOMPILER\n");
+
   fprintf(fh, "#include <glib.h>\n");
   fprintf(fh, "#include <nomcls.h> /* This is needed for _nomNew() */\n\n");
@@ -63 +65 @@
   fprintf(fh, "extern \"C\" {\n");
   fprintf(fh, "#endif /* __cplusplus */\n\n");
-
-  fprintf(fh, "#ifndef NOMCOMPILER\n");
   
   /* Define the name as an object */
@@ -352 +352 @@
 {
   FILE* fh=pLocalPI->outFile;
-  GPtrArray *pArray;
   int a;
+
+  fprintf(fh, "#else /* NOMCOMPILER */\n");
+
+  emitInterfaceIncludes(pLocalPI, pif);
+
+  /* Output all interfaces */
+  for(a=0; a<pLocalPI->pInterfaceArray->len; a++)
+  {
+    PINTERFACE pifAll=g_ptr_array_index(pLocalPI->pInterfaceArray, a);
+    int b;
+      
+    if(pifAll->fIsForwardDeclaration)
+    {
+      fprintf(fh, "interface %s;\n", pifAll->chrName);
+    }
+    else
+    {
+      GPtrArray *pArray;
+
+      pArray=pifAll->pMethodArray;
+
+      fprintf(fh, "#ifndef %s_INTERFACE\n", pifAll->chrName);
+      fprintf(fh, "#define %s_INTERFACE\n", pifAll->chrName);
+
+      fprintf(fh, "interface %s", pifAll->chrName);
+
+      if(pifAll->chrParent)
+      {
+        fprintf(fh, " : %s", pif->chrParent);
+      }
+      
+      fprintf(fh, "\n{\n");
+      
+      /* Print known methods */
+      for(b=0; b<pArray->len; b++)
+      {
+        PMETHOD pm=(PMETHOD)g_ptr_array_index(pArray, b);
+        
+        fprintf(fh, "    ");
+        
+        emitReturnTypeForNOMCompiler(pLocalPI, pifAll, pm);
+        
+        fprintf(fh, " %s(", pm->chrName); /* Methodname */
+        emitMethodParamsForNOMCompiler(pLocalPI, pifAll, pm->pParamArray);
+        fprintf(fh, ");\n");     
+      } /* for */
+      fprintf(fh, "}\n");  
+      fprintf(fh, "#endif /* %s_INTERFACE */\n", pifAll->chrName);
+    }
+    
+  }
   
-  pArray=pif->pMethodArray;
-  
-  fprintf(fh, "#else /* NOMCOMPILER */\n");
-
-  emitInterfaceIncludes(pLocalPI, pif);
-
-  fprintf(fh, "interface %s", pif->chrName);
-  if(pif->chrParent)
-  {
-    fprintf(fh, " : %s", pif->chrParent);
-  }
-  fprintf(fh, "\n{\n");
-  
-  /* Print known methods */
-  for(a=0;a<pArray->len;a++)
-  {
-    int b;
-    PMETHOD pm=(PMETHOD)g_ptr_array_index(pArray, a);
-
-    fprintf(fh, "    %s(", pm->chrName); /* Methodname */
-    emitMethodParams(pLocalPI, pif, pm->pParamArray);
-    fprintf(fh, ");\n");     
-  }
-  fprintf(fh, "}\n");  
   fprintf(fh, "\n#endif /* NOMCOMPILER */\n\n");
 }
@@ -390 +416 @@
   fprintf(fh, "#endif /* __cplusplus */\n\n");
 
+  emitNomCompilerInfo(pLocalPI, pif);
+  
   fprintf(fh, "\n#endif /* %s_H */\n", pif->chrName);
 }
@@ -423 +451 @@
                   emitNewMethods(pLocalPI, pif);
                   emitParentClassMethods(pLocalPI, pif);
-                  emitNomCompilerInfo(pLocalPI, pif);                  
                   emitHFileFooter(pLocalPI, pif);
                   closeOutfile(pLocalPI->outFile);

trunk/idl-compiler/include/parser.h

@@ -193 +193 @@
 void emitMethodParamsNoTypes(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray);
 void emitReturnType(PPARSEINFO pLocalPI, PINTERFACE pif, PMETHOD pm);
+void emitMethodParamsForNOMCompiler(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray);
+void emitReturnTypeForNOMCompiler(PPARSEINFO pLocalPI, PINTERFACE pif, PMETHOD pm);
 
 /* In printdata.c */