- print 0 without parens.

[ginac.git] / ginsh / ginsh_lexer.ll

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 42a432b8afbb0c3ed257df0c1a05aa879bc7a628..fddc0b3718c47618a51a5860114a0435bb580400 100644 (file)
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -3,7 +3,7 @@
  *  Lexical analyzer definition for ginsh.
  *  This file must be processed with flex.
  *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,16 +28,7 @@
 %{
 #include "config.h"
 
-#include <stdio.h>
-extern "C" {
-#include <readline/readline.h>
-#include <readline/history.h>
-}
-#include <map>
-
-#include <ginac/ginac.h>
 #include "ginsh.h"
-
 #include "ginsh_parser.h"
 
 #define YY_INPUT(buf, result, max_size) (result = ginsh_input(buf, max_size))
@@ -76,7 +67,10 @@ Digits                       yylval = (long)Digits; return T_DIGITS;
 
                        /* keywords */
 quit|exit              return T_QUIT;
+warranty               return T_WARRANTY;
 print                  return T_PRINT;
+read                   return T_READ;
+write                  return T_WRITE;
 time                   return T_TIME;
 xyzzy                  return T_XYZZY;
 inventory              return T_INVENTORY;
@@ -131,9 +125,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 +158,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");