Changeset 274 for trunk/idl-compiler

Timestamp:

Mar 26, 2007, 9:40:01 PM (18 years ago)

Author:

cinc

Message:

H file emitter is getting into shape...

File:

• trunk/idl-compiler/h-emitter_c/h_file_emitter.c (modified) (4 diffs)

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

@@ -109 +109 @@
 }
 
-static void emitClassDataStruct(PPARSEINFO pLocalPI, PINTERFACE pif)
+static void emitClassDataStructs(PPARSEINFO pLocalPI, PINTERFACE pif)
 {
   int a;
@@ -125 +125 @@
     }
   fprintf(fh, "}%sClassData\n\n", pif->chrName);
+
+  fprintf(fh, "NOMEXTERN struct %sCClassDataStructure {\n", pif->chrName);
+  fprintf(fh, "   nomMethodTabs parentMtab;\n");
+  fprintf(fh, "   nomDToken instanceDataToken;\n");
+  fprintf(fh, "} NOMDLINK %sCClassData;\n\n", pif->chrName);
+
 }
 
@@ -274 +280 @@
 };
 
+static void emitNewMacro(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+
+  fprintf(fh, "/*\n * Class creation function\n */\n");
+  fprintf(fh, "NOMEXTERN NOMClass * NOMLINK %sNewClass(gulong clsMajorVersion, gulong clsMinorVersion);\n\n",
+          pif->chrName);
+  
+  fprintf(fh, "#define _%s (%s*)%sClassData.classObject\n\n",
+          pif->chrName, pif->chrMetaClass, pif->chrName);
+  
+  fprintf(fh, "/*\n * New macro for WPObject\n */\n\n");
+  fprintf(fh, "#define %sNew() \\\n", pif->chrName);
+  fprintf(fh, "        ((%s*)_nomNew((_%s ? _%s : ", pif->chrName, pif->chrName, pif->chrName);
+  fprintf(fh, "(%s*)%sNewClass(%s_MajorVersion, %s_MinorVersion)), (void*) 0))\n\n",
+          pif->chrName, pif->chrName, pif->chrName, pif->chrName);
+
+}
+
+static void emitParentClassMethods(PPARSEINFO pLocalPI, PINTERFACE pif)
+{
+  FILE* fh=pLocalPI->outFile;
+  PINTERFACE pifParent=pif;
+
+  while((pifParent=getParentInterface(pifParent))!=NULLHANDLE)
+    {
+      GPtrArray *pArray; 
+      int a;
+      /* Do this parents methods */
+      pArray=pifParent->pMethodArray;
+      for(a=0;a<pArray->len;a++)
+        {
+          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, "\n");
+}
+
 static void emitHFileFooter(PPARSEINFO pLocalPI, PINTERFACE pif)
 {
@@ -300 +347 @@
           emitParentHeader(pLocalPI, pif);
           emitClassVersion(pLocalPI, pif);
-          emitClassDataStruct(pLocalPI, pif);
+          emitClassDataStructs(pLocalPI, pif);
+          emitNewMacro(pLocalPI, pif);
           emitObjectCheckFunction(pLocalPI, pif);
           emitNewMethods(pLocalPI, pif);
+          emitParentClassMethods(pLocalPI, pif);
           emitHFileFooter(pLocalPI, pif);
         }