Changeset 278 for trunk/idl-compiler

Timestamp:

Mar 27, 2007, 10:22:54 PM (18 years ago)

Author:

cinc

Message:

Work on IH file emitter.

Location:

trunk/idl-compiler

Files:

• Makefile (modified) (1 diff)
• c/emitter.c (added)
• c/nom-idl-compiler.c (modified) (1 diff)
• c/util.c (added)
• h-emitter_c/h_file_emitter.c (modified) (2 diffs)
• ih-emitter_c/ih_file_emitter.c (modified) (5 diffs)
• include/parser.h (modified) (1 diff)

trunk/idl-compiler/Makefile

@@ -28 +28 @@
 PGOBJECTS       =       $(OBJDIR)/nom-idl-compiler.o \
                         $(OBJDIR)/token.o \
+                        $(OBJDIR)/util.o \
+                        $(OBJDIR)/emitter.o \
                         $(OBJDIR)/open_outfile.o \
                         $(OBJDIR)/typespec_parser.o \

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

@@ -114 +114 @@
 PPARSEINFO pParseInfo=&parseInfo; /* This pointer will go away, don't use */
 
-/**
-   Helper function which scans the array of known interfaces and returns the interface
-   structure for the given name. 
-
-   \PARAM chrName Name of the interface.
-   \Returns If no interface with that name can be found NULL is returned otherwise a
-   pointer to the interface structure..
- */
-PINTERFACE findInterfaceFromName(gchar* chrName)
-{
-  int a;
-
-  for(a=0;a<parseInfo.pInterfaceArray->len;a++)
-    {
-      PINTERFACE pif=g_ptr_array_index(parseInfo.pInterfaceArray, a);
-      if(!strcmp(chrName, pif->chrName))
-        return pif;
-    }
-
-  return NULL;
-}
 
 /**

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

@@ -72 +72 @@
 }
 
-/**
-   Returns the interface structure (holding all the interface information) of the
-   parent of an interface.
-
-   \Param pif Pointer to an interface structure.
-   \Returns The interface data structure of the parent interface or NULL if the
-   interface has no parent.
-
- */
-static PINTERFACE getParentInterface(PINTERFACE pif)
-{
-  if(pif->chrParent==NULL)
-    return NULL;
-
-  return findInterfaceFromName(pif->chrParent);
-}
 
 static void emitParentHeader(PPARSEINFO pLocalPI, PINTERFACE pif)
@@ -145 +129 @@
 }
 
-/*
-  \param pArray Pointer to the list of parameters.
- */
-static void emitMethodParams(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray)
-{
-  FILE* fh=pLocalPI->outFile;
-  int a;
-
-  for(a=0;a<pArray->len;a++)
-    {
-      int b;
-      PMETHODPARAM pm=(PMETHODPARAM)g_ptr_array_index(pArray, a);
-
-      switch(pm->uiDirection)
-        {
-        case PARM_DIRECTION_IN:
-          fprintf(fh, "    const %s", pm->chrType);
-          break;
-        case PARM_DIRECTION_OUT:
-          fprintf(fh, "    %s*", pm->chrType);
-          break;
-        case PARM_DIRECTION_INOUT:
-
-          break;
-        default:
-          fprintf(fh, "    %s*", pm->chrType);
-          break;
-        }
-      for(b=0;b<pm->uiStar;b++)
-        fprintf(fh, "*");
-      fprintf(fh, " %s,\n", pm->chrName);      
-    }
-}
-
-/*
-  \param pArray Pointer to the list of parameters.
- */
-static void emitMethodParamsNoTypes(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray)
-{
-  FILE* fh=pLocalPI->outFile;
-  int a;
-
-  for(a=0;a<pArray->len;a++)
-    {
-      PMETHODPARAM pm=(PMETHODPARAM)g_ptr_array_index(pArray, a);
-      fprintf(fh, " %s,", pm->chrName);      
-    }
-}
 
 static void emitNewMethods(PPARSEINFO pLocalPI, PINTERFACE pif)

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

@@ -38 +38 @@
 #include <glib.h> 
 #include <glib/gprintf.h> 
+
+#define INCL_FILE
 #include "parser.h"
 
