X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=5693e3cf54a507630b30d24bfe31c77bfbc64c6a;hb=53004c3f042bbacd06e82c2ca774ca5b9d136ab4;hp=1f4ddbf695ea70534dd3be656da80fd0460eb616;hpb=b27abb8a41cb8e876112626ef3f5e2c156943bc2;p=svn%2FCll1h%2F.git

diff --git a/cll1.h b/cll1.h
index 1f4ddbf..5693e3c 100644
--- a/cll1.h
+++ b/cll1.h
@@ -61,7 +61,7 @@ typedef FILE * file;
 typedef int bool;
 extern  str NIL,EOL,OFS,IFS;
 extern  unsigned RANDOM_SEED;
-#define _EXPORT_GLOBALS str NIL="(null)", EOL="\n", OFS=" ", IFS=" \t\n"; unsigned RANDOM_SEED=0; void *_PTR;
+#define _EXPORT_GLOBALS str NIL="(null)", EOL="\n", OFS=" ", IFS=" \t\n"; unsigned RANDOM_SEED=0;
 /* .----------------------------------------------------------------------.
   /  1. C<<1 then buddhist section, updated 2008-02-04 xCh.
  '----------------------------------------------------------------------- */
@@ -92,15 +92,15 @@ extern  unsigned RANDOM_SEED;
   /  4. C<<1 data declaration and allocation, updated 2008-01-31 xCh.
  '----------------------------------------------------------------------- */
 #define def_mem(TYPE) typedef struct  _##TYPE##_t * TYPE; struct  _##TYPE##_t 
-#define get_mem(...) _GET_MEM(__VA_ARGS__,NULL)
-#define Get_mem(ID,...) _ARG1(__VA_ARGS__,) ID=_GET_MEM(__VA_ARGS__,NULL)
+#define get_mem(TYPE) _GET_MEM(TYPE)
+#define Get_mem(ID,TYPE) TYPE ID=_GET_MEM(TYPE)
 #define mem_len(TYPE) sizeof(struct  _##TYPE##_t)
 //#define mem_copy
 #define list(TYPE) TYPE __next
 #define tree(TYPE) TYPE __next; TYPE __seek
 #define dict(TYPE) tree(TYPE); str __key
 #define array(TYPE) tree(TYPE); int __key
-#define interface(TYPE) TYPE __interface
+
 /* .----------------------------------------------------------------------.
   /  5. C<<1 string manipulation, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
@@ -128,7 +128,7 @@ extern  unsigned RANDOM_SEED;
  '----------------------------------------------------------------------- */
 #define push(NODE,HEAD) ( NODE ? ((NODE->__next=HEAD),(HEAD=NODE)) : NULL )
 #define pop(NODE,HEAD) ( HEAD ? ((NODE=HEAD->__next),free(HEAD),(HEAD=NODE)) : (NODE=NULL) )
-#define append(NODE,HEAD) { _PTR=NODE; NODE->__next=NULL; for_search(NODE,HEAD,!NODE->__next) { NODE->__next=_PTR; break; } }
+#define append(NODE,HEAD) { void *_PTR=NODE; if(NODE) NODE->__next=NULL; if(HEAD) { for_search(NODE,HEAD,!NODE->__next) { NODE->__next=_PTR; break; } } else HEAD=NODE; }
 #define remove(NODE,HEAD,EXPR) { void **_D=NULL; /* <-' */ for_search(NODE,HEAD,EXPR) { if(_D)*_D=NODE->__next; else HEAD=NODE->__next; free(NODE); } else _D=(void *)&(NODE->__next); }
 #define drop(NODE,HEAD) for( NODE=HEAD; NODE || (HEAD=NULL); HEAD=NODE, NODE=NODE->__next, free(HEAD) )
 //to do: seek
@@ -173,24 +173,26 @@ extern  unsigned RANDOM_SEED;
 /* .----------------------------------------------------------------------.
   /  8. C<<1 object oriented infrastructure, updated 2008-02-04
  '----------------------------------------------------------------------- */
