=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.50 retrieving revision 1.52 diff -u -p -r1.50 -r1.52 --- OpenXM_contrib2/asir2000/parse/lex.c 2015/08/14 13:51:56 1.50 +++ OpenXM_contrib2/asir2000/parse/lex.c 2017/03/28 03:26:33 1.52 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.49 2015/08/08 14:19:42 fujimoto Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.51 2016/08/24 08:21:03 ohara Exp $ */ #include #include "ca.h" @@ -74,7 +74,6 @@ extern Obj VOIDobj; extern int main_parser; extern char *parse_strp; -extern int recv_intr; #define NBUFSIZ (BUFSIZ*10) #define TBUFSIZ (BUFSIZ) @@ -188,6 +187,7 @@ int yylex() i = 0; do { c = Getc(); + if ( c == '\n' ) asir_infile->ln++; if ( c == '\\' ) { c1 = Getc(); if ( c1 == 'n' ) { @@ -625,16 +625,7 @@ int Egetc(FILE *fp) #endif c = getc(fp); #if defined(VISUAL) || defined(__MINGW32__) - if ( recv_intr ) { -#include - if ( recv_intr == 1 ) { - recv_intr = 0; - int_handler(SIGINT); - } else { - recv_intr = 0; - ox_usr1_handler(0); - } - } + check_intr(); #endif if ( c == EOF ) return c;