X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginsh%2Fginsh.h;h=973c6f0d9fb73bd1491025a6d50b2a506a11931e;hb=13905769fe865764a271f0e2aeb22f422e1289d7;hp=2d32f0e7d33e97f593d5ba644e2b925fe0c0d9fa;hpb=afdd7fa8c6c0a587f7c80789198551383e8beb7b;p=ginac.git

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index 2d32f0e7..973c6f0d 100644
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -2,7 +2,7 @@
  *
  *  Global definitions for ginsh.
  *
- *  GiNaC Copyright (C) 1999 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
@@ -16,17 +16,17 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef GINSH_H
 #define GINSH_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <map>
+#include <iostream>
 #include <string>
 
 #ifdef HAVE_READLINE_READLINE_H
@@ -41,23 +41,19 @@ extern "C" {
 }
 #endif
 
+#ifdef IN_GINAC
+#include "ginac.h"
+#else
 #include <ginac/ginac.h>
-
-#ifndef NO_GINAC_NAMESPACE
-using namespace GiNaC;
-#endif // ndef NO_GINAC_NAMESPACE
+#endif
 
 // yacc stack type
-#define YYSTYPE ex
+#define YYSTYPE GiNaC::ex
 
 // lex functions/variables
-extern int yyerror(char *s);
+extern int yyerror(const char *s);
 extern int yylex(void);
-#if YYTEXT_POINTER
 extern char *yytext;
-#else
-extern char yytext[];
-#endif
 extern FILE *yyin;
 
 // List of input files to be processed
@@ -65,7 +61,10 @@ extern int num_files;
 extern char **file_list;
 
 // Table of all used symbols
-typedef map<string, symbol> sym_tab;
+typedef std::map<std::string, GiNaC::ex> sym_tab;
 extern sym_tab syms;
 
+// Type of symbols to generate (real or complex)
+extern unsigned symboltype;
+
 #endif