Use operator new/delete directly on ExpressionNode

tree_pool.cpp

@@ -8,11 +8,15 @@ void * TreePool::alloc(size_t size) {
   return result;
 }
 
-void TreePool::dealloc(void * ptr, size_t size) {
+void TreePool::dealloc(void * ptr) {
+  assert(ptr >= m_buffer && ptr < m_cursor);
+  TreeNode * node = reinterpret_cast<TreeNode *>(ptr);
+  size_t size = node->size();
+  printf("Dealloc %d(%p) of size %d\n", node->m_identifier, node, size);
   // Step 1 - Compact the pool
   memmove(
     ptr,
-    static_cast<char *>(ptr) - size,
+    static_cast<char *>(ptr) + size,
     m_cursor - static_cast<char *>(ptr)
   );
   m_cursor -= size;
@@ -37,14 +41,50 @@ TreeNode * TreePool::node(int identifier) const {
   return nullptr;
 }
 
+static inline void swap(uint32_t * a, uint32_t * b) {
+  uint32_t tmp = *a;
+  *a = *b;
+  *b = tmp;
+}
+
+static inline void insert(char * source, char * destination, size_t length) {
+  assert(length % 4 == 0);
+  assert((long)source % 4 == 0);
+  assert((long)destination % 4 == 0);
+  uint32_t * src = reinterpret_cast<uint32_t *>(source);
+  uint32_t * dst = reinterpret_cast<uint32_t *>(destination);
+  size_t len = length/4;
+
+  if (dst < src) {
+    if (src - dst <= len) {
+      uint32_t * srcPointer = src;
+      uint32_t * dstPointer = dst;
+      while (dstPointer != src) {
+        swap(srcPointer, dstPointer);
+        srcPointer++;
+        dstPointer++;
+        if (srcPointer == src + len) {
+          srcPointer = src;
+        }
+      }
+    }
+  }
+}
+
+void TreePool::move(TreeNode * source, TreeNode * destination) {
+  if (source == destination) {
+    return;
+  }
+  insert(reinterpret_cast<char *>(source), reinterpret_cast<char *>(destination), source->deepSize());
+}
+
 #if TREE_LOGGING
 #include <stdio.h>
 
 void TreePool::log() {
   printf("POOL:");
   for (TreeNode * node : *this) {
-    printf("|%d", node->m_identifier);
-    //printf("|(%03d|%s|%03d)", node->m_identifier, node->description(), node->retainCount());
+    printf("|(%03d|%s|%03d|%p)", node->m_identifier, node->description(), node->retainCount(), node);
   }
   printf("|\n");
 }