[PATCH] Fix zeta(x, s).evalf() when x and s aren't lists.

[ginac.git] / ginsh / ginsh_lexer.lpp

diff --git a/ginsh/ginsh_lexer.lpp b/ginsh/ginsh_lexer.lpp
index a3824cd2730fd3b3a7061fd007b8a793d3462226..bc008b4edc6e15b78abbb3958cf97f53b8f1426e 100644 (file)
--- a/ginsh/ginsh_lexer.lpp
+++ b/ginsh/ginsh_lexer.lpp
@@ -4,7 +4,7 @@
  *  This file must be processed with flex. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2020 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
@@ -26,6 +26,8 @@
  *  Definitions
  */
 
+%option nounput
+
 %pointer
 
 %{
@@ -142,7 +144,7 @@ real_symbols    return T_REAL_SYMBOLS;
  */
 
 static int line_length = 0;
-static char *line_read = NULL;
+static char *line_read = nullptr;
 static char *line_ptr;
 
 // Input function that uses libreadline for interactive input
@@ -206,7 +208,7 @@ static int ginsh_input(char *buf, int max_size)
 
 // List of input files to be processed
 int num_files = 0;
-char **file_list = NULL;
+char **file_list = nullptr;
 
 // EOF encountered, connect to next file. If this was the last file,
 // connect to stdin. If this was stdin, terminate the scanner.
@@ -218,7 +220,7 @@ int yywrap()
        fclose(yyin);
        if (num_files) {
                yyin = fopen(*file_list, "r");
-               if (yyin == NULL) {
+               if (yyin == nullptr) {
                        cerr << "Can't open " << *file_list << endl;
                        return 1;
                }