Changeset 287

Timestamp:

Apr 1, 2007, 12:52:34 PM (18 years ago)

Author:

cinc

Message:

Implemented interface forward declaration.

Location:

trunk/idl-compiler

Files:

• h-emitter_c/h_file_emitter.c (modified) (2 diffs)
• include/parser.h (modified) (3 diffs)
• parser_c/interface_parser.c (modified) (7 diffs)

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

@@ -72 +72 @@
 }
 
-
-static void emitParentHeader(PPARSEINFO pLocalPI, PINTERFACE pif)
-{
-  FILE* fh=pLocalPI->outFile;
-  PINTERFACE pifParent=getParentInterface(pif);
-
-  /* Include header of parent */
-  if(pifParent){
-    fprintf(fh, "/* Include for the parent class */\n");
-    if(pifParent->chrFileStem)
-      fprintf(fh, "#include \"%s.h\"\n\n", pifParent->chrFileStem);
-  }
+/**
+   This function writes an #include statement to the header for each found
+   interface. Thus all the interface information is known to the sourcefile
+   using this header.
+ */
+static void emitInterfaceIncludes(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+  int a;
+
+  for(a=0;a<pLocalPI->pInterfaceArray->len;a++)
+    {
+      PINTERFACE pifAll=g_ptr_array_index(pLocalPI->pInterfaceArray, a);
+
+      fprintf(fh, "/* Include for class %s */\n", pifAll->chrName);
+      if(pifAll->chrFileStem)
+        fprintf(fh, "#include \"%s.h\"\n", pifAll->chrFileStem);
+    }
+  fprintf(fh, "\n");
 }
 
@@ -332 +339 @@
             {
               emitHFileHeader(pLocalPI, pif);
-              emitParentHeader(pLocalPI, pif);
+              emitInterfaceIncludes(pLocalPI, pif);
               emitClassVersion(pLocalPI, pif);
               emitClassDataStructs(pLocalPI, pif);

trunk/idl-compiler/include/parser.h

@@ -73 +73 @@
 }METHOD, *PMETHOD;
 
+/* Info about a symbol */
+typedef struct
+{
+  gchar* chrSymbolName;
+  guint  uiSymbolToken;
+  guint  uiKind;
+}SYMBOL, *PSYMBOL;
+
 /* Struct holding all the info of a defined or declared interface */
 typedef struct
@@ -81 +89 @@
   gulong ulMinor;    /* Class version            */
   gboolean fIsForwardDeclaration;
+  PSYMBOL pSymbolIFace; /* Found interfaces are registered as a symbol with the parser.
+                           This is a pointer to the registered struct holding the necessary
+                           info and may be used to deregister a symbol later.*/
+  PSYMBOL pSymbolIFacePtr; /* Same as before but for the pointer on an interface which is
+                            registered automatically. */
   gboolean fIsInRootFile;
   gchar* chrMetaClass; /* Pointer to metaclass name or NULL*/
@@ -91 +104 @@
 }INTERFACE,*PINTERFACE;
 
-/* Info about a symbol */
-typedef struct
-{
-  gchar* chrSymbolName;
-  guint  uiSymbolToken;
-  guint  uiKind;
-}SYMBOL, *PSYMBOL;
 
 typedef struct

trunk/idl-compiler/parser_c/interface_parser.c

@@ -46 +46 @@
 {
   PSYMBOL pNewSymbol=g_malloc0(sizeof(SYMBOL));
+
+  pParseInfo->pCurInterface->pSymbolIFace=pNewSymbol;
 
   if(!strcmp(pParseInfo->chrRootSourceFile, pParseInfo->pCurInterface->chrSourceFileName))
@@ -65 +67 @@
      to the interface. */
   pNewSymbol=g_malloc0(sizeof(SYMBOL));
+  pParseInfo->pCurInterface->pSymbolIFacePtr=pNewSymbol;
   pNewSymbol->uiKind=KIND_TYPESPEC;
   pNewSymbol->uiSymbolToken=IDL_SYMBOL_REGINTERFACE;
@@ -72 +75 @@
                              pNewSymbol);
   //g_message("%s: %s", __FUNCTION__, pNewSymbol->chrSymbolName);
