Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
Makefile.am array.c avl_tree.c dlinked_list.c linked_list.c
Added Files:
objpair.c
Log Message:
Sat Jan 24 13:54:02 2004 Michael Jennings (mej)
Added map interface (unimplemented) and a paired object class.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 21 Jan 2004 23:20:46 -0000 1.12
+++ Makefile.am 24 Jan 2004 19:54:30 -0000 1.13
@@ -4,9 +4,9 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
-libast_la_SOURCES = \
- array.c builtin_hashes.c conf.c debug.c dlinked_list.c file.c \
- linked_list.c mem.c msgs.c obj.c options.c regexp.c \
+libast_la_SOURCES = \
+ array.c builtin_hashes.c conf.c debug.c dlinked_list.c file.c \
+ linked_list.c mem.c msgs.c obj.c objpair.c options.c regexp.c \
socket.c str.c strings.c snprintf.c tok.c url.c
libast_la_LDFLAGS = -version-info 2:0:0
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/array.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- array.c 10 Jan 2004 21:15:17 -0000 1.12
+++ array.c 24 Jan 2004 19:55:02 -0000 1.13
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: array.c,v 1.10 2003/11/26 22:19:43 mej Exp $";
+static const char cvs_ident[] = "$Id: array.c,v 1.12 2004/01/10 21:15:17 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -33,7 +33,7 @@
SPIF_DECL_OBJ(array_iterator) {
SPIF_DECL_PARENT_TYPE(obj);
spif_array_t subject;
- size_t current_index;
+ spif_listidx_t current_index;
};
/* *INDENT-ON* */
@@ -51,17 +51,17 @@
static spif_bool_t spif_array_append(spif_array_t, spif_obj_t);
static spif_bool_t spif_array_list_contains(spif_array_t, spif_obj_t);
static spif_bool_t spif_array_vector_contains(spif_array_t, spif_obj_t);
-static size_t spif_array_count(spif_array_t);
+static spif_listidx_t spif_array_count(spif_array_t);
static spif_obj_t spif_array_list_find(spif_array_t, spif_obj_t);
static spif_obj_t spif_array_vector_find(spif_array_t, spif_obj_t);
-static spif_obj_t spif_array_get(spif_array_t, size_t);
-static size_t spif_array_index(spif_array_t, spif_obj_t);
+static spif_obj_t spif_array_get(spif_array_t, spif_listidx_t);
+static spif_listidx_t spif_array_index(spif_array_t, spif_obj_t);
static spif_bool_t spif_array_insert(spif_array_t, spif_obj_t);
-static spif_bool_t spif_array_insert_at(spif_array_t, spif_obj_t, size_t);
+static spif_bool_t spif_array_insert_at(spif_array_t, spif_obj_t, spif_listidx_t);
static spif_iterator_t spif_array_iterator(spif_array_t);
static spif_bool_t spif_array_prepend(spif_array_t, spif_obj_t);
static spif_obj_t spif_array_remove(spif_array_t, spif_obj_t);
-static spif_obj_t spif_array_remove_at(spif_array_t, size_t);
+static spif_obj_t spif_array_remove_at(spif_array_t, spif_listidx_t);
static spif_bool_t spif_array_reverse(spif_array_t);
static spif_obj_t *spif_array_to_array(spif_array_t);
static spif_array_iterator_t spif_array_iterator_new(spif_array_t subject);
@@ -188,7 +188,7 @@
static spif_bool_t
spif_array_done(spif_array_t self)
{
- size_t i;
+ spif_listidx_t i;
for (i = 0; i < self->len; i++) {
if (!SPIF_OBJ_ISNULL(self->items[i])) {
@@ -212,7 +212,7 @@
spif_array_show(spif_array_t self, spif_charptr_t name, spif_str_t buff, size_t
indent)
{
char tmp[4096];
- size_t i;
+ spif_listidx_t i;
if (SPIF_LIST_ISNULL(self)) {
SPIF_OBJ_SHOW_NULL(array, name, buff, indent, tmp);
@@ -246,7 +246,7 @@
static spif_cmp_t
spif_array_comp(spif_array_t self, spif_array_t other)
{
- size_t i;
+ spif_listidx_t i;
for (i = 0; i < self->len; i++) {
if (!SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(self->items[i], other->items[i]))) {
@@ -260,7 +260,7 @@
spif_array_list_dup(spif_array_t self)
{
spif_array_t tmp;
- size_t i;
+ spif_listidx_t i;
tmp = spif_array_list_new();
memcpy(tmp, self, SPIF_SIZEOF_TYPE(array));
@@ -275,7 +275,7 @@
spif_array_vector_dup(spif_array_t self)
{
spif_array_t tmp;
- size_t i;
+ spif_listidx_t i;
tmp = spif_array_vector_new();
memcpy(tmp, self, SPIF_SIZEOF_TYPE(array));
@@ -317,7 +317,7 @@
return ((SPIF_VECTOR_ISNULL(spif_array_vector_find(self, obj))) ? (FALSE) :
(TRUE));
}
-static size_t
+static spif_listidx_t
spif_array_count(spif_array_t self)
{
return self->len;
@@ -326,7 +326,7 @@
static spif_obj_t
spif_array_list_find(spif_array_t self, spif_obj_t obj)
{
- size_t i;
+ spif_listidx_t i;
for (i = 0; i < self->len; i++) {
if (SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(self->items[i], obj))) {
@@ -339,7 +339,7 @@
static spif_obj_t
spif_array_vector_find(spif_array_t self, spif_obj_t obj)
{
- size_t start, end, mid;
+ spif_listidx_t start, end, mid;
spif_cmp_t diff;
if (self->len == 0) {
@@ -354,7 +354,7 @@
start = mid + 1;
} else {
end = mid - 1;
- if (end == (size_t) -1) {
+ if (end == (spif_listidx_t) -1) {
break;
}
}
@@ -363,28 +363,28 @@
}
static spif_obj_t
-spif_array_get(spif_array_t self, size_t idx)
+spif_array_get(spif_array_t self, spif_listidx_t idx)
{
return ((idx < self->len) ? (self->items[idx]) : (SPIF_NULL_TYPE(obj)));
}
-static size_t
+static spif_listidx_t
spif_array_index(spif_array_t self, spif_obj_t obj)
{
- size_t i;
+ spif_listidx_t i;
for (i = 0; i < self->len; i++) {
if (SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(self->items[i], obj))) {
return i;
}
}
- return SPIF_CAST_C(size_t) (-1);
+ return SPIF_CAST_C(spif_listidx_t) (-1);
}
static spif_bool_t
spif_array_insert(spif_array_t self, spif_obj_t obj)
{
- size_t i, left;
+ spif_listidx_t i, left;
if (self->items) {
self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
SPIF_SIZEOF_TYPE(obj) * (self->len + 1));
@@ -403,9 +403,11 @@
}
static spif_bool_t
-spif_array_insert_at(spif_array_t self, spif_obj_t obj, size_t idx)
+spif_array_insert_at(spif_array_t self, spif_obj_t obj, spif_listidx_t idx)
{
- size_t left;
+ spif_listidx_t left;
+
+ left = self->len - idx;
if (self->items) {
self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
SPIF_SIZEOF_TYPE(obj) * (self->len + 1));
@@ -413,7 +415,6 @@
self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
(self->len + 1));
}
- left = self->len - idx;
if (left) {
memmove(self->items + idx + 1, self->items + idx, SPIF_SIZEOF_TYPE(obj) *
left);
}
@@ -447,7 +448,7 @@
spif_array_remove(spif_array_t self, spif_obj_t item)
{
spif_obj_t tmp;
- size_t i, left;
+ spif_listidx_t i, left;
for (i = 0; i < self->len && !SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(item,
self->items[i])); i++);
if (i == self->len) {
@@ -463,10 +464,10 @@
}
static spif_obj_t
-spif_array_remove_at(spif_array_t self, size_t idx)
+spif_array_remove_at(spif_array_t self, spif_listidx_t idx)
{
spif_obj_t tmp;
- size_t left;
+ spif_listidx_t left;
if (idx >= self->len) {
return SPIF_NULL_TYPE(obj);
@@ -483,7 +484,7 @@
static spif_bool_t
spif_array_reverse(spif_array_t self)
{
- size_t i, j;
+ spif_listidx_t i, j;
for (i = 0, j = self->len - 1; i < j; i++, j--) {
BINSWAP(self->items[i], self->items[j]);
@@ -495,7 +496,7 @@
spif_array_to_array(spif_array_t self)
{
spif_obj_t *tmp;
- size_t i;
+ spif_listidx_t i;
tmp = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) * self->len);
for (i = 0; i < self->len; i++) {
@@ -561,7 +562,7 @@
buff = spif_array_show(self->subject, "subject", buff, indent + 2);
memset(tmp, ' ', indent + 2);
- snprintf(tmp + indent, sizeof(tmp) - indent, " (size_t) current_index: %lu\n",
+ snprintf(tmp + indent, sizeof(tmp) - indent, " (spif_listidx_t) current_index:
%lu\n",
SPIF_CAST_C(unsigned long) self->current_index);
spif_str_append_from_ptr(buff, tmp);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/avl_tree.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- avl_tree.c 10 Jan 2004 21:15:17 -0000 1.6
+++ avl_tree.c 24 Jan 2004 19:55:02 -0000 1.7
@@ -53,7 +53,7 @@
static spif_avl_tree_t spif_avl_tree_dup(spif_avl_tree_t);
static spif_classname_t spif_avl_tree_type(spif_avl_tree_t);
static spif_bool_t spif_avl_tree_contains(spif_avl_tree_t, spif_obj_t);
-static size_t spif_avl_tree_count(spif_avl_tree_t);
+static spif_listidx_t spif_avl_tree_count(spif_avl_tree_t);
static spif_obj_t spif_avl_tree_find(spif_avl_tree_t, spif_obj_t);
static spif_bool_t spif_avl_tree_insert(spif_avl_tree_t, spif_obj_t);
static spif_bool_t spif_avl_tree_iterator(spif_avl_tree_t);
@@ -331,7 +331,7 @@
return ((SPIF_LIST_ISNULL(spif_avl_tree_find(self, obj))) ? (FALSE) : (TRUE));
}
-static size_t
+static spif_listidx_t
spif_avl_tree_count(spif_avl_tree_t self)
{
return self->len;
@@ -422,7 +422,7 @@
{
spif_obj_t *tmp;
spif_avl_tree_node_t current;
- size_t i;
+ spif_listidx_t i;
tmp = SPIF_CAST_PTR(obj) MALLOC(SPIF_SIZEOF_TYPE(obj) * self->len);
for (i = 0, current = self->root; i < self->len; current = current->next, i++) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/dlinked_list.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- dlinked_list.c 10 Jan 2004 21:15:17 -0000 1.14
+++ dlinked_list.c 24 Jan 2004 19:55:23 -0000 1.15
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: dlinked_list.c,v 1.12 2003/11/26 22:19:44 mej
Exp $";
+static const char cvs_ident[] = "$Id: dlinked_list.c,v 1.14 2004/01/10 21:15:17 mej
Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -62,17 +62,17 @@
static spif_bool_t spif_dlinked_list_append(spif_dlinked_list_t, spif_obj_t);
static spif_bool_t spif_dlinked_list_contains(spif_dlinked_list_t, spif_obj_t);
static spif_bool_t spif_dlinked_list_vector_contains(spif_dlinked_list_t, spif_obj_t);
-static size_t spif_dlinked_list_count(spif_dlinked_list_t);
+static spif_listidx_t spif_dlinked_list_count(spif_dlinked_list_t);
static spif_obj_t spif_dlinked_list_find(spif_dlinked_list_t, spif_obj_t);
static spif_obj_t spif_dlinked_list_vector_find(spif_dlinked_list_t, spif_obj_t);
-static spif_obj_t spif_dlinked_list_get(spif_dlinked_list_t, size_t);
-static size_t spif_dlinked_list_index(spif_dlinked_list_t, spif_obj_t);
+static spif_obj_t spif_dlinked_list_get(spif_dlinked_list_t, spif_listidx_t);
+static spif_listidx_t spif_dlinked_list_index(spif_dlinked_list_t, spif_obj_t);
static spif_bool_t spif_dlinked_list_insert(spif_dlinked_list_t, spif_obj_t);
-static spif_bool_t spif_dlinked_list_insert_at(spif_dlinked_list_t, spif_obj_t,
size_t);
+static spif_bool_t spif_dlinked_list_insert_at(spif_dlinked_list_t, spif_obj_t,
spif_listidx_t);
static spif_iterator_t spif_dlinked_list_iterator(spif_dlinked_list_t);
static spif_bool_t spif_dlinked_list_prepend(spif_dlinked_list_t, spif_obj_t);
static spif_obj_t spif_dlinked_list_remove(spif_dlinked_list_t, spif_obj_t);
-static spif_obj_t spif_dlinked_list_remove_at(spif_dlinked_list_t, size_t);
+static spif_obj_t spif_dlinked_list_remove_at(spif_dlinked_list_t, spif_listidx_t);
static spif_bool_t spif_dlinked_list_reverse(spif_dlinked_list_t);
static spif_obj_t *spif_dlinked_list_to_array(spif_dlinked_list_t);
static spif_dlinked_list_iterator_t
spif_dlinked_list_iterator_new(spif_dlinked_list_t subject);
@@ -340,7 +340,7 @@
{
char tmp[4096];
spif_dlinked_list_item_t current;
- size_t i;
+ spif_listidx_t i;
memset(tmp, ' ', indent);
snprintf(tmp + indent, sizeof(tmp) - indent, "(spif_dlinked_list_t) %s: %010p
{\n", name, self);
@@ -452,7 +452,7 @@
return ((SPIF_LIST_ISNULL(spif_dlinked_list_vector_find(self, obj))) ? (FALSE) :
(TRUE));
}
-static size_t
+static spif_listidx_t
spif_dlinked_list_count(spif_dlinked_list_t self)
{
return self->len;
@@ -490,9 +490,9 @@
}
static spif_obj_t
-spif_dlinked_list_get(spif_dlinked_list_t self, size_t idx)
+spif_dlinked_list_get(spif_dlinked_list_t self, spif_listidx_t idx)
{
- size_t i;
+ spif_listidx_t i;
spif_dlinked_list_item_t current;
if (idx >= self->len) {
@@ -506,14 +506,14 @@
}
}
-static size_t
+static spif_listidx_t
spif_dlinked_list_index(spif_dlinked_list_t self, spif_obj_t obj)
{
- size_t i;
+ spif_listidx_t i;
spif_dlinked_list_item_t current;
for (current = self->head, i = 0; current &&
!SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(current->data, obj)); i++, current = current->next);
- return (current ? i : ((size_t) (-1)));
+ return (current ? i : ((spif_listidx_t) (-1)));
}
static spif_bool_t
@@ -548,9 +548,9 @@
}
static spif_bool_t
-spif_dlinked_list_insert_at(spif_dlinked_list_t self, spif_obj_t obj, size_t idx)
+spif_dlinked_list_insert_at(spif_dlinked_list_t self, spif_obj_t obj, spif_listidx_t
idx)
{
- size_t i;
+ spif_listidx_t i;
spif_dlinked_list_item_t item, current;
if (idx == 0 || SPIF_DLINKED_LIST_ITEM_ISNULL(self->head)) {
@@ -642,9 +642,9 @@
}
static spif_obj_t
-spif_dlinked_list_remove_at(spif_dlinked_list_t self, size_t idx)
+spif_dlinked_list_remove_at(spif_dlinked_list_t self, spif_listidx_t idx)
{
- size_t i;
+ spif_listidx_t i;
spif_dlinked_list_item_t current;
spif_obj_t tmp;
@@ -701,7 +701,7 @@
{
spif_obj_t *tmp;
spif_dlinked_list_item_t current;
- size_t i;
+ spif_listidx_t i;
tmp = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) * self->len);
for (i = 0, current = self->head; i < self->len; current = current->next, i++) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/linked_list.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- linked_list.c 10 Jan 2004 21:15:17 -0000 1.17
+++ linked_list.c 24 Jan 2004 19:55:40 -0000 1.18
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: linked_list.c,v 1.17 2004/01/10 21:15:17 mej
Exp $";
+static const char cvs_ident[] = "$Id: linked_list.c,v 1.18 2004/01/24 19:55:40 mej
Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -62,17 +62,17 @@
static spif_bool_t spif_linked_list_append(spif_linked_list_t, spif_obj_t);
static spif_bool_t spif_linked_list_contains(spif_linked_list_t, spif_obj_t);
static spif_bool_t spif_linked_list_vector_contains(spif_linked_list_t, spif_obj_t);
-static size_t spif_linked_list_count(spif_linked_list_t);
+static spif_listidx_t spif_linked_list_count(spif_linked_list_t);
static spif_obj_t spif_linked_list_find(spif_linked_list_t, spif_obj_t);
static spif_obj_t spif_linked_list_vector_find(spif_linked_list_t, spif_obj_t);
-static spif_obj_t spif_linked_list_get(spif_linked_list_t, size_t);
-static size_t spif_linked_list_index(spif_linked_list_t, spif_obj_t);
+static spif_obj_t spif_linked_list_get(spif_linked_list_t, spif_listidx_t);
+static spif_listidx_t spif_linked_list_index(spif_linked_list_t, spif_obj_t);
static spif_bool_t spif_linked_list_insert(spif_linked_list_t, spif_obj_t);
-static spif_bool_t spif_linked_list_insert_at(spif_linked_list_t, spif_obj_t, size_t);
+static spif_bool_t spif_linked_list_insert_at(spif_linked_list_t, spif_obj_t,
spif_listidx_t);
static spif_iterator_t spif_linked_list_iterator(spif_linked_list_t);
static spif_bool_t spif_linked_list_prepend(spif_linked_list_t, spif_obj_t);
static spif_obj_t spif_linked_list_remove(spif_linked_list_t, spif_obj_t);
-static spif_obj_t spif_linked_list_remove_at(spif_linked_list_t, size_t);
+static spif_obj_t spif_linked_list_remove_at(spif_linked_list_t, spif_listidx_t);
static spif_bool_t spif_linked_list_reverse(spif_linked_list_t);
static spif_obj_t *spif_linked_list_to_array(spif_linked_list_t);
static spif_linked_list_iterator_t spif_linked_list_iterator_new(spif_linked_list_t
subject);
@@ -335,7 +335,7 @@
{
char tmp[4096];
spif_linked_list_item_t current;
- size_t i;
+ spif_listidx_t i;
memset(tmp, ' ', indent);
snprintf(tmp + indent, sizeof(tmp) - indent, "(spif_linked_list_t) %s: %010p
{\n", name, self);
@@ -440,7 +440,7 @@
return ((SPIF_LIST_ISNULL(spif_linked_list_vector_find(self, obj))) ? (FALSE) :
(TRUE));
}
-static size_t
+static spif_listidx_t
spif_linked_list_count(spif_linked_list_t self)
{
return self->len;
@@ -478,23 +478,23 @@
}
static spif_obj_t
-spif_linked_list_get(spif_linked_list_t self, size_t idx)
+spif_linked_list_get(spif_linked_list_t self, spif_listidx_t idx)
{
- size_t i;
+ spif_listidx_t i;
spif_linked_list_item_t current;
for (current = self->head, i = 0; current && i < idx; i++, current =
current->next);
return (current ? (current->data) : SPIF_NULL_TYPE(obj));
}
-static size_t
+static spif_listidx_t
spif_linked_list_index(spif_linked_list_t self, spif_obj_t obj)
{
- size_t i;
+ spif_listidx_t i;
spif_linked_list_item_t current;
for (current = self->head, i = 0; current &&
!SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(current->data, obj)); i++, current = current->next);
- return (current ? i : ((size_t) (-1)));
+ return (current ? i : ((spif_listidx_t) (-1)));
}
static spif_bool_t
@@ -522,9 +522,9 @@
}
static spif_bool_t
-spif_linked_list_insert_at(spif_linked_list_t self, spif_obj_t obj, size_t idx)
+spif_linked_list_insert_at(spif_linked_list_t self, spif_obj_t obj, spif_listidx_t
idx)
{
- size_t i;
+ spif_listidx_t i;
spif_linked_list_item_t item, current;
if (idx == 0 || SPIF_LINKED_LIST_ITEM_ISNULL(self->head)) {
@@ -596,9 +596,9 @@
}
static spif_obj_t
-spif_linked_list_remove_at(spif_linked_list_t self, size_t idx)
+spif_linked_list_remove_at(spif_linked_list_t self, spif_listidx_t idx)
{
- size_t i;
+ spif_listidx_t i;
spif_linked_list_item_t item, current;
spif_obj_t tmp;
@@ -641,7 +641,7 @@
{
spif_obj_t *tmp;
spif_linked_list_item_t current;
- size_t i;
+ spif_listidx_t i;
tmp = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) * self->len);
for (i = 0, current = self->head; i < self->len; current = current->next, i++) {
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
