Changeset 289 for trunk/idl-compiler

Timestamp:

Apr 1, 2007, 2:03:04 PM (18 years ago)

Author:

cinc

Message:

Hunting bugs...

Location:

trunk/idl-compiler

Files:

• c/nom-idl-compiler.c (modified) (1 diff)
• h-emitter_c/h_file_emitter.c (modified) (1 diff)
• parser_c/interface_parser.c (modified) (4 diffs)

trunk/idl-compiler/c/nom-idl-compiler.c

@@ -624 +624 @@
 
   g_scanner_destroy(gScanner);
-  close(fd);
-  fclose(parseInfo.outFile);
+  if(0!=fd)
+    close(fd); /* We read from stdin */
+  if(parseInfo.outFile)
+    fclose(parseInfo.outFile);
   return 0;
 }

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

@@ -328 +328 @@
     {
       PINTERFACE pif=g_ptr_array_index(pLocalPI->pInterfaceArray, a); 
+
       /* Only interfaces from the file given on the command line */
       if(!strcmp(pif->chrSourceFileName, pLocalPI->chrRootSourceFile))
         {
-          gchar*  chrTemp;
-          
-          chrTemp=g_strconcat(pif->chrFileStem, ".h", NULL);
-
-          //printInterface(pif);
-          if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+          /* Only interfaces which are fully defined. No forwarder */
+          if(!pif->fIsForwardDeclaration)
             {
-              emitHFileHeader(pLocalPI, pif);
-              emitInterfaceIncludes(pLocalPI, pif);
-              emitClassVersion(pLocalPI, pif);
-              emitClassDataStructs(pLocalPI, pif);
-              emitNewMacro(pLocalPI, pif);
-              emitObjectCheckFunction(pLocalPI, pif);
-              emitNewMethods(pLocalPI, pif);
-              emitParentClassMethods(pLocalPI, pif);
-              emitHFileFooter(pLocalPI, pif);
-              closeOutfile(pLocalPI->outFile);
-            }
-          g_free(chrTemp);
-        }
-    }
-}
-
-
+              gchar*  chrTemp;
+
+              chrTemp=g_strconcat(pif->chrFileStem, ".h", NULL);
+              
+              //printInterface(pif);              
+              if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+                {
+                  emitHFileHeader(pLocalPI, pif);
+                  emitInterfaceIncludes(pLocalPI, pif);
+                  emitClassVersion(pLocalPI, pif);
+                  emitClassDataStructs(pLocalPI, pif);
+                  emitNewMacro(pLocalPI, pif);
+                  emitObjectCheckFunction(pLocalPI, pif);
+                  emitNewMethods(pLocalPI, pif);
+                  emitParentClassMethods(pLocalPI, pif);
+                  emitHFileFooter(pLocalPI, pif);
+                  closeOutfile(pLocalPI->outFile);
+                }
+              g_free(chrTemp);
+            }/* fIsForwardDeclaration */
+        }
+    }
+}
+
+

trunk/idl-compiler/parser_c/interface_parser.c

@@ -46 +46 @@
 {
   PSYMBOL pNewSymbol=g_malloc0(sizeof(SYMBOL));
+
+  // g_message("In %s for %s", __FUNCTION__, pParseInfo->pCurInterface->chrName);
 
   pParseInfo->pCurInterface->pSymbolIFace=pNewSymbol;
@@ -79 +81 @@
 static void deRegisterInterface(PINTERFACE pif)
 {
+  //  g_message("In %s", __FUNCTION__);
+
   /* Remove the interface from our list */
   g_ptr_array_remove(pParseInfo->pInterfaceArray, (gpointer) pif);
@@ -363 +367 @@
           g_free(pParseInfo->pCurInterface);
         }
-      pParseInfo->pCurInterface->chrSourceFileName=g_strdup(pParseInfo->chrCurrentSourceFile);
-      pParseInfo->pCurInterface->fIsForwardDeclaration=TRUE;
-      /* It's save to register the interface right here even if the struct is almost empty. 
-         If anything goes wrong later we will exit anyway. */
-      registerInterface();  
+      else{
+        pParseInfo->pCurInterface->chrSourceFileName=g_strdup(pParseInfo->chrCurrentSourceFile);
+        pParseInfo->pCurInterface->fIsForwardDeclaration=TRUE;
+        /* It's save to register the interface right here even if the struct is almost empty. 
+           If anything goes wrong later we will exit anyway. */
+        registerInterface();  
+      }
     }
   else
@@ -396 +402 @@
         }
       pParseInfo->pCurInterface->chrSourceFileName=g_strdup(pParseInfo->chrCurrentSourceFile);
-      pParseInfo->pCurInterface->fIsForwardDeclaration=TRUE;
       /* It's save to register the interface right here even if the struct is almost empty. 
          If anything goes wrong later we will exit anyway. */
       registerInterface();  
       if(matchNext(':'))
-        {
-          
+        {          
           parseSubclassedIFace();
         }