Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
linked_list.c str.c
Log Message:
Wed Mar 10 17:15:14 2004 Michael Jennings (mej)
Working map implementation using the linked_list class.
Added some new string functions.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/linked_list.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- linked_list.c 4 Feb 2004 17:51:26 -0000 1.22
+++ linked_list.c 10 Mar 2004 22:07:31 -0000 1.23
@@ -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.22 2004/02/04 17:51:26 mej
Exp $";
+static const char cvs_ident[] = "$Id: linked_list.c,v 1.23 2004/03/10 22:07:31 mej
Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -50,31 +50,42 @@
static spif_linked_list_t spif_linked_list_new(void);
static spif_linked_list_t spif_linked_list_vector_new(void);
+static spif_linked_list_t spif_linked_list_map_new(void);
static spif_bool_t spif_linked_list_init(spif_linked_list_t);
static spif_bool_t spif_linked_list_vector_init(spif_linked_list_t);
+static spif_bool_t spif_linked_list_map_init(spif_linked_list_t);
static spif_bool_t spif_linked_list_done(spif_linked_list_t);
static spif_bool_t spif_linked_list_del(spif_linked_list_t);
static spif_str_t spif_linked_list_show(spif_linked_list_t, spif_charptr_t,
spif_str_t, size_t);
static spif_cmp_t spif_linked_list_comp(spif_linked_list_t, spif_linked_list_t);
static spif_linked_list_t spif_linked_list_dup(spif_linked_list_t);
static spif_linked_list_t spif_linked_list_vector_dup(spif_linked_list_t);
+static spif_linked_list_t spif_linked_list_map_dup(spif_linked_list_t);
static spif_classname_t spif_linked_list_type(spif_linked_list_t);
-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 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, 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,
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, 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_bool_t spif_linked_list_append(spif_linked_list_t self, spif_obj_t obj);
+static spif_bool_t spif_linked_list_contains(spif_linked_list_t self, spif_obj_t obj);
+static spif_bool_t spif_linked_list_vector_contains(spif_linked_list_t self,
spif_obj_t obj);
+static spif_listidx_t spif_linked_list_count(spif_linked_list_t self);
+static spif_obj_t spif_linked_list_find(spif_linked_list_t self, spif_obj_t obj);
+static spif_obj_t spif_linked_list_vector_find(spif_linked_list_t self, spif_obj_t
obj);
+static spif_obj_t spif_linked_list_get(spif_linked_list_t self, spif_listidx_t idx);
+static spif_obj_t spif_linked_list_map_get(spif_linked_list_t self, spif_obj_t key);
+static spif_list_t spif_linked_list_get_keys(spif_linked_list_t self, spif_list_t
key_list);
+static spif_list_t spif_linked_list_get_pairs(spif_linked_list_t self, spif_list_t
pair_list);
+static spif_list_t spif_linked_list_get_values(spif_linked_list_t self, spif_list_t
value_list);
+static spif_bool_t spif_linked_list_has_key(spif_linked_list_t self, spif_obj_t key);
+static spif_bool_t spif_linked_list_has_value(spif_linked_list_t self, spif_obj_t
value);
+static spif_listidx_t spif_linked_list_index(spif_linked_list_t self, spif_obj_t obj);
+static spif_bool_t spif_linked_list_insert(spif_linked_list_t self, spif_obj_t obj);
+static spif_bool_t spif_linked_list_insert_at(spif_linked_list_t self, spif_obj_t
obj, spif_listidx_t idx);
+static spif_iterator_t spif_linked_list_iterator(spif_linked_list_t self);
+static spif_bool_t spif_linked_list_prepend(spif_linked_list_t self, spif_obj_t obj);
+static spif_obj_t spif_linked_list_remove(spif_linked_list_t self, spif_obj_t item);
+static spif_obj_t spif_linked_list_map_remove(spif_linked_list_t self, spif_obj_t
item);
+static spif_obj_t spif_linked_list_remove_at(spif_linked_list_t self, spif_listidx_t
idx);
+static spif_bool_t spif_linked_list_reverse(spif_linked_list_t self);
+static spif_bool_t spif_linked_list_set(spif_linked_list_t self, spif_obj_t key,
spif_obj_t value);
+static spif_obj_t * spif_linked_list_to_array(spif_linked_list_t self);
SPIF_DECL_PROPERTY_FUNC(linked_list, listidx, len);
SPIF_DECL_PROPERTY_FUNC(linked_list, linked_list_item, head);
@@ -156,6 +167,31 @@
};
spif_vectorclass_t SPIF_VECTORCLASS_VAR(linked_list) = &llv_class;
+static spif_const_mapclass_t llm_class = {
+ {
+ SPIF_DECL_CLASSNAME(linked_list),
+ (spif_func_t) spif_linked_list_map_new,
+ (spif_func_t) spif_linked_list_map_init,
+ (spif_func_t) spif_linked_list_done,
+ (spif_func_t) spif_linked_list_del,
+ (spif_func_t) spif_linked_list_show,
+ (spif_func_t) spif_linked_list_comp,
+ (spif_func_t) spif_linked_list_map_dup,
+ (spif_func_t) spif_linked_list_type
+ },
+ (spif_func_t) spif_linked_list_count,
+ (spif_func_t) spif_linked_list_map_get,
+ (spif_func_t) spif_linked_list_get_keys,
+ (spif_func_t) spif_linked_list_get_pairs,
+ (spif_func_t) spif_linked_list_get_values,
+ (spif_func_t) spif_linked_list_has_key,
+ (spif_func_t) spif_linked_list_has_value,
+ (spif_func_t) spif_linked_list_iterator,
+ (spif_func_t) spif_linked_list_map_remove,
+ (spif_func_t) spif_linked_list_set
+};
+spif_mapclass_t SPIF_MAPCLASS_VAR(linked_list) = &llm_class;
+
static spif_const_iteratorclass_t li_class = {
{
SPIF_DECL_CLASSNAME(linked_list),
@@ -301,6 +337,19 @@
return self;
}
+static spif_linked_list_t
+spif_linked_list_map_new(void)
+{
+ spif_linked_list_t self;
+
+ self = SPIF_ALLOC(linked_list);
+ if (!spif_linked_list_map_init(self)) {
+ SPIF_DEALLOC(self);
+ self = SPIF_NULL_TYPE(linked_list);
+ }
+ return self;
+}
+
static spif_bool_t
spif_linked_list_init(spif_linked_list_t self)
{
@@ -328,6 +377,19 @@
}
static spif_bool_t
+spif_linked_list_map_init(spif_linked_list_t self)
+{
+ spif_bool_t t;
+
+ ASSERT_RVAL(!SPIF_LIST_ISNULL(self), FALSE);
+ /* ***NOT NEEDED*** spif_obj_init(SPIF_OBJ(self)); */
+ t = spif_obj_set_class(SPIF_OBJ(self),
SPIF_CLASS(SPIF_MAPCLASS_VAR(linked_list)));
+ self->len = 0;
+ self->head = SPIF_NULL_TYPE(linked_list_item);
+ return t;
+}
+
+static spif_bool_t
spif_linked_list_done(spif_linked_list_t self)
{
spif_linked_list_item_t current;
@@ -436,6 +498,23 @@
return tmp;
}
+static spif_linked_list_t
+spif_linked_list_map_dup(spif_linked_list_t self)
+{
+ spif_linked_list_t tmp;
+ spif_linked_list_item_t src, dest;
+
+ ASSERT_RVAL(!SPIF_LIST_ISNULL(self), SPIF_NULL_TYPE(linked_list));
+ tmp = spif_linked_list_map_new();
+ memcpy(tmp, self, SPIF_SIZEOF_TYPE(linked_list));
+ tmp->head = spif_linked_list_item_dup(self->head);
+ for (src = self->head, dest = tmp->head; src->next; src = src->next, dest =
dest->next) {
+ dest->next = spif_linked_list_item_dup(src->next);
+ }
+ dest->next = SPIF_NULL_TYPE(linked_list_item);
+ return tmp;
+}
+
static spif_classname_t
spif_linked_list_type(spif_linked_list_t self)
{
@@ -494,6 +573,7 @@
ASSERT_RVAL(!SPIF_LIST_ISNULL(self), SPIF_NULL_TYPE(obj));
REQUIRE_RVAL(!SPIF_OBJ_ISNULL(obj), SPIF_NULL_TYPE(obj));
for (current = self->head; current; current = current->next) {
+ /* current->data may be NULL here, so use obj methods. */
if (SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(obj, current->data))) {
return current->data;
}
@@ -511,10 +591,12 @@
for (current = self->head; current; current = current->next) {
spif_cmp_t c;
- c = SPIF_OBJ_COMP(obj, current->data);
+ /* current->data is always non-NULL in vectors. */
+ ASSERT_RVAL(!SPIF_OBJ_ISNULL(current->data), SPIF_NULL_TYPE(obj));
+ c = SPIF_OBJ_COMP(current->data, obj);
if (SPIF_CMP_IS_EQUAL(c)) {
return current->data;
- } else if (SPIF_CMP_IS_LESS(c)) {
+ } else if (SPIF_CMP_IS_GREATER(c)) {
break;
}
}
@@ -538,6 +620,103 @@
return (current ? (current->data) : SPIF_NULL_TYPE(obj));
}
+static spif_obj_t
+spif_linked_list_map_get(spif_linked_list_t self, spif_obj_t key)
+{
+ spif_linked_list_item_t current;
+
+ ASSERT_RVAL(!SPIF_VECTOR_ISNULL(self), SPIF_NULL_TYPE(obj));
+ REQUIRE_RVAL(!SPIF_OBJ_ISNULL(key), SPIF_NULL_TYPE(obj));
+ for (current = self->head; current; current = current->next) {
+ spif_cmp_t c;
+
+ /* current->data is always non-NULL in maps. */
+ ASSERT_RVAL(!SPIF_OBJ_ISNULL(current->data), SPIF_NULL_TYPE(obj));
+ c = SPIF_OBJ_COMP(current->data, key);
+ if (SPIF_CMP_IS_EQUAL(c)) {
+ return SPIF_OBJPAIR(current->data)->value;
+ } else if (SPIF_CMP_IS_GREATER(c)) {
+ break;
+ }
+ }
+ return SPIF_NULL_TYPE(obj);
+}
+
+static spif_list_t
+spif_linked_list_get_keys(spif_linked_list_t self, spif_list_t key_list)
+{
+ spif_linked_list_item_t current;
+
+ ASSERT_RVAL(!SPIF_VECTOR_ISNULL(self), SPIF_NULL_TYPE(list));
+ if (SPIF_LIST_ISNULL(key_list)) {
+ key_list = SPIF_LIST_NEW(linked_list);
+ }
+ for (current = self->head; current; current = current->next) {
+ /* current->data is always non-NULL in maps. */
+ SPIF_LIST_APPEND(key_list, SPIF_OBJ_DUP(SPIF_OBJPAIR(current->data)->key));
+ }
+ return key_list;
+}
+
+static spif_list_t
+spif_linked_list_get_pairs(spif_linked_list_t self, spif_list_t pair_list)
+{
+ spif_linked_list_item_t current;
+
+ ASSERT_RVAL(!SPIF_VECTOR_ISNULL(self), SPIF_NULL_TYPE(list));
+ if (SPIF_LIST_ISNULL(pair_list)) {
+ pair_list = SPIF_LIST_NEW(linked_list);
+ }
+ for (current = self->head; current; current = current->next) {
+ /* current->data is always non-NULL in maps. */
+ SPIF_LIST_APPEND(pair_list, SPIF_OBJ_DUP(SPIF_OBJPAIR(current->data)));
+ }
+ return pair_list;
+}
+
+static spif_list_t
+spif_linked_list_get_values(spif_linked_list_t self, spif_list_t value_list)
+{
+ spif_linked_list_item_t current;
+
+ ASSERT_RVAL(!SPIF_VECTOR_ISNULL(self), SPIF_NULL_TYPE(list));
+ if (SPIF_LIST_ISNULL(value_list)) {
+ value_list = SPIF_LIST_NEW(linked_list);
+ }
+ for (current = self->head; current; current = current->next) {
+ /* current->data is always non-NULL in maps. */
+ SPIF_LIST_APPEND(value_list,
SPIF_OBJ_DUP(SPIF_OBJPAIR(current->data)->value));
+ }
+ return value_list;
+}
+
+static spif_bool_t
+spif_linked_list_has_key(spif_linked_list_t self, spif_obj_t key)
+{
+ return ((SPIF_OBJ_ISNULL(spif_linked_list_map_get(self, key))) ? FALSE : TRUE);
+}
+
+static spif_bool_t
+spif_linked_list_has_value(spif_linked_list_t self, spif_obj_t value)
+{
+ spif_linked_list_item_t current;
+
+ ASSERT_RVAL(!SPIF_VECTOR_ISNULL(self), FALSE);
+
+ for (current = self->head; current; current = current->next) {
+ spif_objpair_t pair;
+
+ /* current->data is always non-NULL in maps. */
+ pair = SPIF_OBJPAIR(current->data);
+ if (SPIF_OBJ_ISNULL(value) && SPIF_OBJ_ISNULL(pair->value)) {
+ return TRUE;
+ } else if (SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(pair->value, value))) {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
static spif_listidx_t
spif_linked_list_index(spif_linked_list_t self, spif_obj_t obj)
{
@@ -660,6 +839,35 @@
}
static spif_obj_t
+spif_linked_list_map_remove(spif_linked_list_t self, spif_obj_t item)
+{
+ spif_linked_list_item_t current, tmp;
+
+ ASSERT_RVAL(!SPIF_LIST_ISNULL(self), SPIF_NULL_TYPE(obj));
+ REQUIRE_RVAL(!SPIF_OBJ_ISNULL(item), SPIF_NULL_TYPE(obj));
+ if (SPIF_LINKED_LIST_ITEM_ISNULL(self->head)) {
+ return SPIF_NULL_TYPE(obj);
+ } else if (SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(self->head->data, item))) {
+ tmp = self->head;
+ self->head = self->head->next;
+ } else {
+ for (current = self->head; current->next &&
!SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(current->next->data, item)); current = current->next);
+ if (current->next) {
+ tmp = current->next;
+ current->next = current->next->next;
+ } else {
+ return SPIF_NULL_TYPE(obj);
+ }
+ }
+ item = tmp->data;
+ tmp->data = SPIF_NULL_TYPE(obj);
+ spif_linked_list_item_del(tmp);
+
+ self->len--;
+ return item;
+}
+
+static spif_obj_t
spif_linked_list_remove_at(spif_linked_list_t self, spif_listidx_t idx)
{
spif_listidx_t i;
@@ -709,6 +917,33 @@
return TRUE;
}
+static spif_bool_t
+spif_linked_list_set(spif_linked_list_t self, spif_obj_t key, spif_obj_t value)
+{
+ spif_linked_list_item_t current;
+
+ ASSERT_RVAL(!SPIF_LIST_ISNULL(self), FALSE);
+ REQUIRE_RVAL(!SPIF_OBJ_ISNULL(key), FALSE);
+
+ if (SPIF_OBJ_IS_OBJPAIR(key) && SPIF_OBJ_ISNULL(value)) {
+ value = SPIF_OBJ(SPIF_OBJPAIR(key)->value);
+ key = SPIF_OBJ(SPIF_OBJPAIR(key)->key);
+ }
+ for (current = self->head; current; current = current->next) {
+ if (SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(current->data, key))) {
+ break;
+ }
+ }
+
+ if (SPIF_LINKED_LIST_ITEM_ISNULL(current)) {
+ spif_linked_list_insert(self, SPIF_OBJ(spif_objpair_new_from_both(key,
value)));
+ return FALSE;
+ } else {
+ spif_objpair_set_value(SPIF_OBJPAIR(current->data), SPIF_OBJ_DUP(value));
+ return TRUE;
+ }
+}
+
static spif_obj_t *
spif_linked_list_to_array(spif_linked_list_t self)
{
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/str.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- str.c 3 Feb 2004 23:17:00 -0000 1.28
+++ str.c 10 Mar 2004 22:07:31 -0000 1.29
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: str.c,v 1.28 2004/02/03 23:17:00 mej Exp $";
+static const char cvs_ident[] = "$Id: str.c,v 1.29 2004/03/10 22:07:31 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -405,6 +405,18 @@
return SPIF_CMP_FROM_INT(strcmp(SPIF_CONST_CAST_C(char *) SPIF_STR_STR(self),
SPIF_CONST_CAST_C(char *)other));
}
+spif_bool_t
+spif_str_downcase(spif_str_t self)
+{
+ char *tmp;
+
+ ASSERT_RVAL(!SPIF_STR_ISNULL(self), FALSE);
+ for (tmp = self->s; *tmp; tmp++) {
+ *tmp = tolower(*tmp);
+ }
+ return TRUE;
+}
+
spif_stridx_t
spif_str_find(spif_str_t self, spif_str_t other)
{
@@ -480,6 +492,53 @@
}
spif_bool_t
+spif_str_prepend(spif_str_t self, spif_str_t other)
+{
+ ASSERT_RVAL(!SPIF_STR_ISNULL(self), FALSE);
+ REQUIRE_RVAL(!SPIF_STR_ISNULL(other), FALSE);
+ if (other->size && other->len) {
+ self->size += other->size - 1;
+ self->s = SPIF_CAST(charptr) REALLOC(self->s, self->size);
+ memmove(self->s + other->len, self->s, self->len + 1);
+ memcpy(self->s, SPIF_STR_STR(other), other->len);
+ self->len += other->len;
+ }
+ return TRUE;
+}
+
+spif_bool_t
+spif_str_prepend_char(spif_str_t self, spif_char_t c)
+{
+ ASSERT_RVAL(!SPIF_STR_ISNULL(self), FALSE);
+ self->len++;
+ if (self->size <= self->len) {
+ self->size++;
+ self->s = SPIF_CAST(charptr) REALLOC(self->s, self->size);
+ }
+ memmove(self->s + 1, self->s, self->len + 1);
+ self->s[0] = SPIF_CAST(uchar) c;
+ return TRUE;
+}
+
+spif_bool_t
+spif_str_prepend_from_ptr(spif_str_t self, spif_charptr_t other)
+{
+ spif_stridx_t len;
+
+ ASSERT_RVAL(!SPIF_STR_ISNULL(self), FALSE);
+ REQUIRE_RVAL((other != SPIF_NULL_TYPE(charptr)), FALSE);
+ len = strlen(SPIF_CONST_CAST_C(char *) other);
+ if (len) {
+ self->size += len;
+ self->s = SPIF_CAST(charptr) REALLOC(self->s, self->size);
+ memmove(self->s + len, self->s, self->len + 1);
+ memcpy(self->s, other, len);
+ self->len += len;
+ }
+ return TRUE;
+}
+
+spif_bool_t
spif_str_reverse(spif_str_t self)
{
ASSERT_RVAL(!SPIF_STR_ISNULL(self), FALSE);
@@ -587,10 +646,12 @@
idx = self->len + idx;
}
REQUIRE_RVAL(idx >= 0, SPIF_NULL_TYPE(str));
+ REQUIRE_RVAL(idx < self->len, SPIF_NULL_TYPE(str));
if (cnt <= 0) {
cnt = self->len - idx + cnt;
}
REQUIRE_RVAL(cnt >= 0, SPIF_NULL_TYPE(str));
+ UPPER_BOUND(cnt, self->len - idx);
return spif_str_new_from_buff(SPIF_STR_STR(self) + idx, cnt);
}
@@ -604,10 +665,12 @@
idx = self->len + idx;
}
REQUIRE_RVAL(idx >= 0, SPIF_NULL_TYPE(charptr));
+ REQUIRE_RVAL(idx < self->len, SPIF_NULL_TYPE(charptr));
if (cnt <= 0) {
cnt = self->len - idx + cnt;
}
REQUIRE_RVAL(cnt >= 0, SPIF_NULL_TYPE(charptr));
+ UPPER_BOUND(cnt, self->len - idx);
newstr = SPIF_CAST(charptr) MALLOC(cnt + 1);
memcpy(newstr, SPIF_STR_STR(self) + idx, cnt);
@@ -650,5 +713,17 @@
return TRUE;
}
+spif_bool_t
+spif_str_upcase(spif_str_t self)
+{
+ char *tmp;
+
+ ASSERT_RVAL(!SPIF_STR_ISNULL(self), FALSE);
+ for (tmp = self->s; *tmp; tmp++) {
+ *tmp = toupper(*tmp);
+ }
+ return TRUE;
+}
+
SPIF_DEFINE_PROPERTY_FUNC_C(str, spif_stridx_t, size);
SPIF_DEFINE_PROPERTY_FUNC_C(str, spif_stridx_t, len);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
