--- a/absyntax_utils/search_base_type.hh	Wed Nov 07 19:26:38 2012 +0000
+++ b/absyntax_utils/search_base_type.hh	Wed Nov 07 20:07:11 2012 +0000
@@ -55,15 +55,17 @@
     bool is_array;
     bool is_subrange;
     bool is_enumerated;
+    static search_base_type_c *search_base_type_singleton; // Make this a singleton class!
+    
+  private:  
+    static void create_singleton(void);
 
   public:
     search_base_type_c(void);
-
-  public:
-    symbol_c *get_basetype_decl(symbol_c *symbol);
-    symbol_c *get_basetype_id  (symbol_c *symbol);
-    bool type_is_subrange(symbol_c* type_decl);
-    bool type_is_enumerated(symbol_c* type_decl);
+    static symbol_c *get_basetype_decl (symbol_c *symbol);
+    static symbol_c *get_basetype_id   (symbol_c *symbol);
+    static bool      type_is_subrange  (symbol_c *type_decl);
+    static bool      type_is_enumerated(symbol_c *type_decl);
 
   public:
   /*************************/