Changeset 290 for trunk/idl-compiler/ih-emitter_c

Timestamp:

Apr 1, 2007, 3:50:13 PM (18 years ago)

Author:

cinc

Message:

Hunting bugs...

File:

• trunk/idl-compiler/ih-emitter_c/ih_file_emitter.c (modified) (4 diffs)

trunk/idl-compiler/ih-emitter_c/ih_file_emitter.c

@@ -237 +237 @@
         }
 
-      fprintf(fh, "NOM_Scope %s", pm->mpReturn.chrType);
-      for(b=0;b<pm->mpReturn.uiStar;b++)
-        fprintf(fh, "*");
-
+      fprintf(fh, "NOM_Scope ");
+      emitReturnType(pLocalPI, pif, pm);
       fprintf(fh, " NOMLINK impl_%s_%s(%s* nomSelf,\n", pif->chrName, pom->chrName, pif->chrName);
       /* Do parameters */
@@ -331 +329 @@
     }
 }
-
-static void emitClassId(PPARSEINFO pLocalPI, PINTERFACE pif)
-{
-  FILE* fh=pLocalPI->outFile;
-
-  if(pif->chrMetaClass)
-    {
-      fprintf(fh, "/* Identify this class */\n");
-      fprintf(fh, "static char * nomIdString_%s = \"%s\";\n\n", pif->chrName, pif->chrName);
-    }
-}
-
 
 static void emitParentClasses(PPARSEINFO pLocalPI, PINTERFACE pif)
@@ -432 +418 @@
       else if(!strcmp(piv->chrType, "gdouble"))
         ulRet+=sizeof(gdouble);
+      else if(!strcmp(piv->chrType, "string"))
+        ulRet+=sizeof(gpointer);
       else
         /* Check if it's an interface */
@@ -566 +554 @@
       if(!strcmp(pif->chrSourceFileName, pLocalPI->chrRootSourceFile))
         {
-          gchar*  chrTemp;
-
-          //printInterface(pif);
-          
-          chrTemp=g_strconcat(pif->chrFileStem, ".ih", NULL);
-          if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+          /* Only interfaces which are fully defined. No forwarder */
+          if(!pif->fIsForwardDeclaration)
             {
-              emitIHFileHeader(pLocalPI, pif);
-              emitInstanceVariables(pLocalPI, pif);
-              emitGetDataMacros(pLocalPI, pif);
-              emitIHClassDataStructs(pLocalPI, pif);
-              emitNewMethods(pLocalPI, pif);
-              emitOverridenMethods(pLocalPI, pif);
-              emitOverridenMethodTable(pLocalPI, pif);
-              emitStaticMethodTable(pLocalPI, pif);
-              emitMetaClass(pLocalPI, pif);
-              emitClassId(pLocalPI, pif);
-              emitParentClasses(pLocalPI, pif);
-              emitStaticClassInfo(pLocalPI, pif);
-              emitClassCreationFunc(pLocalPI, pif);
-
-              emitIHFileFooter(pLocalPI, pif);
-            }
-          g_free(chrTemp);
-        }
-    }
-}
-
-
+              gchar*  chrTemp;
+
+              //printInterface(pif);
+              chrTemp=g_strconcat(pif->chrFileStem, ".ih", NULL);
+              if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+                {
+                  emitIHFileHeader(pLocalPI, pif);
+                  emitInstanceVariables(pLocalPI, pif);
+                  emitGetDataMacros(pLocalPI, pif);
+                  emitIHClassDataStructs(pLocalPI, pif);
+                  emitNewMethods(pLocalPI, pif);
+                  emitOverridenMethods(pLocalPI, pif);
+                  emitOverridenMethodTable(pLocalPI, pif);
+                  emitStaticMethodTable(pLocalPI, pif);
+                  emitMetaClass(pLocalPI, pif);
+                  emitParentClasses(pLocalPI, pif);
+                  emitStaticClassInfo(pLocalPI, pif);
+                  emitClassCreationFunc(pLocalPI, pif);
+                  
+                  emitIHFileFooter(pLocalPI, pif);
+                }
+              g_free(chrTemp);
+            }/* fIsForwardDeclaration */
+        }
+    }
+}
+
+