~mdw
/
sod
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc/clang.tex: Order the table of `simple' C types more sensibly.
[sod]
/
lib
/
sod.h
diff --git
a/lib/sod.h
b/lib/sod.h
index
919b927
..
074989d
100644
(file)
--- a/
lib/sod.h
+++ b/
lib/sod.h
@@
-7,7
+7,7
@@
/*----- Licensing notice --------------------------------------------------*
*
/*----- Licensing notice --------------------------------------------------*
*
- * This file is part of the Sensble Object Design, an object system for C.
+ * This file is part of the Sens
i
ble Object Design, an object system for C.
*
* The SOD Runtime Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
*
* The SOD Runtime Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
@@
-53,7
+53,7
@@
struct sod_vtable {
* these.
*/
struct sod_instance {
* these.
*/
struct sod_instance {
-
struct sod_vtable *_vt;
/* Pointer to (chain's) vtable */
+
const struct sod_vtable *_vt;
/* Pointer to (chain's) vtable */
};
/* Information about a particular chain of superclasses. In each class,
};
/* Information about a particular chain of superclasses. In each class,
@@
-76,14
+76,15
@@
struct sod_chain {
* Arguments: @chead@ = nickname of target chain's head
* @obj@ = pointer to an instance chain
*
* Arguments: @chead@ = nickname of target chain's head
* @obj@ = pointer to an instance chain
*
- * Returns: Pointer to target chain, as a @
char
*@.
+ * Returns: Pointer to target chain, as a @
void
*@.
*
* Use: Utility for implementing cross-chain upcasts. It's probably
* not that clever to use this macro directly; it's used to make
* the automatically-generated upcast macros more palatable.
*/
*
* Use: Utility for implementing cross-chain upcasts. It's probably
* not that clever to use this macro directly; it's used to make
* the automatically-generated upcast macros more palatable.
*/
-#define SOD_XCHAIN(chead, obj) ((char *)(obj) + (obj)->_vt->_off_##chead)
+#define SOD_XCHAIN(chead, obj) \
+ ((void *)((char *)(obj) + (obj)->_vt->_off_##chead))
/* --- @SOD_OFFSETDIFF@ --- *
*
/* --- @SOD_OFFSETDIFF@ --- *
*
@@
-124,13
+125,25
@@
struct sod_chain {
((struct cls##__ilayout *) \
((char *)(obj) - offsetof(struct cls##__ilayout, chead)))
((struct cls##__ilayout *) \
((char *)(obj) - offsetof(struct cls##__ilayout, chead)))
+/* --- @SOD_CAR@ --- *
+ *
+ * Arguments: @...@ = a nonempty list of arguments
+ *
+ * Returns: The first argument only.
+ */
+
+#if __STDC_VERSION__ >= 199901
+# define SOD_CAR(...) SOD__CARx(__VA_LIST__, _)
+# define SOD__CARx(a, ...) a
+#endif
+
/*----- Utility macros ----------------------------------------------------*/
/* --- @SOD_CLASSOF@ --- *
*
* Arguments: @p@ = pointer to an instance chain
*
/*----- Utility macros ----------------------------------------------------*/
/* --- @SOD_CLASSOF@ --- *
*
* Arguments: @p@ = pointer to an instance chain
*
- * Returns: A pointer to the instance's class, as a
const SodClass
.
+ * Returns: A pointer to the instance's class, as a
@const SodClass *@
.
*/
#define SOD_CLASSOF(obj) ((const SodClass *)(obj)->_vt->_class)
*/
#define SOD_CLASSOF(obj) ((const SodClass *)(obj)->_vt->_class)