Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include/libast
Modified Files:
objpair.h tok.h types.h.in
Log Message:
Fri Jan 30 17:55:47 2004 Michael Jennings (mej)
Working on adding assertions/requires for NULL object checks.
Also making sure list elements can be NULL so insert_at() can resize
a list.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/objpair.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- objpair.h 24 Jan 2004 19:53:25 -0000 1.1
+++ objpair.h 30 Jan 2004 22:55:18 -0000 1.2
@@ -32,8 +32,8 @@
* This file contains the declarations for the paired object type.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.1 $
- * $Date: 2004/01/24 19:53:25 $
+ * $Revision: 1.2 $
+ * $Date: 2004/01/30 22:55:18 $
*/
/[EMAIL PROTECTED]/
@@ -221,13 +221,19 @@
extern spif_class_t SPIF_CLASS_VAR(objpair);
extern spif_objpair_t spif_objpair_new(void);
-extern spif_bool_t spif_objpair_del(spif_objpair_t);
-extern spif_bool_t spif_objpair_init(spif_objpair_t);
-extern spif_bool_t spif_objpair_done(spif_objpair_t);
-extern spif_str_t spif_objpair_show(spif_objpair_t, spif_charptr_t, spif_str_t,
size_t);
-extern spif_cmp_t spif_objpair_comp(spif_objpair_t, spif_objpair_t);
-extern spif_objpair_t spif_objpair_dup(spif_objpair_t);
-extern spif_classname_t spif_objpair_type(spif_objpair_t);
+extern spif_objpair_t spif_objpair_new_from_left(spif_obj_t left);
+extern spif_objpair_t spif_objpair_new_from_right(spif_obj_t right);
+extern spif_objpair_t spif_objpair_new_from_both(spif_obj_t left, spif_obj_t right);
+extern spif_bool_t spif_objpair_del(spif_objpair_t self);
+extern spif_bool_t spif_objpair_init(spif_objpair_t self);
+extern spif_bool_t spif_objpair_init_from_left(spif_objpair_t self, spif_obj_t left);
+extern spif_bool_t spif_objpair_init_from_right(spif_objpair_t self, spif_obj_t
right);
+extern spif_bool_t spif_objpair_init_from_both(spif_objpair_t self, spif_obj_t left,
spif_obj_t right);
+extern spif_bool_t spif_objpair_done(spif_objpair_t self);
+extern spif_str_t spif_objpair_show(spif_objpair_t self, spif_charptr_t name,
spif_str_t buff, size_t indent);
+extern spif_cmp_t spif_objpair_comp(spif_objpair_t self, spif_objpair_t other);
+extern spif_objpair_t spif_objpair_dup(spif_objpair_t self);
+extern spif_classname_t spif_objpair_type(spif_objpair_t self);
SPIF_DECL_PROPERTY_FUNC(objpair, obj, left);
SPIF_DECL_PROPERTY_FUNC(objpair, obj, right);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/tok.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- tok.h 10 Jan 2004 21:15:16 -0000 1.10
+++ tok.h 30 Jan 2004 22:55:18 -0000 1.11
@@ -50,10 +50,12 @@
/* An tok object is a string tokenizer */
SPIF_DECL_OBJ(tok) {
SPIF_DECL_PARENT_TYPE(obj);
- spif_str_t src;
- spif_char_t quote, dquote, escape;
- spif_list_t tokens;
- spif_str_t sep;
+ SPIF_DECL_PROPERTY(str, src);
+ SPIF_DECL_PROPERTY(char, quote);
+ SPIF_DECL_PROPERTY(char, dquote);
+ SPIF_DECL_PROPERTY(char, escape);
+ SPIF_DECL_PROPERTY(str, sep);
+ SPIF_DECL_PROPERTY(list, tokens);
};
extern spif_class_t SPIF_CLASS_VAR(tok);
@@ -72,16 +74,11 @@
extern spif_cmp_t spif_tok_comp(spif_tok_t, spif_tok_t);
extern spif_tok_t spif_tok_dup(spif_tok_t);
extern spif_classname_t spif_tok_type(spif_tok_t);
-extern spif_str_t spif_tok_get_src(spif_tok_t);
-extern spif_bool_t spif_tok_set_src(spif_tok_t, spif_str_t);
-extern spif_char_t spif_tok_get_quote(spif_tok_t);
-extern spif_bool_t spif_tok_set_quote(spif_tok_t, spif_char_t);
-extern spif_char_t spif_tok_get_dquote(spif_tok_t);
-extern spif_bool_t spif_tok_set_dquote(spif_tok_t, spif_char_t);
-extern spif_char_t spif_tok_get_escape(spif_tok_t);
-extern spif_bool_t spif_tok_set_escape(spif_tok_t, spif_char_t);
-extern spif_str_t spif_tok_get_sep(spif_tok_t);
-extern spif_bool_t spif_tok_set_sep(spif_tok_t, spif_str_t);
-extern spif_list_t spif_tok_get_tokens(spif_tok_t);
+SPIF_DECL_PROPERTY_FUNC(tok, str, src);
+SPIF_DECL_PROPERTY_FUNC(tok, char, quote);
+SPIF_DECL_PROPERTY_FUNC(tok, char, dquote);
+SPIF_DECL_PROPERTY_FUNC(tok, char, escape);
+SPIF_DECL_PROPERTY_FUNC(tok, str, sep);
+SPIF_DECL_PROPERTY_FUNC(tok, list, tokens);
#endif /* _LIBAST_TOK_H_ */
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/types.h.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- types.h.in 10 Jan 2004 21:15:16 -0000 1.15
+++ types.h.in 30 Jan 2004 22:55:18 -0000 1.16
@@ -318,6 +318,21 @@
#define SPIF_NULL_TYPE_C(type) (SPIF_CAST_C(type) (NULL))
/**
+ * Returns a NULL pointer to an object of the specified base type.
+ *
+ * This macro returns a NULL pointer to an object of the type
+ * specified by the given basename. It is generally used for
+ * initializing object member variables and for returning
+ * correctly-typed NULL objects.
+ *
+ * @param type The type basename.
+ * @return A NULL pointer to an object of the specified type.
+ *
+ * @see @link DOXGRP_TYPES Portable Data Types @endlink, SPIF_CAST()
+ */
+#define SPIF_NULL_TYPE_PTR(type) (SPIF_CAST_PTR(type) (NULL))
+
+/**
* Returns a string representing a NULL value of the specified base
* type.
*
-------------------------------------------------------
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
