diff --git a/ase/stx/parser.c b/ase/stx/parser.c index 82455d61..647b9f88 100644 --- a/ase/stx/parser.c +++ b/ase/stx/parser.c @@ -1,5 +1,5 @@ /* - * $Id: parser.c,v 1.17 2005-06-06 16:01:49 bacon Exp $ + * $Id: parser.c,v 1.18 2005-06-06 16:14:21 bacon Exp $ */ #include @@ -119,7 +119,6 @@ static int __get_token (xp_stx_parser_t* parser) c = parser->curc; xp_stx_token_clear (&parser->token); -xp_printf (XP_TEXT("xxxxxxxxxx[%d][%d]xxx\n"), c, XP_STX_CHAR_EOF); if (c == XP_STX_CHAR_EOF) { parser->token.type = XP_STX_TOKEN_END; } diff --git a/ase/test/stx/parser.c b/ase/test/stx/parser.c index 6171ac1d..668bd6f6 100644 --- a/ase/test/stx/parser.c +++ b/ase/test/stx/parser.c @@ -75,13 +75,17 @@ int stdio_func (int cmd, void* owner, void* arg) else if (cmd == XP_STX_PARSER_INPUT_CONSUME) { stdio_t* p = (stdio_t*)owner; xp_cint_t* c = (xp_cint_t*)arg; - xp_cint_t t = (xp_cint_t)xp_fgetc (p->stdio); -xp_printf (XP_TEXT("*c -> %d %d %d\n"), t, XP_CHAR_EOF, EOF); - if (t == XP_CHAR_EOF) { - if (xp_ferror (p->stdio)) return -1; + if (xp_feof(p->stdio)) { *c = XP_STX_CHAR_EOF; } - else *c = t; + else { + xp_cint_t t = xp_fgetc (p->stdio); + if (t == XP_CHAR_EOF) { + if (xp_ferror (p->stdio)) return -1; + *c = XP_STX_CHAR_EOF; + } + else *c = t; + } return 0; } else if (cmd == XP_STX_PARSER_INPUT_REWIND) {