@@ -44 +46 @@
 static void emitIHFileHeader(PPARSEINFO pLocalPI, PINTERFACE pif)
 {
-  FILE* fh=pLocalPI->outFile;
+  gchar *chrTemp;
+  FILE* fh=pLocalPI->outFile;
+
   fprintf(fh, "/*\n * This file was generated by the NOM IDL compiler for Voyager - DO NOT EDIT!\n");
   fprintf(fh, " *\n *\n * And remember, phase 3 is near...\n */\n");
@@ -51 +55 @@
   /* Protective #ifndef for whole file */
   fprintf(fh, "#ifndef %s_IH\n#define %s_IH\n\n", pif->chrName, pif->chrName);
-  /* The *.h of this class conatins some declarations we need */
-  fprintf(fh, "#include \"%s.h\"\n", pif->chrName);
-
-}
-
-
+
+  /* The *.h of this class contains some declarations we need */
+  chrTemp=strlwr(g_strdup(pif->chrName));
+  fprintf(fh, "#include \"%s.h\"\n\n", chrTemp);
+  g_free(chrTemp);
+}
+
+
+static void emitInstanceVariables(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  int a;
+  FILE* fh=pLocalPI->outFile;
+  GPtrArray *pArray=pif->pInstanceVarArray;;
+
+  fprintf(fh, "/*\n * Instance variables for %s\n */\n", pif->chrName);
+  fprintf(fh, "typedef struct {\n");
+
+  for(a=0;a<pArray->len;a++)
+    {
+      int b;
+      PMETHODPARAM piv=(PMETHODPARAM)g_ptr_array_index(pArray, a);
+
+            fprintf(fh, "    %s", piv->chrType);
+            for(b=0;b<piv->uiStar;b++)
+              fprintf(fh, "*");
+            fprintf(fh, "  %s;\n", piv->chrName);
+    }
+  fprintf(fh, "}%sData;\n\n", pif->chrName);
+}
+
+static void emitGetDataMacros(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+  GPtrArray *pArray=pif->pInstanceVarArray;;
+  int a;
+
+  fprintf(fh, "/*\n * Get data macros for %s\n */\n", pif->chrName);
+  fprintf(fh, "typedef %sData* NOMLINK nomTP_%s_DataThunk(void*);\n",
+          pif->chrName , pif->chrName);
+  fprintf(fh, "typedef nomTP_%s_DataThunk *nomTD_%s_DataThunk;\n",
+          pif->chrName , pif->chrName);
+
+  fprintf(fh, "#define %sGetData(nomSelf) \\\n", pif->chrName);
+  fprintf(fh, "    (((nomTD_%s_DataThunk)(%sCClassData.instanceDataToken))(nomSelf))\n",
+          pif->chrName , pif->chrName);
+
+  for(a=0;a<pArray->len;a++)
+    {
+      PMETHODPARAM piv=(PMETHODPARAM)g_ptr_array_index(pArray, a);
+      
+      fprintf(fh, "#define  _%s (nomThis->%s);\n", piv->chrName, piv->chrName);
+    }
+  fprintf(fh, "\n");
+}
+
+
+static void emitIHClassDataStructs(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+
+  fprintf(fh, "#ifdef NOM_%s_IMPLEMENTATION_FILE\n\n", pif->chrName);
+
+  fprintf(fh, "/*** Class data structures ***/\n");
+  fprintf(fh, "struct %sClassDataStructure %sClassData = {0};\n", pif->chrName, pif->chrName );
+  fprintf(fh, "static struct %sCClassDataStructure %sCClassData = {0};\n\n",
+          pif->chrName, pif->chrName);
+}
+
+#if 0
+/* Function to check if an object is valid before calling a method on it */
+#ifdef NOM_NO_PARAM_CHECK /* Disabled by now because not working */
+NOMEXTERN gboolean NOMLINK objectCheckFunc_WPRootFolder(WPRootFolder *nomSelf, gchar* chrMethodName)
+{
+if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf , WPRootFolderClassData.classObject, NULLHANDLE))
+  {
+  nomPrintObjectPointerError(nomSelf, "WPRootFolder", chrMethodName);
+  g_message("Note that NULL is returned for the call (if the method returns a value). This may not be correct. Use the NOMPARMCHECK() macro to specify default return values for methods.");
+  return FALSE;
+  }
+  return TRUE;
+}
+#endif
+#endif
+
+static void emitOverridenMethods(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+  GPtrArray *pArray;
+  int a;
+
+  pArray=pif->pOverrideArray;
+
+  for(a=0;a<pArray->len;a++)
+    {
+      int b;
+      POVERMETHOD pom=(POVERMETHOD)g_ptr_array_index(pArray, a);
+      /* Method information */
+      PMETHOD pm=findMethodInfoFromMethodName(pif, pom->chrName);
+      /* Pointer to interface which introduced the method */
+      PINTERFACE pifIntroduced=findInterfaceFromMethodName(pif, pom->chrName);
+
+      fprintf(fh, "/*\n * Overriden method: %s \n */\n",  pom->chrName);
+      fprintf(fh, "#ifndef _decl_impl_%s_%s_\n", pif->chrName, pom->chrName);
+      fprintf(fh, "#define _decl_impl_%s_%s_\n", pif->chrName,  pom->chrName);
+
+      if(!pm || !pifIntroduced)
+        {
+          g_message("Can't get information about method \"%s\" from parent classes while overriding.", pom->chrName);
+          exit(1);
+        }
+
+      fprintf(fh, "NOM_Scope %s", pm->mpReturn.chrType);
+      for(b=0;b<pm->mpReturn.uiStar;b++)
+        fprintf(fh, "*");
+
+      fprintf(fh, " NOMLINK impl_%s_%s(%s* nomSelf,\n", pif->chrName, pom->chrName, pif->chrName);
+      /* Do parameters */
+      emitMethodParams(pLocalPI, pif, pm->pParamArray);
+      fprintf(fh, " CORBA_Environment *ev);\n");
+      fprintf(fh, "static char* nomIdString_%s_%s = \"%s:%s\";\n",
+              pif->chrName, pom->chrName, pifIntroduced->chrName, pom->chrName);
+      fprintf(fh, "static nomMethodProc* %s_%s_parent_resolved;\n",
+              pif->chrName, pom->chrName);
+      fprintf(fh, "#define %s_%s_parent(nomSelf,",
+              pif->chrName, pom->chrName);
+      emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+      fprintf(fh, " ev) \\\n");
+      fprintf(fh, "        (((nomTD_%s_%s) \\\n", pif->chrName, pom->chrName);
+
+      fprintf(fh, "        %s_%s_parent_resolved)((%s*)nomSelf,",
+              pif->chrName, pom->chrName, pifIntroduced->chrName);
+      emitMethodParamsNoTypes(pLocalPI, pif, pm->pParamArray);
+      fprintf(fh, " ev))\n");
+      fprintf(fh, "#endif /* _decl_impl_%s_%s_ */\n\n", pif->chrName, pom->chrName);
+    }
+};
+
+static void emitOverridenMethodTable(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+  GPtrArray *pArray;
+  int a;
+
+  fprintf(fh, "/*** Overriden method table ***/\n");
+  fprintf(fh, "static nomOverridenMethodDesc nomOverridenMethodsWPRootFolder[] = {\n");
+
+  for(a=0;a<pArray->len;a++)
+    {
+      POVERMETHOD pom=(POVERMETHOD)g_ptr_array_index(pArray, a);
+      /* Method information */
+      PMETHOD pm=findMethodInfoFromMethodName(pif, pom->chrName);
+
+      if(!pm)
+        {
+          g_message("Can't get information about method \"%s\" from parent classes while overriding.", pom->chrName);
+          exit(1);
+        }
+
+      fprintf(fh, "  {\n");
+      fprintf(fh, "    &nomIdString_%s_%s,\n", pif->chrName,  pom->chrName);
+      fprintf(fh, "    (nomMethodProc*) impl_%s_%s,\n", pif->chrName,  pom->chrName);
+      fprintf(fh, "    &%s_%s_parent_resolved\n", pif->chrName,  pom->chrName);
+      fprintf(fh, "  },\n");
+    }
+    fprintf(fh, "};\n\n");
+
+}
 
 static void emitIHFileFooter(PPARSEINFO pLocalPI, PINTERFACE pif)