+}
+
+static void deRegisterInterface(PINTERFACE pif)
+{
+  /* Remove the interface from our list */
+  g_ptr_array_remove(pParseInfo->pInterfaceArray, (gpointer) pif);
+
+  /* Any found interface was registered as a new type so it can be
+     used in other classes. */
+  g_tree_remove(pParseInfo->pSymbolTree, pif->pSymbolIFace);
+
+  g_scanner_scope_remove_symbol(gScanner, ID_SCOPE, pif->pSymbolIFace->chrSymbolName);
+  /* For legacy support and convenience we automatically registered a pointer type
+     to the interface. */
+  g_tree_remove(pParseInfo->pSymbolTree, pif->pSymbolIFacePtr);
+  g_scanner_scope_remove_symbol(gScanner, ID_SCOPE, pif->pSymbolIFacePtr->chrSymbolName);
+  /* We don't clean up. Looking at the whole mess with string dupes and stuff in side the
+     structs I just decided to use a GC instead... */
 }
 
@@ -164 +185 @@
   Note that the current token is the 'interface' keyword.
 
-  I:= IDL_SYMBOL_INTERFACE G_TOKEN_INDENTIFIER
+  I:= IDL_SYMBOL_INTERFACE G_TOKEN_IDENTIFIER
  */
 static void parseIFace(GTokenType token)
 {
-  if(!matchNext(G_TOKEN_IDENTIFIER))
-    {
+  if(matchNext(G_TOKEN_IDENTIFIER))
+    {
+      /* Save interface info */
+      GTokenValue value=gScanner->value;
+      pParseInfo->pCurInterface->chrName=g_strdup(value.v_identifier);
+    }
+  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);
+      }
+    else{
       g_scanner_unexp_token(gScanner,
                             G_TOKEN_IDENTIFIER,
@@ -179 +234 @@
       exit(1);
     }
-  /* Save interface info */
-  GTokenValue value=gScanner->value;
-  pParseInfo->pCurInterface->chrName=g_strdup(value.v_identifier);
 }
 
@@ -273 +325 @@
                             "No opening brace in interface definition.",
                             TRUE); /* is_error */
-      exit(1);
-      
+      exit(1);      
     }
   parseIFaceBody();
@@ -301 +352 @@
   /* Get the interface name */
   parseIFace(token);
-  pParseInfo->pCurInterface->chrSourceFileName=g_strdup(pParseInfo->chrCurrentSourceFile);
-
-  /* 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(';'))
-    {
+
+  if(matchNext(';')) /* forward declaration */
+    {
+      PINTERFACE pif;
+
+      /* Check if we already have a (maybe forward) declaration */
+      pif=findInterfaceFromName(pParseInfo->pCurInterface->chrName);
+      if(pif)
+        {
+          g_free(pParseInfo->pCurInterface);
+        }
+      pParseInfo->pCurInterface->chrSourceFileName=g_strdup(pParseInfo->chrCurrentSourceFile);
       pParseInfo->pCurInterface->fIsForwardDeclaration=TRUE;
-    }
-  else if(matchNext(':'))
-    {
-      parseSubclassedIFace();
-    }
-  else if(matchNext('{'))
-    {
-      parseIFaceBody();
+      /* 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
     {
-      g_message("Line %d: Error in interface declaration",  g_scanner_cur_line(gScanner));
-      exit(0);
-    }
-}
-
+      PINTERFACE pif;
+
+      /* Check if we already have a (maybe forward) declaration */
+      pif=findInterfaceFromName(pParseInfo->pCurInterface->chrName);
+      if(pif)
+        {
+          if(pif->fIsForwardDeclaration)
+            {
+              /* Remove the forward declaration and insert the real thing afterwards. */
+              deRegisterInterface(pif);
+            }
+          else
+            {
+              /* Oops, we already have an interface declaration */
+              g_scanner_unexp_token(gScanner,
+                                    G_TOKEN_SYMBOL,
+                                    NULL,
+                                    NULL,
+                                    NULL,
+                                    "An interface with this name was already declared.",
+                                    TRUE); /* is_error */
+              exit(1);
+            }
+        }
+      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();
+        }
+      else if(matchNext('{'))
+        {          
+          parseIFaceBody();
+        }
+      else
+        {
+          g_message("Line %d: Error in interface declaration",  g_scanner_cur_line(gScanner));
+          exit(0);
+        }
+    }
+}
+