cvsuser     04/09/06 09:44:34

  Modified:    imcc     imcc.l imclexer.c
  Log:
  fixed wrong filenames in syntax error messages
  
  Revision  Changes    Path
  1.112     +3 -3      parrot/imcc/imcc.l
  
  Index: imcc.l
  ===================================================================
  RCS file: /cvs/public/parrot/imcc/imcc.l,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -w -r1.111 -r1.112
  --- imcc.l    20 Aug 2004 16:14:17 -0000      1.111
  +++ imcc.l    6 Sep 2004 16:44:34 -0000       1.112
  @@ -841,6 +841,8 @@
       FILE *file = 0;
       char *ext;
   
  +    frame = new_frame();
  +
   /* XXX: use this code for miniparrot */
   #if !defined(_PARROTLIB)
       extern const char* Parrot_imcc_include_paths[];
  @@ -867,8 +869,6 @@
   
   #endif
   
  -    frame = new_frame();
  -
       if (!file)
           fataly(EX_SOFTWARE, sourcefile, line, strerror(errno));
   
  @@ -894,7 +894,7 @@
       frame->next = frames;
       frames = frame;
   
  -    /* XXX: Switch the filename */
  +    sourcefile = frame->file;
       line = 1;
   
       yy_switch_to_buffer(yy_create_buffer(file, YY_BUF_SIZE));
  
  
  
  1.117     +3 -2      parrot/imcc/imclexer.c
  
  Index: imclexer.c
  ===================================================================
  RCS file: /cvs/public/parrot/imcc/imclexer.c,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -w -r1.116 -r1.117
  --- imclexer.c        20 Aug 2004 16:14:53 -0000      1.116
  +++ imclexer.c        6 Sep 2004 16:44:34 -0000       1.117
  @@ -2,7 +2,7 @@
   /* A lexical scanner generated by flex */
   
   /* Scanner skeleton version:
  - * $Header: /cvs/public/parrot/imcc/imclexer.c,v 1.116 2004/08/20 16:14:53 leo Exp $
  + * $Header: /cvs/public/parrot/imcc/imclexer.c,v 1.117 2004/09/06 16:44:34 jrieks 
Exp $
    */
   
   #define FLEX_SCANNER
  @@ -3943,6 +3943,8 @@
       FILE *file = 0;
       char *ext;
   
  +    frame = new_frame();
  +
   /* XXX: use this code for miniparrot */
   #if !defined(_PARROTLIB)
       extern const char* Parrot_imcc_include_paths[];
  @@ -3969,8 +3971,6 @@
   
   #endif
   
  -    frame = new_frame();
  -
       if (!file)
           fataly(EX_SOFTWARE, sourcefile, line, strerror(errno));
   
  @@ -3997,6 +3997,7 @@
       frames = frame;
   
       /* XXX: Switch the filename */
  +    sourcefile = frame->file;
       line = 1;
   
       yy_switch_to_buffer(yy_create_buffer(file, YY_BUF_SIZE));
  
  
  

Reply via email to