[foo-cvs] foo/elkfoo/include elkfoo.h,1.3,1.4

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28479/include

Modified Files:
	elkfoo.h 
Log Message:
cleaned up ObjC message passing stuff

Index: elkfoo.h
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/include/elkfoo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** elkfoo.h	8 Aug 2004 17:47:50 -0000	1.3
--- elkfoo.h	9 Aug 2004 01:42:04 -0000	1.4
***************
*** 107,147 ****
  extern SchemeObject Null_Pointer;
  
! #define C_base			0
! 
! #define C_char			(C_base + 1)
! #define C_short			(C_base + 2)
! #define C_int			(C_base + 3)
! #define C_long			(C_base + 4)
! #define C_unsigned_char		(C_base + 5)
! #define C_unsigned_short	(C_base + 6)
! #define C_unsigned_int		(C_base + 7)
! #define C_unsigned_long		(C_base + 8)
! #define C_float			(C_base + 9)
! #define C_double		(C_base + 10)
  
! #define C_pointers		(C_double + 1)
  
! #define C_VOID			(C_pointers + 0)
! #define C_CHAR			(C_pointers + 1)
! #define C_SHORT			(C_pointers + 2)
! #define C_INT			(C_pointers + 3)
! #define C_LONG			(C_pointers + 4)
! #define C_UNSIGNED_CHAR		(C_pointers + 5)
! #define C_UNSIGNED_SHORT	(C_pointers + 6)
! #define C_UNSIGNED_INT		(C_pointers + 7)
! #define C_UNSIGNED_LONG		(C_pointers + 8)
! #define C_FLOAT			(C_pointers + 9)
! #define C_DOUBLE		(C_pointers + 10)
! #define C_ID			(C_pointers + 11)
! #define C_CLASS			(C_pointers + 12)
! #define C_SEL			(C_pointers + 13)
! #define C_STRUCT		(C_pointers + 14)
! #define C_UNION			(C_pointers + 15)
! #define C_ARRAY			(C_pointers + 16)
! #define C_undef			(C_pointers + 17)
! #define C_CHARPTR		(C_pointers + 18)
! #define C_UNDEF			(C_pointers + 19)
  
! #define C_last			C_UNDEF
  
  
--- 107,191 ----
  extern SchemeObject Null_Pointer;
  
! /*
!  * types
!  */
! typedef enum
!   {
!     C_base			=	0,
!     C_char			=	1,
!     C_short			=	2,
!     C_int			=	3,
!     C_long			=	4,
!     C_unsigned_char		=	5,
!     C_unsigned_short		=	6,
!     C_unsigned_int		=	7,
!     C_unsigned_long		=	8,
!     C_float			=	9,
!     C_double			=	10,
!     /* pointer types from here */
!     C_VOID			=	11,
!     C_CHAR			=	12,
!     C_SHORT			=	13,
!     C_INT			=	14,
!     C_LONG			=	15,
!     C_UNSIGNED_CHAR		=	16,
!     C_UNSIGNED_SHORT		=	17,
!     C_UNSIGNED_INT		=	18,
!     C_UNSIGNED_LONG		=	19,
!     C_FLOAT			=	20,
!     C_DOUBLE			=	21,
!     C_ID			=	22,
!     C_CLASS			=	23,
!     C_SEL			=	24,
!     C_STRUCT			=	25,
!     C_UNION			=	26,
!     C_ARRAY			=	27,
!     C_undef			=	28,
!     C_CHARPTR			=	29,
!     C_UNDEF			=	30
!   } elkfoo_type_t;
  
! #define C_pointers	C_VOID
! #define C_last		C_UNDEF
  
! /* type names */
! static char *elkfoo_type_names[] =
!   { /* corresponds to enum above */
!     "DUMMY",		/* 0 */
!     "char",		/* 1 */
!     "short",		/* 2 */
!     "int",		/* 3 */
!     "long",		/* 4 */
!     "uchar",		/* 5 */
!     "ushort",		/* 6 */
!     "uint",		/* 7 */
!     "ulong",		/* 8 */
!     "float",		/* 9 */
!     "double",		/* 10 */
!     "void*",		/* 11 */
!     "char*",		/* 12 */
!     "short*",		/* 13 */
!     "int*",		/* 14 */
!     "long*",		/* 15 */
!     "uchar*",		/* 16 */
!     "ushort*",		/* 17 */
!     "uint*",		/* 18 */
!     "ulong*",		/* 19 */
!     "float*",		/* 20 */
!     "double*",		/* 21 */
!     "id",		/* 22 */
!     "class",		/* 23 */
!     "sel",		/* 24 */
!     "struct*",		/* 25 */
!     "union*",		/* 26 */
!     "array*",		/* 27 */
!     "undefined",	/* 28 */
!     "char**",		/* 29 */
!     "undefined*",	/* 30 */
!   };
  
! extern elkfoo_type_t A_Map_ObjC_Type (const char *);
! extern int A_Get_Buffer_From_Object (void *, SchemeObject, elkfoo_type_t);
! extern SchemeObject A_Get_Object_From_Buffer (void *, elkfoo_type_t);