X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finput_lexer.h;h=53ef018674ad1a7d063da400f6f88c243899ab82;hp=a7c8c06fffb35d0e8e3d4989ab6d58f98d004934;hb=ffad02322624ab79fdad1a23a3aa83cd67376151;hpb=bd2d7351b89743eb68ce7d3bfa7ab62c331f9522

diff --git a/ginac/input_lexer.h b/ginac/input_lexer.h
index a7c8c06f..53ef0186 100644
--- a/ginac/input_lexer.h
+++ b/ginac/input_lexer.h
@@ -4,7 +4,7 @@
  *  This file must be processed with flex. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -27,7 +27,7 @@
 extern "C" {
 #include <stdio.h>
 }
-    
+	
 #include "config.h"
 
 // yacc stack type
@@ -43,14 +43,15 @@ extern char *ginac_yytext;
 extern char ginac_yytext[];
 #endif
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 class ex;
 
 /** Set the input string to be parsed by ginac_yyparse() (used internally). */
-extern void set_lexer_string(const string &s);
+extern void set_lexer_string(const std::string &s);
+
+/** Get name of symbol/index (used internally). */
+extern std::string get_symbol_name(const ex & s);
 
 /** Set the list of predefined symbols for the lexer (used internally). */
 extern void set_lexer_symbols(ex l);
@@ -59,7 +60,7 @@ extern void set_lexer_symbols(ex l);
 extern bool is_lexer_symbol_predefined(const ex &s);
 
 /** The expression parser function (used internally). */
-extern int ginac_yyparse();
+extern int ginac_yyparse(void);
 
 /** The expression returned by the parser (used internally). */
 extern ex parsed_ex;
@@ -67,8 +68,6 @@ extern ex parsed_ex;
 /** Get error message from the parser. */
 extern std::string get_parser_error(void);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INPUT_LEXER_H__