Synced to HEAD

[ginac.git] / ginac / registrar.cpp

diff --git a/ginac/registrar.cpp b/ginac/registrar.cpp
index 7aee59464f4e4851c88811a9a76a5cb615c7b909..cc12f6033286581190a2606b0016580e7df5751c 100644 (file)
--- a/ginac/registrar.cpp
+++ b/ginac/registrar.cpp
@@ -3,7 +3,7 @@
  *  GiNaC's class registrar (for class basic and all classes derived from it). */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -28,46 +28,14 @@
 
 namespace GiNaC {
 
-registered_class_info *first_registered_class = NULL;
-
-/** Find registered_class_info strucure by class name. */
-static const registered_class_info *find_registered_class_info(const std::string &class_name)
+unsigned find_tinfo_key(const std::string &class_name)
 {
-       // Use a map for faster lookup. The registered_class_info list doesn't
-       // change at run-time, so it's sufficient to construct the map once
-       // on the first trip through this function.
-       typedef std::map<std::string, const registered_class_info *> name_map_type;
-       static name_map_type name_map;
-       static bool name_map_initialized = false;
-
-       if (!name_map_initialized) {
-               // Construct map
-               const registered_class_info *p = first_registered_class;
-               while (p) {
-                       name_map[p->name] = p;
-                       p = p->next;
-               }
-               name_map_initialized = true;
-       }
-
-       name_map_type::const_iterator it = name_map.find(class_name);
-       if (it == name_map.end())
-               throw (std::runtime_error("class '" + class_name + "' not registered"));
-       else
-               return it->second;
-}
-
-unsigned int find_tinfo_key(const std::string &class_name)
-{
-       const registered_class_info *p = find_registered_class_info(class_name);
-       return p->tinfo_key;
+       return registered_class_info::find(class_name)->options.get_id();
 }
 
 unarch_func find_unarch_func(const std::string &class_name)
 {
-       const registered_class_info *p = find_registered_class_info(class_name);
-       return p->unarchive;
+       return registered_class_info::find(class_name)->options.get_unarch_func();
 }
 
-
 } // namespace GiNaC