Diff for /capa/capa51/pProj/capaLexerDef.flex between versions 1.7 and 1.12

version 1.7, 2000/03/22 21:08:03 version 1.12, 2006/09/05 19:48:47
Line 1 Line 1
   /* main CAPA lexer
      Copyright (C) 1992-2000 Michigan State University
   
      The CAPA system is free software; you can redistribute it and/or
      modify it under the terms of the GNU General Public License as
      published by the Free Software Foundation; either version 2 of the
      License, or (at your option) any later version.
   
      The CAPA system is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      General Public License for more details.
   
      You should have received a copy of the GNU General Public
      License along with the CAPA system; see the file COPYING.  If not,
      write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
   
      As a special exception, you have permission to link this program
      with the TtH/TtM library and distribute executables, as long as you
      follow the requirements of the GNU GPL in regard to all of the
      software in the executable aside from TtH/TtM.
   */
   
 /*------------------------------------------------------------------------*/  /*------------------------------------------------------------------------*/
 /*         capaLexerDef.flex   created by Isaac Tsai Jul 15 1996          */  /*         capaLexerDef.flex   created by Isaac Tsai Jul 15 1996          */
 /*                             added /END(variable)                       */  /*                             added /END(variable)                       */
Line 28 Line 52
 #include <unistd.h>       /* access() */  #include <unistd.h>       /* access() */
 #endif  #endif
   
 #include "capaToken.h"    /* from YACC -d capaGrammarDef.y */  #define YYSTYPE Symbol*
 #include "capaCommon.h"   /* capa_access() */  #include "capaCommon.h"   /* capa_access() */
 #include "capaParser.h"   /* _symbol structure def */  #include "capaParser.h"   /* _symbol structure def */
   #include "capaToken.h"    /* from YACC -d capaGrammarDef.y */
 #include "lex_debug.h"    /* defined RETURN(xxx) macro */  #include "lex_debug.h"    /* defined RETURN(xxx) macro */
   
   
Line 1099  input()                    /* ARGUMENTS: Line 1124  input()                    /* ARGUMENTS:
        startup=0;         startup=0;
        yyin = Input_stream[Input_idx];         yyin = Input_stream[Input_idx];
   }    }
   if (!Lexi_buf[Input_idx][Lexi_pos[Input_idx]]) {    if (!Lexi_buf[Input_idx][Lexi_pos[Input_idx] ]) {
     if (fgets(Lexi_buf[Input_idx],LEX_BUFLEN-1,Input_stream[Input_idx])==NULL) {       if (fgets(Lexi_buf[Input_idx],LEX_BUFLEN-1,Input_stream[Input_idx])==NULL) { 
       /* EOF? */        /* EOF? */
       /* no use in flex        /* no use in flex
Line 1557  void newyy_input (char *buf,int *result, Line 1582  void newyy_input (char *buf,int *result,
  if ( Lexi_buf[Input_idx] == NULL ) {    if ( Lexi_buf[Input_idx] == NULL ) { 
    Lexi_buf[Input_idx] = (char *)capa_malloc(sizeof(char)*LEX_BUFLEN+1,1); out_of_char=1;     Lexi_buf[Input_idx] = (char *)capa_malloc(sizeof(char)*LEX_BUFLEN+1,1); out_of_char=1;
  } else {    } else { 
    if (!Lexi_buf[Input_idx][Lexi_pos[Input_idx]]) {      if (!Lexi_buf[Input_idx][Lexi_pos[Input_idx] ]) { 
      /* test if the line buffer is empty or at the end */        /* test if the line buffer is empty or at the end */ 
      out_of_char=1;        out_of_char=1; 
    }      } 
Line 1566  void newyy_input (char *buf,int *result, Line 1591  void newyy_input (char *buf,int *result,
    if (fgets(Lexi_buf[Input_idx],LEX_BUFLEN-1,Input_stream[Input_idx])==NULL) {      if (fgets(Lexi_buf[Input_idx],LEX_BUFLEN-1,Input_stream[Input_idx])==NULL) { 
      /* read in one line */        /* read in one line */ 
      LIDBUG_PR2("<<yy_input() fgets() returns NULL, input index=%d>>\n",Input_idx);        LIDBUG_PR2("<<yy_input() fgets() returns NULL, input index=%d>>\n",Input_idx); 
      if( (Input_idx > 0) && ( Lexi_buf[Input_idx][Lexi_pos[Input_idx]] == '\0') ) {        if( (Input_idx > 0) && ( Lexi_buf[Input_idx][Lexi_pos[Input_idx] ] == '\0') ) { 
        LIDBUG_PR2("<<yy_input() close an input stream, input index=%d>>\n",Input_idx);          LIDBUG_PR2("<<yy_input() close an input stream, input index=%d>>\n",Input_idx); 
        fclose(Input_stream[Input_idx]);          fclose(Input_stream[Input_idx]); 
        capa_mfree((char *)Lexi_buf[Input_idx]);          capa_mfree((char *)Lexi_buf[Input_idx]); 

Removed from v.1.7  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>