Drop -fplan9-extensions

1 files changed, 41 insertions, 16 deletions

diff --git a/libobj/include/libobj/obj.h b/libobj/include/libobj/obj.h
index 1fb8f95..06b7298 100644
--- a/libobj/include/libobj/obj.h
+++ b/libobj/include/libobj/obj.h
@@ -39,30 +39,42 @@
 	(lo_nest, _ARG_child_iface_name)
 #define LO_FUNC(_ARG_ret_type, _ARG_func_name, ...) \
 	(lo_func, _ARG_ret_type, _ARG_func_name __VA_OPT__(,) __VA_ARGS__)
-#define LO_INTERFACE(_ARG_iface_name)                         \
-	typedef struct {                                      \
-		LM_FOREACH_TUPLE(_ARG_iface_name##_LO_IFACE,  \
-		                 _LO_IFACE_VTABLE)            \
-	} _lo_##_ARG_iface_name##_vtable;                     \
-	struct _ARG_iface_name {                              \
-		void                                 *self;   \
-		const _lo_##_ARG_iface_name##_vtable *vtable; \
-	};                                                    \
-	LM_FOREACH_TUPLE(_ARG_iface_name##_LO_IFACE,          \
-	                 _LO_IFACE_PROTO, _ARG_iface_name)    \
+#define LO_INTERFACE(_ARG_iface_name)                                \
+	struct _lo_##_ARG_iface_name##_vtable {                      \
+		LM_FOREACH_TUPLE(_ARG_iface_name##_LO_IFACE,         \
+		                 _LO_IFACE_VTABLE)                   \
+	};                                                           \
+	struct _ARG_iface_name {                                     \
+		void                                 *self;          \
+		const struct _lo_##_ARG_iface_name##_vtable *vtable; \
+	};                                                           \
+	LM_FOREACH_TUPLE(_ARG_iface_name##_LO_IFACE,                 \
+	                 _LO_IFACE_PROTO, _ARG_iface_name)           \
 	extern int LM_CAT2_(_HIDDEN_BOGUS_, __COUNTER__)
 
 #define _LO_IFACE_VTABLE(_tuple_typ, ...)                             _LO_IFACE_VTABLE_##_tuple_typ(__VA_ARGS__)
-#define _LO_IFACE_VTABLE_lo_nest(_ARG_child_iface_name)               _lo_##_ARG_child_iface_name##_vtable;
+#define _LO_IFACE_VTABLE_lo_nest(_ARG_child_iface_name)               const struct _lo_##_ARG_child_iface_name##_vtable *_lo_##_ARG_child_iface_name##_vtable; LM_FOREACH_TUPLE2(_ARG_child_iface_name##_LO_IFACE, _LO_IFACE_VTABLE2)
 #define _LO_IFACE_VTABLE_lo_func(_ARG_ret_type, _ARG_func_name, ...)  _ARG_ret_type (*_ARG_func_name)(void * __VA_OPT__(,) __VA_ARGS__);
 
+#define _LO_IFACE_VTABLE2(_tuple_typ, ...)                            _LO_IFACE_VTABLE2_##_tuple_typ(__VA_ARGS__)
+#define _LO_IFACE_VTABLE2_lo_nest(_ARG_child_iface_name)              const struct _lo_##_ARG_child_iface_name##_vtable *_lo_##_ARG_child_iface_name##_vtable; LM_FOREACH_TUPLE3(_ARG_child_iface_name##_LO_IFACE, _LO_IFACE_VTABLE3)
+#define _LO_IFACE_VTABLE2_lo_func(_ARG_ret_type, _ARG_func_name, ...) _ARG_ret_type (*_ARG_func_name)(void * __VA_OPT__(,) __VA_ARGS__);
+
+#define _LO_IFACE_VTABLE3(_tuple_typ, ...)                            _LO_IFACE_VTABLE3_##_tuple_typ(__VA_ARGS__)
+#define _LO_IFACE_VTABLE3_lo_nest(_ARG_child_iface_name)              const struct _lo_##_ARG_child_iface_name##_vtable *_lo_##_ARG_child_iface_name##_vtable; LM_FOREACH_TUPLE4(_ARG_child_iface_name##_LO_IFACE, _LO_IFACE_VTABLE4)
+#define _LO_IFACE_VTABLE3_lo_func(_ARG_ret_type, _ARG_func_name, ...) _ARG_ret_type (*_ARG_func_name)(void * __VA_OPT__(,) __VA_ARGS__);
+
+#define _LO_IFACE_VTABLE4(_tuple_typ, ...)                            _LO_IFACE_VTABLE4_##_tuple_typ(__VA_ARGS__)
+#define _LO_IFACE_VTABLE4_lo_nest(_ARG_child_iface_name)              static_assert(0, "BUG: libobj cannot nest interfaces more than 4 deep");
+#define _LO_IFACE_VTABLE4_lo_func(_ARG_ret_type, _ARG_func_name, ...) _ARG_ret_type (*_ARG_func_name)(void * __VA_OPT__(,) __VA_ARGS__);
+
 #define _LO_IFACE_PROTO(_ARG_iface_name, _tuple_typ, ...)  _LO_IFACE_PROTO_##_tuple_typ(_ARG_iface_name, __VA_ARGS__)
 #define _LO_IFACE_PROTO_lo_nest(_ARG_iface_name, _ARG_child_iface_name)                        \
 	LM_ALWAYS_INLINE static lo_interface _ARG_child_iface_name                             \
 	box_##_ARG_iface_name##_as_##_ARG_child_iface_name(lo_interface _ARG_iface_name obj) { \
 		return (lo_interface _ARG_child_iface_name){                                   \
 			.self = obj.self,                                                      \
-			.vtable = &obj.vtable->_lo_##_ARG_child_iface_name##_vtable,           \
+			.vtable = obj.vtable->_lo_##_ARG_child_iface_name##_vtable,            \
 		};                                                                             \
 	}
 #define _LO_IFACE_PROTO_lo_func(_ARG_iface_name, _ARG_ret_type, _ARG_func_name, ...) \