-#define def_type(TYPE) typedef struct  _##TYPE##_t * TYPE; 
-#define def_obj(TYPE) struct  _##TYPE##_t 
-#define construct_obj(MEM,INTERFACE) MEM _init_##MEM##_##INTERFACE(INTERFACE i) { Get_mem(o,MEM); o->__interface=i; return o; }
+#define def_type(TYPE) typedef struct  _##TYPE##_t * TYPE;
+#define def_obj(TYPE) struct _##TYPE##_t
+#define interface(TYPE) TYPE __interface
+#define interface_of(SELF) SELF->__interface
+#define method(NAME) (*NAME)
+#define construct(TYPE) TYPE _init_##TYPE(TYPE o,void *i) { o->__interface=i; return o; } TYPE __init__##TYPE
+#define get_obj(TYPE,INTERFACE,...) __init__##TYPE(_init_##TYPE(get_mem(TYPE),INTERFACE),__VA_ARGS__)
+#define Get_obj(ID,MEM,...) MEM ID=get_obj(MEM,__VA_ARGS__)
+#define get_obj_as(COMMUNITY,MEM,INTERFACE,...) (COMMUNITY)get_obj(MEM,INTERFACE,__VA_ARGS__)
+#define Get_obj_as(ID,COMMUNITY,MEM,...) MEM ID=get_obj_as(COMMUNITY,MEM,INTERFACE,__VA_ARGS__)
+#define _(METHOD,...) (((_ARG1(__VA_ARGS__,)) && (_ARG1(__VA_ARGS__,))->__interface->METHOD)?(*( (_ARG1(__VA_ARGS__,))->__interface->METHOD )) ((void *)__VA_ARGS__):0 )
+#define __(METHOD,...) ( _ASSERT(ARG1(__VA_ARGS__,)), (*( __cll1_seekmethod(ARG1(__VA_ARGS__,),METHOD) )) ( __VA_ARGS__ ) )
+#define call(OBJTYPE,METHOD,...) { int _N=0; OBJTYPE _OBJ; /* <-' */ while( (_OBJ=(OBJTYPE)_cll1_for_ptrs(_N++,__VA_ARGS__,NIL))!=(OBJTYPE)NIL ) _(_OBJ,METHOD); }
+#define def_community(TYPE,INTERFACE) def_obj(TYPE) { INTERFACE __interface; };
 #define anonymous void *
 #define I_am(MEM) MEM self=(MEM)community
-#define def_community(TYPE,INTERFACE) def_mem(TYPE) { INTERFACE __interface; };
-#define method(NAME) (*NAME)
-#define get_obj(MEM,INTERFACE,INIT) _init_##MEM##_##INTERFACE(INIT)
-#define Get_obj(ID,MEM,INTERFACE) MEM ID=get_obj(MEM,INTERFACE)
-#define get_obj_as(COMMUNITY,MEM,INTERFACE) (COMMUNITY)((_PTR=get_mem(MEM),(_PTR?((MEM)_PTR)->__interface=INTERFACE:0),_PTR))
-#define Get_obj_as(ID,COMMUNITY,MEM,INTERFACE)
-#define _(METHOD,...) ( _ASSERT(ARG1(__VA_ARGS__,)), (*( ARG1(__VA_ARGS__,)->__interface->METHOD )) ( __VA_ARGS__ ) )
-#define __(METHOD,...) ( _ASSERT(ARG1(__VA_ARGS__,)), (*( __cll1_seekmethod(ARG1(__VA_ARGS__,)->__interface,METHOD) )) ( __VA_ARGS__ ) )
-#define call(OBJTYPE,METHOD,...) { int _N=0; OBJTYPE _OBJ; /* <-' */ while( (_OBJ=(OBJTYPE)_cll1_for_ptrs(_N++,__VA_ARGS__,NIL))!=(struct OBJTYPE *)NIL ) _(_OBJ,METHOD); }
 /* .----------------------------------------------------------------------.
   /  9. implementation of C<<1 library functions, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
-#define _MALLOC void *_cll1_malloc(size_t size,...) { /*temporary solution*/ return malloc(size); }
+/* later... #define _MALLOC void *_cll1_malloc(size_t size) {  return malloc(size); } */
 #define _CLL1_FPRINT(IOSTREAM) { int ofs=0; va_list ap; /* <-' */ for(va_start(ap,s);s!=NIL;s=va_arg(ap,char *)) { if(ofs)fputs(OFS,IOSTREAM);else ofs=1;/**/fputs(coalesce(s,NIL),IOSTREAM); } va_end(ap); fputs(EOL,IOSTREAM); }
 #define _DECLARE_PRINT void _cll1_print(char *s,...)
 #define _PRINT _DECLARE_PRINT _CLL1_FPRINT(stdout)
