Parser: handle abbreviations as advertized in the manual.

[ginac.git] / ginac / parser / parse_context.cpp

diff --git a/ginac/parser/parse_context.cpp b/ginac/parser/parse_context.cpp
index e4956ba74d4510d234beeee023722b2c7240a2f9..2230d614913fe56fe9a7feb82d5a1070d363092a 100644 (file)
--- a/ginac/parser/parse_context.cpp
+++ b/ginac/parser/parse_context.cpp
@@ -1,27 +1,47 @@
-#include "parse_context.hpp"
+/** @file parse_context.cpp
+ *
+ *  Implementation of the parser context. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2010 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "parse_context.h"
+
 #include <sstream>
 #include <stdexcept>
-namespace GiNaC
-{
 
-const symbol&
+namespace GiNaC {
+
+ex
 find_or_insert_symbol(const std::string& name, symtab& syms, const bool strict)
 {
        symtab::const_iterator p = syms.find(name);
        if (p != syms.end())
-               return p->second.first;
+               return p->second;
 
        if (strict)
                throw std::invalid_argument(
                                std::string("find_or_insert_symbol: symbol \"") 
                                + name + "\" not found");
 
-       // false means this symbol was created by parser 
-       const std::pair<symbol, bool> tmp = std::make_pair(symbol(name), false);
-
-       symtab::iterator i = syms.insert(symtab::value_type(name, tmp)).first;
-       return i->second.first;
-}
-
+       const symbol sy(name);
+       syms[name] = sy;
+       return sy;
 }
 
+} // namespace GiNaC