@@ -103,7 +115,7 @@
  */
 #define LO_IMPLEMENTATION_H(_ARG_iface_name, _ARG_impl_type, _ARG_impl_name)          \
 	/* Vtable.  */                                                                \
-	extern const _lo_##_ARG_iface_name##_vtable                                   \
+	extern const struct _lo_##_ARG_iface_name##_vtable                            \
 	_lo_##_ARG_impl_name##_##_ARG_iface_name##_vtable;                            \
 	/* Boxing.  */                                                                \
 	LM_ALWAYS_INLINE static lo_interface _ARG_iface_name                          \
@@ -131,7 +143,7 @@
 	LM_FOREACH_TUPLE(_ARG_iface_name##_LO_IFACE,                                  \
 	                 _LO_IMPL_PROTO, _ARG_impl_type, _ARG_impl_name, __VA_ARGS__) \
 	/* Vtable.  */                                                                \
-	const _lo_##_ARG_iface_name##_vtable                                          \
+	const struct _lo_##_ARG_iface_name##_vtable                                   \
 	_lo_##_ARG_impl_name##_##_ARG_iface_name##_vtable = {                         \
 		LM_FOREACH_TUPLE(_ARG_iface_name##_LO_IFACE,                          \
 		                 _LO_IMPL_VTABLE, _ARG_impl_name)                     \
@@ -142,7 +154,20 @@
 #define _LO_IMPL_PROTO_lo_func(_ARG_impl_type, _ARG_impl_name, _ARG_quals, _ARG_ret_type, _ARG_func_name, ...)  _ARG_quals _ARG_ret_type _ARG_impl_name##_##_ARG_func_name(_ARG_impl_type * __VA_OPT__(,) __VA_ARGS__);
 
 #define _LO_IMPL_VTABLE(_ARG_impl_name, _tuple_typ, ...)                             _LO_IMPL_VTABLE_##_tuple_typ(_ARG_impl_name, __VA_ARGS__)
-#define _LO_IMPL_VTABLE_lo_nest(_ARG_impl_name, _ARG_child_iface_name)               ._lo_##_ARG_child_iface_name##_vtable = _lo_##_ARG_impl_name##_##_ARG_child_iface_name##_vtable,
+#define _LO_IMPL_VTABLE_lo_nest(_ARG_impl_name, _ARG_child_iface_name)               ._lo_##_ARG_child_iface_name##_vtable = &_lo_##_ARG_impl_name##_##_ARG_child_iface_name##_vtable, LM_FOREACH_TUPLE2(_ARG_child_iface_name##_LO_IFACE, _LO_IMPL_VTABLE2, _ARG_impl_name)
 #define _LO_IMPL_VTABLE_lo_func(_ARG_impl_name, _ARG_ret_type, _ARG_func_name, ...)  ._ARG_func_name                       = (void*)_ARG_impl_name##_##_ARG_func_name,
 
+#define _LO_IMPL_VTABLE2(_ARG_impl_name, _tuple_typ, ...)                            _LO_IMPL_VTABLE2_##_tuple_typ(_ARG_impl_name, __VA_ARGS__)
+#define _LO_IMPL_VTABLE2_lo_nest(_ARG_impl_name, _ARG_child_iface_name)              ._lo_##_ARG_child_iface_name##_vtable = &_lo_##_ARG_impl_name##_##_ARG_child_iface_name##_vtable, LM_FOREACH_TUPLE3(_ARG_child_iface_name##_LO_IFACE, _LO_IMPL_VTABLE3, _ARG_impl_name)
+#define _LO_IMPL_VTABLE2_lo_func(_ARG_impl_name, _ARG_ret_type, _ARG_func_name, ...) ._ARG_func_name                       = (void*)_ARG_impl_name##_##_ARG_func_name,
+
+#define _LO_IMPL_VTABLE3(_ARG_impl_name, _tuple_typ, ...)                            _LO_IMPL_VTABLE3_##_tuple_typ(_ARG_impl_name, __VA_ARGS__)
+#define _LO_IMPL_VTABLE3_lo_nest(_ARG_impl_name, _ARG_child_iface_name)              ._lo_##_ARG_child_iface_name##_vtable = &_lo_##_ARG_impl_name##_##_ARG_child_iface_name##_vtable, LM_FOREACH_TUPLE4(_ARG_child_iface_name##_LO_IFACE, _LO_IMPL_VTABLE4, _ARG_impl_name)
+#define _LO_IMPL_VTABLE3_lo_func(_ARG_impl_name, _ARG_ret_type, _ARG_func_name, ...) ._ARG_func_name                       = (void*)_ARG_impl_name##_##_ARG_func_name,
+
+#define _LO_IMPL_VTABLE4(_ARG_impl_name, _tuple_typ, ...)                            _LO_IMPL_VTABLE4_##_tuple_typ(_ARG_impl_name, __VA_ARGS__)
+#define _LO_IMPL_VTABLE4_lo_nest(_ARG_impl_name, _ARG_child_iface_name)              static_assert(0, "BUG: libobj cannot nest interfaces more than 4 deep");
+#define _LO_IMPL_VTABLE4_lo_func(_ARG_impl_name, _ARG_ret_type, _ARG_func_name, ...) ._ARG_func_name                       = (void*)_ARG_impl_name##_##_ARG_func_name,
+
+
 #endif /* _LIBOBJ_OBJ_H_ */