@@ -62 +227 @@
   FILE* fh=pLocalPI->outFile;
 
-
-  fprintf(fh, "\n#endif /* %s_IH */\n", pif->chrName);
+  fprintf(fh, "\n#endif /* NOM_%s_IMPLEMENTATION_FILE */\n", pif->chrName);
+  fprintf(fh, "#endif/* %s_IH */\n", pif->chrName);
 }
 
@@ -76 +241 @@
       if(!strcmp(pif->chrSourceFileName, pLocalPI->chrRootSourceFile))
         {
-          emitIHFileHeader(pLocalPI, pif);
-
-          emitIHFileFooter(pLocalPI, pif);
+          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);
+              emitOverridenMethods(pLocalPI, pif);
+              emitOverridenMethodTable(pLocalPI, pif);
+
+              emitIHFileFooter(pLocalPI, pif);
+            }
+          g_free(chrTemp);
         }
     }

trunk/idl-compiler/include/parser.h

@@ -180 +180 @@
 void emitIHFile(GPtrArray* pInterfaceArray);
 
+/* Emitter support function */
+void emitMethodParams(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray);
+void emitMethodParamsNoTypes(PPARSEINFO pLocalPI, PINTERFACE pif, GPtrArray *pArray);
+
 /* In printdata.c */
 void printInterface(PINTERFACE pif);
 void printAllInterfacec(void);
+
+PINTERFACE getParentInterface(PINTERFACE pif);
+PINTERFACE findInterfaceFromMethodName(PINTERFACE pif, gchar* chrName);
+PINTERFACE findInterfaceFromName(gchar* chrName);
+PMETHOD findMethodInfoFromMethodName(PINTERFACE pif, gchar* chrName);
 
 #ifdef INCL_FILE