Quick and dirty bug fix for the parser to read GiNaC::lst again.

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

diff --git a/ginac/parser/parse_context.h b/ginac/parser/parse_context.h
index 81b2cd15a9ada239ae9c2e55efaa32fce66a455f..60151fd37988af0538f6b000bd50285930ee8d7d 100644 (file)
--- a/ginac/parser/parse_context.h
+++ b/ginac/parser/parse_context.h
@@ -3,7 +3,7 @@
  *  Interface to parser context. */
 
 /*
  *  Interface to parser context. */
 
 /*

- *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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
  *
  *  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


@@ -88,14 +88,33 @@ typedef ex (*reader_func)(const exvector& args);
  *       function pointer!! The unsigned has to correspond to the serial number of
  *       the defined GiNaC function.
  */
  *       function pointer!! The unsigned has to correspond to the serial number of
  *       the defined GiNaC function.
  */

-typedef std::map<prototype, reader_func> prototype_table;
+class PrototypeLess
+{
+public:
+       bool operator()(const prototype& p1, const prototype& p2) const
+       {
+               int s = p1.first.compare(p2.first);
+               if (s == 0) {
+                       if ((p1.second == 0) || (p2.second == 0)) return false;
+                       return p1.second < p2.second;
+               }
+               return s < 0;
+       }
+};
+typedef std::map<prototype, reader_func, PrototypeLess> prototype_table;

 
 /**
  * Default prototype table.
  *
 
 /**
  * Default prototype table.
  *

- * It supports most of builtin GiNaC functions.
+ * It supports all defined GiNaC functions and "pow", "sqrt", and "power".

  */
 extern const prototype_table& get_default_reader();
  */
 extern const prototype_table& get_default_reader();

+/**
+ * Builtin prototype table.
+ *
+ * It supports only the builtin GiNaC functions and "pow", "sqrt", and "power".
+ */
+extern const prototype_table& get_builtin_reader();

 
 } // namespace GiNaC
 
 
 } // namespace GiNaC