Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include/libast
Modified Files:
avl_tree.h dlinked_list.h obj.h str.h types.h.in
Log Message:
Tue Feb 3 18:18:32 2004 Michael Jennings (mej)
Cleanups are done. Almost done with the NULL handling for lists too.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/avl_tree.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- avl_tree.h 10 Jan 2004 21:15:16 -0000 1.5
+++ avl_tree.h 3 Feb 2004 23:16:59 -0000 1.6
@@ -36,15 +36,16 @@
#define SPIF_OBJ_IS_AVL_TREE_NODE(o) (SPIF_OBJ_IS_TYPE((o), avl_tree_node))
SPIF_DECL_OBJ(avl_tree_node) {
- spif_obj_t data;
- spif_int8_t balance;
- spif_avl_tree_node_t left, right;
+ SPIF_DECL_PROPERTY(obj, data);
+ SPIF_DECL_PROPERTY(int8, balance);
+ SPIF_DECL_PROPERTY(avl_tree_node, left);
+ SPIF_DECL_PROPERTY(avl_tree_node, right);
};
SPIF_DECL_OBJ(avl_tree) {
SPIF_DECL_PARENT_TYPE(obj);
- size_t len;
- spif_avl_tree_node_t root;
+ SPIF_DECL_PROPERTY(listidx, len);
+ SPIF_DECL_PROPERTY(avl_tree_node, root);
};
extern spif_vectorclass_t SPIF_VECTORCLASS_VAR(avl_tree);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/dlinked_list.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- dlinked_list.h 24 Jan 2004 19:52:18 -0000 1.10
+++ dlinked_list.h 3 Feb 2004 23:16:59 -0000 1.11
@@ -32,14 +32,16 @@
#define SPIF_OBJ_IS_DLINKED_LIST_ITEM(o) (SPIF_OBJ_IS_TYPE((o),
dlinked_list_item))
SPIF_DECL_OBJ(dlinked_list_item) {
- spif_obj_t data;
- spif_dlinked_list_item_t prev, next;
+ SPIF_DECL_PROPERTY(obj, data);
+ SPIF_DECL_PROPERTY(dlinked_list_item, prev);
+ SPIF_DECL_PROPERTY(dlinked_list_item, next);
};
SPIF_DECL_OBJ(dlinked_list) {
SPIF_DECL_PARENT_TYPE(obj);
- spif_listidx_t len;
- spif_dlinked_list_item_t head, tail;
+ SPIF_DECL_PROPERTY(listidx, len);
+ SPIF_DECL_PROPERTY(dlinked_list_item, head);
+ SPIF_DECL_PROPERTY(dlinked_list_item, tail);
};
extern spif_listclass_t SPIF_LISTCLASS_VAR(dlinked_list);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/obj.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- obj.h 2 Feb 2004 22:21:21 -0000 1.27
+++ obj.h 3 Feb 2004 23:16:59 -0000 1.28
@@ -33,8 +33,8 @@
* manipulating basic generic objects.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.27 $
- * $Date: 2004/02/02 22:21:21 $
+ * $Revision: 1.28 $
+ * $Date: 2004/02/03 23:16:59 $
*/
/[EMAIL PROTECTED]/
@@ -642,8 +642,8 @@
*/
#define SPIF_OBJ_SHOW_NULL(t, n, b, i, tmp) do { \
memset(tmp, ' ', (i)); \
- snprintf(tmp + (i), sizeof(tmp) - (i),
"(spif_" #t "_t) %s: " \
- SPIF_NULLSTR_TYPE(t) "\n",
NONULL(n)); \
+ snprintf(tmp + (i), sizeof(tmp) - (i),
"(spif_" #t "_t) %s: " SPIF_NULLSTR_TYPE(t) "\n", \
+ NONULL(n)); \
if (SPIF_STR_ISNULL(b)) { \
(b) = spif_str_new_from_ptr(tmp); \
} else { \
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/str.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- str.h 2 Feb 2004 22:21:21 -0000 1.17
+++ str.h 3 Feb 2004 23:16:59 -0000 1.18
@@ -40,7 +40,7 @@
#define SPIF_STR_STR(obj) (SPIF_CONST_CAST(charptr)
((SPIF_STR_ISNULL(obj)) \
? (SPIF_CAST(charptr)
"") \
: (SPIF_STR(obj)->s)))
-typedef size_t spif_stridx_t;
+typedef spif_int32_t spif_stridx_t;
SPIF_DECL_OBJ(str) {
SPIF_DECL_PARENT_TYPE(obj);
@@ -87,8 +87,8 @@
extern spif_stridx_t spif_str_rindex(spif_str_t, spif_char_t);
extern spif_bool_t spif_str_splice(spif_str_t, spif_stridx_t, spif_stridx_t,
spif_str_t);
extern spif_bool_t spif_str_splice_from_ptr(spif_str_t, spif_stridx_t, spif_stridx_t,
spif_charptr_t);
-extern spif_str_t spif_str_substr(spif_str_t, spif_int32_t, spif_int32_t);
-extern spif_charptr_t spif_str_substr_to_ptr(spif_str_t, spif_int32_t, spif_int32_t);
+extern spif_str_t spif_str_substr(spif_str_t, spif_stridx_t, spif_stridx_t);
+extern spif_charptr_t spif_str_substr_to_ptr(spif_str_t, spif_stridx_t,
spif_stridx_t);
extern double spif_str_to_float(spif_str_t);
extern size_t spif_str_to_num(spif_str_t, int);
extern spif_bool_t spif_str_trim(spif_str_t);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/types.h.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- types.h.in 30 Jan 2004 22:55:18 -0000 1.16
+++ types.h.in 3 Feb 2004 23:16:59 -0000 1.17
@@ -363,6 +363,18 @@
* @see @link DOXGRP_TYPES Portable Data Types @endlink
*/
#define SPIF_NULLSTR_TYPE_C(type) "{ ((" #type ") NULL) }"
+
+/**
+ * Returns whether or not a generic pointer is NULL.
+ *
+ * This macro returns whether or not a generic pointer is NULL.
+ *
+ * @param p The pointer to test.
+ * @return #TRUE if NULL, #FALSE otherwise.
+ *
+ * @see @link DOXGRP_TYPES Portable Data Types @endlink, SPIF_CAST()
+ */
+#define SPIF_PTR_ISNULL(p) ((SPIF_CAST(ptr) (p) ==
SPIF_NULL_TYPE(ptr)) ? (TRUE) : (FALSE))
/[EMAIL PROTECTED]/
/[EMAIL PROTECTED]/
-------------------------------------------------------
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
