Changeset 292 for trunk/idl-compiler

Timestamp:

Apr 1, 2007, 5:17:12 PM (18 years ago)

Author:

cinc

Message:

Created C file emitter. Some fixes.

Location:

trunk/idl-compiler

Files:

• Makefile (modified) (4 diffs)
• c-emitter_c (added)
• c-emitter_c/Makefile (added)
• c-emitter_c/c_file_emitter.c (added)
• c/nom-idl-compiler.c (modified) (1 diff)
• c/util.c (modified) (1 diff)
• h-emitter_c/h_file_emitter.c (modified) (1 diff)
• include/parser.h (modified) (2 diffs)

trunk/idl-compiler/Makefile

@@ -14 +14 @@
 HEMITTERDIR     =       ./h-emitter_c
 IHEMITTERDIR    =       ./ih-emitter_c
+CEMITTERDIR     =       ./c-emitter_c
 
 CFLAGS          =       -Zmt -Zcrtdll -D__OS2__ -D__ST_MT_ERRNO__ -c -Wall
@@ -31 +32 @@
                         $(OBJDIR)/emitter.o \
                         $(OBJDIR)/open_outfile.o \
+                        $(OBJDIR)/printdata.o \
                         $(OBJDIR)/typespec_parser.o \
                         $(OBJDIR)/method_parser.o \
@@ -43 +45 @@
                         $(OBJDIR)/h_file_emitter.o \
                         $(OBJDIR)/ih_file_emitter.o \
-                        $(OBJDIR)/printdata.o
+                        $(OBJDIR)/c_file_emitter.o
 
 
@@ -80 +82 @@
         $(CC) -I $(INC) $(CFLAGS)  -o$@ $<
 
+$(OBJDIR)/%.o:  $(CEMITTERDIR)/%.c $(INCDIR)/parser.h
+        $(CC) -I $(INC) $(CFLAGS)  -o$@ $<
+
 # Create the directories for temp files
 $(OBJDIR)/o.dep:

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

@@ -612 +612 @@
   if(fOptionEmitH)
     emitHFile(parseInfo.pInterfaceArray);
-  if(fOptionEmitIH)
+  else if(fOptionEmitIH)
     emitIHFile(parseInfo.pInterfaceArray);
-
-#if 0
   else if(fOptionEmitC)
-    a++;
-
-  if(pInterfaceArray->len)
-    printInterface();
-#endif
+    emitCFile(parseInfo.pInterfaceArray);
 
   g_scanner_destroy(gScanner);

trunk/idl-compiler/c/util.c

@@ -162 +162 @@
   return findInterfaceFromName(pif->chrParent);
 }
+
+gboolean queryMessageReturnsAValue(PMETHOD pm)
+{
+  if(pm->mpReturn.uiStar)
+    return TRUE;
+
+  if(!strcmp(pm->mpReturn.chrType, "void"))
+    return FALSE;
+
+  return TRUE;
+}
+

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

@@ -162 +162 @@
 
       /* Do return type */
-      fprintf(fh, "typedef %s", pm->mpReturn.chrType);
-      for(b=0;b<pm->mpReturn.uiStar;b++)
-        fprintf(fh, "*");
+      fprintf(fh, "typedef ");
+      emitReturnType(pLocalPI, pif, pm);
 
       fprintf(fh, " NOMLINK nomTP_%s_%s(%s* nomSelf,\n", pif->chrName,  pm->chrName, pif->chrName);

trunk/idl-compiler/include/parser.h

@@ -185 +185 @@
 void emitHFile(GPtrArray* pInterfaceArray);
 void emitIHFile(GPtrArray* pInterfaceArray);
+void emitCFile(GPtrArray* pInterfaceArray);
 
 /* Emitter support function */
@@ -199 +200 @@
 PINTERFACE findInterfaceFromName(gchar* chrName);
 PMETHOD findMethodInfoFromMethodName(PINTERFACE pif, gchar* chrName);
+gboolean queryMessageReturnsAValue(PMETHOD pm);
 
 #ifdef INCL_FILE