Changeset 290 for trunk/idl-compiler

Timestamp:

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

Author:

cinc

Message:

Hunting bugs...

Location:

trunk/idl-compiler

Files:

• c/emitter.c (modified) (1 diff)
• h-emitter_c/h_file_emitter.c (modified) (1 diff)
• ih-emitter_c/ih_file_emitter.c (modified) (4 diffs)
• parser_c/interface_parser.c (modified) (6 diffs)

trunk/idl-compiler/c/emitter.c

@@ -66 +66 @@
       else if(!strcmp(pm->chrType, "unsigned long"))
         chrType="CORBA_unsigned_long";
+      else if(!strcmp(pm->chrType, "boolean"))
+        chrType="CORBA_boolean";
 
       switch(pm->uiDirection)

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

@@ -302 +302 @@
           PMETHOD pm=(PMETHOD)g_ptr_array_index(pArray, a);
 
-          fprintf(fh, "#define %s_%s \\\n", pif->chrName, pm->chrName);
-          fprintf(fh, "        %s_%s \n", pifParent->chrName, pm->chrName);
+          fprintf(fh, "#define %s_%s(nomSelf, ", pif->chrName, pm->chrName);
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev) \\\n");
+          fprintf(fh, "        %s_%s((%s*) nomSelf, ", pifParent->chrName, pm->chrName, pifParent->chrName);
+          /* Do parameters */
+          emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+          fprintf(fh, " ev)\n");
         }
     }

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 */
+        }
+    }
+}
+
+

trunk/idl-compiler/parser_c/interface_parser.c

@@ -47 +47 @@
   PSYMBOL pNewSymbol=g_malloc0(sizeof(SYMBOL));
 
-  // g_message("In %s for %s", __FUNCTION__, pParseInfo->pCurInterface->chrName);
+  //g_message("In %s for %s", __FUNCTION__, pParseInfo->pCurInterface->chrName);
 
   pParseInfo->pCurInterface->pSymbolIFace=pNewSymbol;
@@ -81 +81 @@
 static void deRegisterInterface(PINTERFACE pif)
 {
-  //  g_message("In %s", __FUNCTION__);
+  //g_message("In %s", __FUNCTION__);
 
   /* Remove the interface from our list */
@@ -193 +193 @@
 static void parseIFace(GTokenType token)
 {
+
   if(matchNext(G_TOKEN_IDENTIFIER))
     {
@@ -200 +201 @@
     }
   else
-    if(matchNext(G_TOKEN_SYMBOL))
-      {
-        /* If the interface name is a symbol, it means the interface was
-           already registered before. Maybe because of a forward statement.
-           We will check that in the function which called us. */
-        
-        /* Check if it's one of our interface symbols */
-        PSYMBOL pCurSymbol;
-        GTokenValue value;
-        
-        value=gScanner->value;
-        pCurSymbol=value.v_symbol;
-        if(IDL_SYMBOL_REGINTERFACE!=pCurSymbol->uiSymbolToken)
-          {
-            //g_message("%s %d", pCurSymbol->chrSymbolName, pCurSymbol->uiKind);
-            g_scanner_unexp_token(gScanner,
-                                  G_TOKEN_SYMBOL,
-                                  NULL,
-                                  NULL,
-                                  NULL,
-                                  "Keyword 'interface' is not followed by a valid identifier.",
-                                  TRUE); /* is_error */
-            exit(1);
-          }
-        
-        /* Save interface info */
-        pParseInfo->pCurInterface->chrName=g_strdup(value.v_identifier);
+    {
+      if(matchNext(G_TOKEN_SYMBOL))
+        {
+          /* If the interface name is a symbol, it means the interface was
+             already registered before. Maybe because of a forward statement.
+             We will check that in the function which called us. */
+          
+          /* Check if it's one of our interface symbols */
+          PSYMBOL pCurSymbol;
+          GTokenValue value;
+
+          value=gScanner->value;
+          pCurSymbol=value.v_symbol;
+          if(IDL_SYMBOL_REGINTERFACE!=pCurSymbol->uiSymbolToken)
+            {
+              //g_message("%s %d", pCurSymbol->chrSymbolName, pCurSymbol->uiKind);
+              g_scanner_unexp_token(gScanner,
+                                    G_TOKEN_SYMBOL,
+                                    NULL,
+                                    NULL,
+                                    NULL,
+                                    "Keyword 'interface' is not followed by a valid identifier.",
+                                    TRUE); /* is_error */
+              exit(1);
+            }
+          /* Save interface info */
+          pParseInfo->pCurInterface->chrName=g_strdup(pCurSymbol->chrSymbolName);
+        }
+      else{
+        g_scanner_unexp_token(gScanner,
+                              G_TOKEN_IDENTIFIER,
+                              NULL,
+                              NULL,
+                              NULL,
+                              "Keyword 'interface' must be followed by an identifier",
+                              TRUE); /* is_error */
+        exit(1);
       }
-    else{
-      g_scanner_unexp_token(gScanner,
-                            G_TOKEN_IDENTIFIER,
-                            NULL,
-                            NULL,
-                            NULL,
-                            "Keyword 'interface' must be followed by an identifier",
-                            TRUE); /* is_error */
-      exit(1);
     }
 }
@@ -378 +380 @@
     {
       PINTERFACE pif;
+      gchar *chrTemp=pParseInfo->pCurInterface->chrName;
 
       /* Check if we already have a (maybe forward) declaration */
@@ -401 +404 @@
             }
         }
+      pParseInfo->pCurInterface->chrName=chrTemp;
       pParseInfo->pCurInterface->chrSourceFileName=g_strdup(pParseInfo->chrCurrentSourceFile);
       /* It's save to register the interface right here even if the struct is almost empty.