Merge branch 'master' of github.com:Alexis211/Melon

Conflicts:
	Melon.img

3 files changed, 93 insertions, 0 deletions

diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index aa87d49..1760de8 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -34,6 +34,8 @@
 #include <Core/SB.ns.h>
 #include <Shell/KernelShell.class.h>
 
+#include <Map.class.h>
+
 #include <Ressources/Graphics/logo.text.cxd>
 
 extern u32int end;	//Placement address
diff --git a/Source/Library/Common/Map.class.cpp b/Source/Library/Common/Map.class.cpp
new file mode 100644
index 0000000..d9a4e39
--- /dev/null
+++ b/Source/Library/Common/Map.class.cpp
@@ -0,0 +1,38 @@
+template <typename K, typename V>
+Map<K, V>::Map() {
+	m_root = 0;
+}
+
+template <typename K, typename V>
+Map<K, V>::~Map() {
+	if (m_root != 0) delete m_root;
+}
+
+template <typename K, typename V>
+bool Map<K, V>::has(const K& key) {
+	return (find(key, m_root) != 0);
+}
+
+template <typename K, typename V>
+void Map<K, V>::set(const K& key, const V& value) {
+	item_t* i = find(key, m_root);
+	if (i == 0) m_root = insert(key, value, m_root);
+	else i->value = value;
+}
+
+template <typename K, typename V>
+const V& Map<K, V>::get(const K& key) {
+	item_t* i = find(key);
+	if (i == 0) return m_null;
+	return i->value;
+}
+
+template <typename K, typename V>
+V& Map<K, V>::operator[] (const K& key) {
+	item_t* i = find(key, m_root);
+	if (i == 0) {
+		m_root = insert(key, m_null, m_root);
+		i = find(key, m_root);
+	}
+	return i->value;
+}
diff --git a/Source/Library/Common/Map.class.h b/Source/Library/Common/Map.class.h
new file mode 100644
index 0000000..1270752
--- /dev/null
+++ b/Source/Library/Common/Map.class.h
@@ -0,0 +1,53 @@
+#ifndef DEF_MAP_CLASS_H
+#define DEF_MAP_CLASS_H
+
+template <typename K, typename V>
+class Map {
+	private:
+	V m_null;
+	struct item_t {
+		item_t *prev, *next;
+		K key;
+		V value;
+		item_t(const K& _key, const V& _value) : prev(0), next(0), key(_key), value(_value) {}
+		~item_t() {
+			if (prev != 0) delete prev;
+			if (next != 0) delete next;
+		}
+	} *m_root;
+
+	//Recursive functions for internal use
+	item_t* find(const K& key, item_t* start) {
+		if (start == 0) return 0;
+		if (start->key == key) return start;
+		if (start->key > key) return find(key, start->prev);
+		if (start->key < key) return find(key, start->next);
+		return 0;
+	}
+	item_t* insert(const K& key, const V& value, item_t* start) {
+		if (start == 0) return new item_t(key, value);
+		if (start->key == key) return 0;
+		if (start->key > key) {
+			start->prev = insert(key, value, start->prev);
+			return start;
+		}
+		if (start->key < key) {
+			start->next = insert(key, value, start->next);
+			return start;
+		}
+		return 0;
+	}
+
+	public:
+	Map();
+	~Map();
+
+	bool has(const K& key);
+	void set(const K& key, const V& value);
+	const V& get(const K& key);
+	V& operator[] (const K& key);
+};
+
+#include "Map.class.cpp"
+
+#endif