aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/help.h
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2016-11-19 18:34:52 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2016-11-20 00:24:40 +0100
commitf9e6f8630cdb0c6d056154b82e8f94289509f48a (patch)
tree43e98e32982c6c9b9a0dfcf38d59792f5efe23d3 /src/help.h
parent660b744c4bef80655c240032bc942920629a0d44 (diff)
downloadsciteco-f9e6f8630cdb0c6d056154b82e8f94289509f48a.tar.gz
optimized red-black trees and common base class for string-keyed RB trees
* the old implementation tried to avoid template programming by making the entry comparison function virtual. * The new RBTree implementation takes a template argument with the implementation of RBEntry. It is now partially conventional that the template argument must be actually derived from RBTree::RBEntry and must define a "compare" method. * As an advantage we now get static polymorphism (avoiding virtual calls and allowing for more compiler optimizations) and the the RBEntry implementation no longer has to be virtual. * The only RB-Trees actually used are string-keyed, though. Therefore there's a common base class RBTreeString now which defines two synonymous "key" and "name" attributes. * The entry base class RBEntryString is virtual again because we do not want to propagate the RBEntryType template parameter even further and the RBTree base class needs to destroy entries. This might be avoided by not defining a RBTree::clear() method, leaving this task to the implementations. At least QRegisters have to be virtual, though. * RBTreeString only depends on the strcmp() and strncmp() functions used now and only case-sensitive and case-insensitive versions are actually required, so we instantiate these templates statically in rbtree.cpp. This means there are still only two instantiations of the RBTree in the binary. * RBTreeString defines convenient wrappers for find() and nfind() to look up by string. This uses the RBEntryString base class, so no allocations whatsover are required for lookups and less space is wasted on the call stack. * A RBEntryOwnString base class is also provided which frees the implementations from memory managing the tree keys. * RBTreeString can now be used to add other common functionality like auto-completions for Q-Registers, goto labels and help topics. * some minor optimizations * updated TODO
Diffstat (limited to 'src/help.h')
-rw-r--r--src/help.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/help.h b/src/help.h
index db78979..7ce7ea2 100644
--- a/src/help.h
+++ b/src/help.h
@@ -30,29 +30,21 @@
namespace SciTECO {
-class HelpIndex : public RBTree {
+class HelpIndex : private RBTreeStringCase {
public:
- class Topic : public RBTree::RBEntry {
+ class Topic : public RBEntryOwnString {
public:
- gchar *name;
gchar *filename;
tecoInt pos;
- Topic(const gchar *_name, const gchar *_filename = NULL, tecoInt _pos = 0)
- : name(g_strdup(_name)),
+ Topic(const gchar *name, const gchar *_filename = NULL, tecoInt _pos = 0)
+ : RBEntryOwnString(name),
filename(_filename ? g_strdup(_filename) : NULL),
pos(_pos) {}
~Topic()
{
- g_free(name);
g_free(filename);
}
-
- int
- operator <(RBEntry &l2)
- {
- return g_ascii_strcasecmp(name, ((Topic &)l2).name);
- }
};
void load(void);