X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Finput_lexer.h;h=0b4f8bd65cdb3a4f1783b2e9f7145750bc27b6fc;hb=86639cca6eecbdf16ed3a5428351f3bb63804cac;hp=575c836c75c9bca76adbcccbf38446e0a3084ce9;hpb=956a3ad3779759028bfd742456ed9eafc3e85063;p=ginac.git

diff --git a/ginac/input_lexer.h b/ginac/input_lexer.h
index 575c836c..0b4f8bd6 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-2001 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
@@ -24,8 +24,10 @@
 #ifndef __GINAC_INPUT_LEXER_H__
 #define __GINAC_INPUT_LEXER_H__
 
+extern "C" {
 #include <stdio.h>
-
+}
+	
 #include "config.h"
 
 // yacc stack type
@@ -41,29 +43,28 @@ 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 yyparse(). */
-extern void set_lexer_string(const string &s);
+/** Set the input string to be parsed by ginac_yyparse() (used internally). */
+extern void set_lexer_string(const std::string &s);
 
-/** Set the list of predefined symbols for the lexer (used internally for stream input). */
+/** Set the list of predefined symbols for the lexer (used internally). */
 extern void set_lexer_symbols(ex l);
 
-/** The expression parser function (used internally for stream input). */
-extern int yyparse();
+/** Check whether lexer symbol was predefined (vs. created by the lexer, e.g. function names). */
+extern bool is_lexer_symbol_predefined(const ex &s);
+
+/** The expression parser function (used internally). */
+extern int ginac_yyparse();
 
-/** The expression returned by the parser (used internally for stream input). */
+/** The expression returned by the parser (used internally). */
 extern ex parsed_ex;
 
 /** Get error message from the parser. */
-extern string get_parser_error(void);
+extern std::string get_parser_error(void);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INPUT_LEXER_H__