@@ -209,7 +211,7 @@ extern  unsigned RANDOM_SEED;
 #define _STRCMPI _DECLARE_STRCMPI { if(a && b) return strcasecmp(a,b); else return (int)(a-b); }
 #define _DECLARE_STRSTR str _cll1_str_str(str h, str n) 
 #define _STRSTR _DECLARE_STRSTR { if(h && n) return strstr(h,n); else return NULL; }
-//#define _WORDINSTR char *_cll1_wordinstr(char *a,char *b,int ign) { char *IFS=a; for(;a&&*a;a++) for(;*ifs||ifs=IFS;ifs++) if(*a=b);) for    return strcasestr(a,b); else return NULL; }
+// later... #define _WORDINSTR char *_cll1_wordinstr(char *a,char *b,int ign) { char *IFS=a; for(;a&&*a;a++) for(;*ifs||ifs=IFS;ifs++) if(*a=b);) for    return strcasestr(a,b); else return NULL; }
 extern  _DECLARE_PRINT;
 extern  _DECLARE_FPRINT;
 extern  _DECLARE_STRCOLL;
@@ -227,8 +229,8 @@ extern  _DECLARE_STRSTR;
 #define _F (_Fatom->F)
 #define _CTX (_CTXatom->CTX)
 #define _ARG1(ARG1,...) ARG1
-#define _ARG2(ARG1,ARG2,...) ARG2
-#define _GET_MEM(TYPE,CTX) ((TYPE)_cll1_malloc(sizeof(struct _##TYPE##_t),CTX))
+#define _ASSERT(EXPR) assert(EXPR) /* later... _cll1_assert(EXPR,handler) */
+#define _GET_MEM(TYPE) ((TYPE)malloc(sizeof(struct _##TYPE##_t))) /* later... ((TYPE)_cll1_malloc(sizeof(struct _##TYPE##_t))) */
 #define _ANYATOM(TYPE,NAME) def_mem(_##NAME##Atom ) { TYPE NAME; int c; list( _##NAME##Atom ); }
 #define _FOR_COLUMNS(A,B,C) _NEW(I,0) for( prefix(A,B,C) ; A ; ((A!=B)&&prefix(A,B,C)||(A=NULL) ),_I++ ) 
 #define _FOR_VALID_COLUMNS(A,B,C) _NEW(I,0) for( prefix(A,B,C) ; A ; ((A!=B)&&prefix(A,B,C))||(A=NULL) ) if(*A&&++_I) 
@@ -342,13 +344,13 @@ obsolete
 //bind_exception, unbind_exception 
 //#define _CLL1_THROW(ERR)
 //#define _CLL1_TRY _NEW_E for(bind_exception(0,NULL);;) if () {.... if(_Eatom->SYS) { if(_Eatom->RET) return; else break;} else { }
-//#define _ASSERT(EXPR) assert(EXPR)
+
 
 /* .----------------------------------------------------------------------.
   /  98. We have have done our homework - now let's have some fun:          
  '----------------------------------------------------------------------- */
 #define _INIT_VARIABLES _EXPORT_GLOBALS _EXPORT_YES _EXPORT_STACKS _SQL_GLOBALS _CGI_GLOBALS
-#define _IMPL_FUNCTIONS _MALLOC _EXPORT_OUTS _EXPORT_ARGS _EXPORT_STRS
+#define _IMPL_FUNCTIONS /*_MALLOC*/ _EXPORT_OUTS _EXPORT_ARGS _EXPORT_STRS
 #define _IMPL_INTERFACE //_SQL_IFC _CAKE_IFC _STD_IFC _X_IFC
 #define _IMPLEMENT_CLL1_LIBRARY _INIT_VARIABLES _IMPL_FUNCTIONS _IMPL_INTERFACE
 #define _PROGRAM _cll1_program