From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 6 Sep 2024 21:10:18 +0000 (+0100)
Subject: Rename files to remove the pointless `tree' part.
X-Git-Tag: 0.99.0~98
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/xyla/commitdiff_plain/refs/heads/master?ds=inline

Rename files to remove the pointless `tree' part.
---

diff --git a/Makefile b/Makefile
index e450ec3..dd43804 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ LIBSRCS			 =
 LIBOBJS			 = $(call objify, $(LIBSRCS))
 DEPOBJS			+= $(LIBOBJS)
 
-LIBSRCS			+= bstree.c
+LIBSRCS			+= bst.c
 
 TREES			 =
 LIBSRCS			+= $(foreach t,$(TREES), $($t_LIBSRCS))
@@ -58,12 +58,12 @@ LIBSRCS			+= $(foreach t,$(TREES), $($t_LIBSRCS))
 COMMON_TESTS		 = test-simple
 
 TREES			+= avl
-avl_LIBSRCS		 = avltree.c
+avl_LIBSRCS		 = avl.c
 avl_DEFINES		 = -DTREE=AVL
 avl_TESTS		 = avltest avlregress
 
 TREES			+= rb
-rb_LIBSRCS		 = rbtree.c
+rb_LIBSRCS		 = rb.c
 rb_DEFINES		 = -DTREE=RB
 rb_TESTS		 = rbtest rbregress
 
diff --git a/avltree.c b/avl.c
similarity index 99%
rename from avltree.c
rename to avl.c
index 44bb519..5f6615b 100644
--- a/avltree.c
+++ b/avl.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 #include "internal.h"
-#include "avltree.h"
+#include "avl.h"
 
 /* Combinatorial logic for balance-annotation adjustments. */
 #define REBAL_EEL(bal) ((bal) >> 1)
diff --git a/avltree.h b/avl.h
similarity index 99%
rename from avltree.h
rename to avl.h
index cdbb0d5..c333c32 100644
--- a/avltree.h
+++ b/avl.h
@@ -1,9 +1,9 @@
-#ifndef XYLA_AVLTREE_H
-#define XYLA_AVLTREE_H
+#ifndef AVL_H
+#define AVL_H
 
 #include <limits.h>
 
-#include "bstree.h"
+#include "bst.h"
 
 struct avlnode {
   struct bstnode _bst;
diff --git a/bstree.c b/bst.c
similarity index 99%
rename from bstree.c
rename to bst.c
index 603f046..19aaa79 100644
--- a/bstree.c
+++ b/bst.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 
-#include "bstree.h"
+#include "bst.h"
 
 /* --- @bstree_chkorder@ --- *
  *
diff --git a/bstree.h b/bst.h
similarity index 99%
rename from bstree.h
rename to bst.h
index 6a2c74c..5fd9c3c 100644
--- a/bstree.h
+++ b/bst.h
@@ -1,5 +1,5 @@
-#ifndef XYLA_BSTREE_H
-#define XYLA_BSTREE_H
+#ifndef BST_H
+#define BST_H
 
 #include <stdio.h>
 
diff --git a/rbtree.c b/rb.c
similarity index 99%
rename from rbtree.c
rename to rb.c
index e4dbeba..9e1d894 100644
--- a/rbtree.c
+++ b/rb.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 #include "internal.h"
-#include "rbtree.h"
+#include "rb.h"
 
 /* --- @check_recurse@ --- *
  *
diff --git a/rbtree.h b/rb.h
similarity index 99%
rename from rbtree.h
rename to rb.h
index 2ce06aa..5c10f09 100644
--- a/rbtree.h
+++ b/rb.h
@@ -1,9 +1,9 @@
-#ifndef XYLA_RBTREE_H
-#define XYLA_RBTREE_H
+#ifndef RB_H
+#define RB_H
 
 #include <limits.h>
 
-#include "bstree.h"
+#include "bst.h"
 
 struct rbnode {
   struct bstnode _bst;
diff --git a/treetest.c b/treetest.c
index 55ea835..2e129ee 100644
--- a/treetest.c
+++ b/treetest.c
@@ -12,7 +12,7 @@
 #define TREAP 4
 
 #if TREE == AVL
-#  include "avltree.h"
+#  include "avl.h"
 #  define NODE avlnode
 #  define PATH avlpath
 #  define ITER avliter
@@ -34,7 +34,7 @@
 #  define TREE_UNISECT avltree_unisect
 #  define TREE_DIFFSECT avltree_diffsect
 #elif TREE == RB
-#  include "rbtree.h"
+#  include "rb.h"
 #  define NODE rbnode
 #  define PATH rbpath
 #  define ITER rbiter
@@ -56,7 +56,7 @@
 #  define TREE_UNISECT rbtree_unisect
 #  define TREE_DIFFSECT rbtree_diffsect
 #elif TREE == SPLAY
-#  include "splaytree.h"
+#  include "splay.h"
 #elif TREE == TREAP
 #  include "treap.h"
 #else