[Dotgnu-pnet-commits] CVS: pnet/ilasm ilasm.c,1.1,1.2 ilasm_main.c,1.11,1.12

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/ilasm
In directory subversions:/tmp/cvs-serv15600/ilasm

Modified Files:
        ilasm.c ilasm_main.c 
Log Message:


Pipe the assembly code output of language plugins directly into the
assembler if it is possible to do so, to avoid unnecessary
on-disk temporary files.


Index: ilasm.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilasm/ilasm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ilasm.c     13 Dec 2002 00:33:30 -0000      1.1
--- ilasm.c     9 Feb 2003 00:56:26 -0000       1.2
***************
*** 19,31 ****
   */
  
  #ifdef        __cplusplus
  extern        "C" {
  #endif
  
! int ILAsmMain(int argc, char *argv[]);
  
  int main(int argc, char *argv[])
  {
!       return ILAsmMain(argc, argv);
  }
  
--- 19,33 ----
   */
  
+ #include <stdio.h>
+ 
  #ifdef        __cplusplus
  extern        "C" {
  #endif
  
! int ILAsmMain(int argc, char *argv[], FILE *newStdin);
  
  int main(int argc, char *argv[])
  {
!       return ILAsmMain(argc, argv, (FILE *)0);
  }
  

Index: ilasm_main.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilasm/ilasm_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ilasm_main.c        8 Feb 2003 04:24:29 -0000       1.11
--- ilasm_main.c        9 Feb 2003 00:56:26 -0000       1.12
***************
*** 135,139 ****
  static void reset(void);
  
! int ILAsmMain(int argc, char *argv[])
  {
        char *progname = argv[0];
--- 135,139 ----
  static void reset(void);
  
! int ILAsmMain(int argc, char *argv[], FILE *newStdin)
  {
        char *progname = argv[0];
***************
*** 474,478 ****
                        {
                                ILAsmFilename = "stdin";
!                               ilasm_restart(stdin);
                                ILAsmErrors |= ilasm_parse();
                                sawStdin = 1;
--- 474,487 ----
                        {
                                ILAsmFilename = "stdin";
!                               if(newStdin)
!                               {
!                                       /* Use the replacement stream if our 
input is
!                                          actually coming from a pipe */
!                                       ilasm_restart(newStdin);
!                               }
!                               else
!                               {
!                                       ilasm_restart(stdin);
!                               }
                                ILAsmErrors |= ilasm_parse();
                                sawStdin = 1;