- added fderivative class to archive exam

[ginac.git] / ginac / input_lexer.ll

diff --git a/ginac/input_lexer.ll b/ginac/input_lexer.ll
index 18f78818746e0bbd82fd31b2650d1be3b2cb6417..f39de456a20a312b32148e9d4aea7df221488c56 100644 (file)
--- a/ginac/input_lexer.ll
+++ b/ginac/input_lexer.ll
@@ -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
@@ -39,16 +39,12 @@
 #include "numeric.h"
 #include "symbol.h"
 
-#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 #include "input_parser.h"
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 // Table of all used symbols
 struct sym_def {
@@ -105,10 +101,6 @@ Digits                     ginac_yylval = (long)Digits; return T_DIGITS;
 "<="                   return T_LESSEQ;
 ">="                   return T_GREATEREQ;
 
-                       /* matrix delimiters */
-\[\[                   return T_MATRIX_BEGIN;
-\]\]                   return T_MATRIX_END;
-
                        /* numbers */
 {D}+                   |
 "#"{D}+"R"{AN}+                |
@@ -164,9 +156,7 @@ int ginac_yywrap()
        return 1;
 }
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 // Set the input string
 void set_lexer_string(const std::string &s)
@@ -181,22 +171,20 @@ void set_lexer_symbols(ex l)
        syms.clear();
        if (!is_ex_exactly_of_type(l, lst))
                return;
-       for (int i=0; i<l.nops(); i++) {
+       for (unsigned i=0; i<l.nops(); i++) {
                if (is_ex_exactly_of_type(l.op(i), symbol))
-                       syms[ex_to_symbol(l.op(i)).getname()] = sym_def(l.op(i), true);
+                       syms[ex_to_symbol(l.op(i)).get_name()] = sym_def(l.op(i), true);
        }
 }
 
 // Check whether symbol was predefined
 bool is_lexer_symbol_predefined(const ex &s)
 {
-       sym_tab::const_iterator i = syms.find(ex_to_symbol(s).getname());
+       sym_tab::const_iterator i = syms.find(ex_to_symbol(s).get_name());
        if (i == syms.end())
                return false;
        else
                return (*i).second.predefined;
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC