Changeset 272 for trunk/idl-compiler/c

Timestamp:

Mar 25, 2007, 8:49:46 PM (18 years ago)

Author:

cinc

Message:

Code cleanups. Started H file emitter.

Location:

trunk/idl-compiler/c

Files:

• nom-idl-compiler.c (modified) (5 diffs)
• printdata.c (modified) (3 diffs)

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

@@ -73 +73 @@
 
 /* The pointer array holding the interfaces we found */
-GPtrArray* pInterfaceArray;
+//GPtrArray* pInterfaceArray;
 
 /* Symbols defined for our IDL language.
@@ -110 +110 @@
 GScanner *gScanner;
 
-/* Holding info about current token. Referenced by gScanner. */
-//SYMBOLINFO curSymbol;
-
-/* Holding the current state of parsing and pointers to necessary lists. */
+/* Holding the current state of parsing and pointers to necessary lists.
+   Referenced by gScanner-user_data. */
 PARSEINFO parseInfo={0};
-PPARSEINFO pParseInfo=&parseInfo;
+PPARSEINFO pParseInfo=&parseInfo; /* This pointer will go away, don't use */
 
 /**
@@ -129 +127 @@
   int a;
 
-  for(a=0;a<pInterfaceArray->len;a++)
-    {
-      PINTERFACE pif=g_ptr_array_index(pInterfaceArray, 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;
@@ -630 +628 @@
 
   gScanner=g_scanner_new(NULL);
-  //gScanner->user_data=(gpointer)&curSymbol;
+  gScanner->user_data=(gpointer)&parseInfo;
 
   gScanner->msg_handler=funcMsgHandler;
-  pInterfaceArray=g_ptr_array_new();
+  parseInfo.pInterfaceArray=g_ptr_array_new();
 
   g_scanner_input_file(gScanner, fd);
@@ -659 +657 @@
   /* Write the output file */
   if(fOptionEmitH)
-    emitHFile(pInterfaceArray);
+    emitHFile(parseInfo.pInterfaceArray);
 
 #if 0

trunk/idl-compiler/c/printdata.c

@@ -50 +50 @@
 
 /* The pointer array holding the interfaces we found */
-extern GPtrArray* pInterfaceArray;
+extern PPARSEINFO pParseInfo;
 
 static void printOverridenMethods(GPtrArray *pArray)
@@ -131 +131 @@
 }
 
-void printInterface(void)
+void printAllInterfaces(void)
 {
   int a;
 
-  for(a=0;a<pInterfaceArray->len;a++)
+  for(a=0;a<pParseInfo->pInterfaceArray->len;a++)
     {
-      PINTERFACE pif=g_ptr_array_index(pInterfaceArray, a);
+      PINTERFACE pif=g_ptr_array_index(pParseInfo->pInterfaceArray, a);
       g_printf("Found Interface:\n");  
       g_printf("\tName:\t\t%s\n", pif->chrName);
@@ -157 +157 @@
     }
 }
+
+void printInterface(PINTERFACE pif)
+{
+  g_printf("Found Interface:\n");  
+  g_printf("\tName:\t\t%s\n", pif->chrName);
+  g_printf("\tParent:\t\t%s\n", (pif->chrParent ? pif->chrParent : "No parent"));
+  g_printf("\tMajor:\t\t%ld\n", pif->ulMajor);
+  g_printf("\tMinor:\t\t%ld\n", pif->ulMinor);
+  g_printf("\tForward decl.:\t%s\n", (pif->fIsForwardDeclaration ? "Yes" : "No"));
+  g_printf("\tMetaclass:\t%s\n", (pif->chrMetaClass ? pif->chrMetaClass : "None"));
+  g_printf("\tSource file:\t%s\n", pif->chrSourceFileName);
+  /* Print instance vars */
+  g_printf("\tInstance vars:\t%d\n", pif->pInstanceVarArray->len);
+  printInstanceVars(pif->pInstanceVarArray);
+  /* Print methods */
+  g_printf("\tNew methods:\t%d\n", pif->pMethodArray->len);
+  printMethods(pif->pMethodArray);
+  /* Print overriden methods */
+  g_printf("\tOverriden methods:\t%d\n", pif->pOverrideArray->len);
+  printOverridenMethods(pif->pOverrideArray);
+}