X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=293e46b5c15aeb41d810d4332ea068cff99db83a;hp=42a432b8afbb0c3ed257df0c1a05aa879bc7a628;hb=82288619e7818f51a557d8152455564e95b4fa93;hpb=a5928fbda28b1b7f5b5939a9d49754660a0d546c diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll index 42a432b8..293e46b5 100644 --- a/ginsh/ginsh_lexer.ll +++ b/ginsh/ginsh_lexer.ll @@ -28,16 +28,7 @@ %{ #include "config.h" -#include -extern "C" { -#include -#include -} -#include - -#include #include "ginsh.h" - #include "ginsh_parser.h" #define YY_INPUT(buf, result, max_size) (result = ginsh_input(buf, max_size)) @@ -131,9 +122,9 @@ static int ginsh_input(char *buf, int max_size) { int result; if (yy_current_buffer->yy_is_interactive) { - int actual; - +#ifdef HAVE_LIBREADLINE // Do we need to read a new line? + int actual; if (line_length == 0) { // Free old line @@ -164,7 +155,17 @@ static int ginsh_input(char *buf, int max_size) line_length -= actual; line_ptr += actual; result = actual; - +#else + printf("> "); fflush(stdout); + int c = '*', n; + for (n = 0; n < max_size && (c = getc(yyin)) != EOF && c != '\n'; ++n) + buf[n] = (char)c; + if (c == '\n') + buf[n++] = (char)c; + if (c == EOF && ferror(yyin)) + YY_FATAL_ERROR("input in flex scanner failed"); + result = n; +#endif } else if (((result = fread(buf, 1, max_size, yyin)) == 0) && ferror(yyin)) YY_FATAL_ERROR("input in flex scanner failed");