Changeset 277 for trunk/idl-compiler

Timestamp:

Mar 27, 2007, 7:58:40 PM (18 years ago)

Author:

cinc

Message:

IDL compiler: improved outfile handling.

Location:

trunk/idl-compiler

Files:

• Makefile (modified) (1 diff)
• c/nom-idl-compiler.c (modified) (8 diffs)
• h-emitter_c/h_file_emitter.c (modified) (2 diffs)
• ih-emitter_c/ih_file_emitter.c (modified) (2 diffs)
• include/parser.h (modified) (3 diffs)
• parser_c/filestem_parser.c (added)

trunk/idl-compiler/Makefile

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

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

@@ -55 +55 @@
 
 static gchar* chrOutputDir="";
-static gchar* chrOutputName="";
 static gboolean fOptionEmitH=FALSE;
 static gboolean fOptionEmitIH=FALSE;
@@ -67 +66 @@
   {"emit-ih", 0, 0, G_OPTION_ARG_NONE, &fOptionEmitIH, "Emmit an include header (*.ih)", NULL},
   {"emit-c", 0, 0, G_OPTION_ARG_NONE, &fOptionEmitC, "Emmit an implementation template (*.c)", NULL},
-  {"output", 'o', 0, G_OPTION_ARG_FILENAME, &chrOutputName, "Output name. Must not be omitted.", NULL},
   {NULL}
 };
@@ -480 +478 @@
   helpCmd[0]=chrExeName;
 
-  g_printf("An output filename must always be specified. If the name is an absolute path\n\
-it will be used unmodified. Otherwise the output name is built from the given\n\
-name and the directory specification.\n\n\
+  g_printf("The output filename is specified in the IDL file using the 'filestem' keyword.\n\
 -If no directory is specified the output name is built from the current directory\n\
  path and the given filename.\n\
@@ -533 +529 @@
   /* Vars for filename building */
   char* chrOutputFileName="";
-  char* chrTemp;
 
   GError *gError = NULL;
@@ -565 +560 @@
   }
 
-  if(strlen(chrOutputName)==0)
-    {
-      g_printf("No output file name given.\n\n");
-      outputCompilerHelp(gContext, argv[0]);
-    }
   g_option_context_free(gContext);
 
@@ -585 +575 @@
 
   
-  /*** Create output file name ****/
-  if(!g_path_is_absolute(chrOutputName))
-    {
-      if(g_path_is_absolute(chrOutputDir))
-        chrOutputFileName=g_build_filename(chrOutputDir, chrOutputName, NULL);
-      else
-        {
-          /* Yes this is a memory leak but I don't care */
-          chrOutputFileName=g_build_filename(g_get_current_dir(), chrOutputDir, chrOutputName, NULL);
-        }
-    }
+  /*** Create output path name ****/
+  if(g_path_is_absolute(chrOutputDir))
+    chrOutputFileName=chrOutputDir;
   else
-    chrOutputFileName=chrOutputName;
-
-  /* Add emitter extension */
-  if(fOptionEmitH)
-    chrTemp=g_strconcat(chrOutputFileName, ".h", NULL);
-  else if(fOptionEmitIH)
-    chrTemp=g_strconcat(chrOutputFileName, ".ih", NULL);
-  else if(fOptionEmitC)
-    chrTemp=g_strconcat(chrOutputFileName, ".c", NULL);
-  g_free(chrOutputFileName);
-  chrOutputFileName=chrTemp;
-
-  g_message("Output file: %s", chrOutputFileName);
+    {
+      /* Yes this is a memory leak but I don't care */
+      chrOutputFileName=g_build_filename(g_get_current_dir(), chrOutputDir, NULL);
+    }
+
+  g_message("Output path: %s", chrOutputFileName);
+  parseInfo.chrOutfilePath=chrOutputFileName;
 
   /* Open input */
@@ -622 +598 @@
       exit(1);
     }
-  
-  /* Open output */
-  parseInfo.outFile=fopen(chrOutputFileName, "w");
 
   g_printf("\n");
@@ -663 +636 @@
 
 #if 0
-  else if(fOptionEmitIH)
-
   else if(fOptionEmitC)
     a++;

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

@@ -38 +38 @@
 #include <glib.h> 
 #include <glib/gprintf.h> 
+
+#define INCL_FILE
 #include "parser.h"
 
@@ -340 +342 @@
     {
       PINTERFACE pif=g_ptr_array_index(pLocalPI->pInterfaceArray, a); 
+      /* Only interfaces from the file given on the command line */
       if(!strcmp(pif->chrSourceFileName, pLocalPI->chrRootSourceFile))
         {
+          gchar*  chrTemp;
+          
+          chrTemp=g_strconcat(pif->chrFileStem, ".h", NULL);
+
           printInterface(pif);
-
-          emitHFileHeader(pLocalPI, pif);
-          emitParentHeader(pLocalPI, pif);
-          emitClassVersion(pLocalPI, pif);
-          emitClassDataStructs(pLocalPI, pif);
-          emitNewMacro(pLocalPI, pif);
-          emitObjectCheckFunction(pLocalPI, pif);
-          emitNewMethods(pLocalPI, pif);
-          emitParentClassMethods(pLocalPI, pif);
-          emitHFileFooter(pLocalPI, pif);
+          if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+            {
+              emitHFileHeader(pLocalPI, pif);
+              emitParentHeader(pLocalPI, pif);
+              emitClassVersion(pLocalPI, pif);
+              emitClassDataStructs(pLocalPI, pif);
+              emitNewMacro(pLocalPI, pif);
+              emitObjectCheckFunction(pLocalPI, pif);
+              emitNewMethods(pLocalPI, pif);
+              emitParentClassMethods(pLocalPI, pif);
+              emitHFileFooter(pLocalPI, pif);
+              closeOutfile(pLocalPI->outFile);
+            }
+          g_free(chrTemp);
         }
     }

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

@@ -51 +51 @@
   /* 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);
 
@@ -62 +62 @@
   FILE* fh=pLocalPI->outFile;
 
-  fprintf(fh, "#ifdef __cplusplus\n");
-  fprintf(fh, "}\n");
-  fprintf(fh, "#endif /* __cplusplus */\n\n");
 
   fprintf(fh, "\n#endif /* %s_IH */\n", pif->chrName);

trunk/idl-compiler/include/parser.h

@@ -83 +83 @@
   gboolean fIsInRootFile;
   gchar* chrMetaClass; /* Pointer to metaclass name or NULL*/
+  char*  chrFileStem;  /* Holding output filestem */
   char*  chrSourceFileName; /* The preprocessor includes files for us. This is the info
                                about the file this interface is defined in. */
-  char*  chrFileStem;  /* Holding output filestem */
   GPtrArray *pMethodArray;
   GPtrArray *pOverrideArray;
@@ -111 +111 @@
   char*     chrCurrentSourceFile;/* The preprocessor includes files for us. This is the info
                                     about their name. */
+  char*  chrOutfilePath;         /* This is only the path, no filename */
   FILE*     outFile;             /* Output file handle */
 }PARSEINFO, *PPARSEINFO;
@@ -182 +183 @@
 void printInterface(PINTERFACE pif);
 void printAllInterfacec(void);
+
+#ifdef INCL_FILE
+FILE* openOutfile(GScanner *gScanner, gchar* chrOutName);
+void closeOutfile(FILE* pFile);
+#endif