X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=ccef2effbfae9aa5e3ea22b3d671fcc9d3770832;hb=eb0d8f8c793b40623f60e51c055f8a7cb7cae668;hp=1f4ddbf695ea70534dd3be656da80fd0460eb616;hpb=b27abb8a41cb8e876112626ef3f5e2c156943bc2;p=svn%2FCll1h%2F.git diff --git a/cll1.h b/cll1.h index 1f4ddbf..ccef2ef 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", LANG=NULL; unsigned RANDOM_SEED=0; /* .----------------------------------------------------------------------. / 1. C<<1 then buddhist section, updated 2008-02-04 xCh. '----------------------------------------------------------------------- */ @@ -85,33 +85,36 @@ extern unsigned RANDOM_SEED; #define or || #define TRUE 1 #define FALSE 0 +#define PI 3.141592654 #define WEIRDINT (1<<(sizeof(int)*8-1)) #define btoa(EXPR) ((EXPR)?"TRUE":"FALSE") -#define coalesce(VAR,EXPR) (VAR?VAR:(EXPR)) +#define coalesce(VAR,EXPR) (VAR?VAR:(VAR=0,(EXPR))) +#define coalesce_str(VAR,EXPR) (VAR && *VAR?VAR:((VAR=NULL),(EXPR))) /* .----------------------------------------------------------------------. / 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 mem_len(TYPE) sizeof(struct _##TYPE##_t) -//#define mem_copy +#define def_mem(TYPE) typedef struct _##TYPE##_t * TYPE; struct _##TYPE##_t +#define get_mem(TYPE) _GET_MEM(TYPE) +#define get_buf(SIZE) (buf)malloc(SIZE) /* temporary solution */ +#define size_of_mem(TYPE) sizeof(struct _##TYPE##_t) +#define copy_of_mem(TYPE,SRC) _cll1_mem_cpy(sizeof(struct _##TYPE##_t),SRC) #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 +/* variable declarators */ +#define Get_mem(ID,TYPE) TYPE ID=get_mem(TYPE) +#define Get_buf(ID,SIZE) buf ID=get_buf(SIZE) /* .----------------------------------------------------------------------. / 5. C<<1 string manipulation, updated 2008-01-26 xCh. '----------------------------------------------------------------------- */ #define get_str(...) _cll1_get_str(__VA_ARGS__,NIL) #define eq(A,B) (!_cll1_str_cmp(A,B)) #define eqi(A,B) (!_cll1_str_cmpi(A,B)) -//#define str_eq(A,B) eq(A,B) ? -//#define str_eqi(A,B) eqi(A,B) #define str_order(A,B) _cll1_str_coll(A,B) #define str_ascii(A,B) _cll1_str_cmp(A,B) -#define str_len(...) _cll1__strlen(__VA_ARGS__,NIL) +#define chars_in_str(...) _cll1_strlen(__VA_ARGS__,NIL) +#define size_of_str(A) mbstowcs(NULL,A,0) #define str_in(A,B) _cll1_str_str(A,B) #define word_in(A,B) _cll1_wordinstr(A,B,0) #define print(...) _cll1_print(__VA_ARGS__,NIL) @@ -123,12 +126,14 @@ extern unsigned RANDOM_SEED; #define suffix(A,B,C) (((A=strrchr(B,C))&&!(*(A++)=0))||(A=B)) #define prefix(A,B,C) ((A=B),((B=strchr(B,C))&&!(*(B++)=0)||(B=A))) #define tr(STR,B,C) _NEW(S,STR) while(S && *_S) { if(*_S==B)*_S=C; /* <-' */ _S++; } +/* variable declarators */ +#define Get_str(ID,...) str ID=get_str(__VA_ARGS__) /* .----------------------------------------------------------------------. / 6. C<<1 data container manipulation, updated 2008-01-26 xCh. '----------------------------------------------------------------------- */ #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 @@ -146,18 +151,18 @@ extern unsigned RANDOM_SEED; / 7. C<<1 builtin iterators and conditionals, updated 2008-01-26 xCh. '----------------------------------------------------------------------- */ #define loop while(TRUE) -#define repeat(N) if(N>0) _NEW(I,0) while(_I++=TO ; FROM<=TO?VAR++:VAR--) +#define repeat(N) _NEW(I,0) _NEW(J,(N)) while(_I++<_J) /* C99 version would be: for(int _i=0,_j=(N);_i++<_j;) */ +#define for_range(VAR,FROM,TO) _NEW(I,(FROM)) _NEW(J,(TO)) for( VAR=_I ; _I<=_J?VAR<=_J:VAR>=_J ; _I<=_J?VAR++:VAR--) #define for_each(NODE,HEAD) for(NODE=HEAD; NODE; NODE=NODE->__next) #define for_search(NODE,HEAD,EXPR) for_each(NODE,HEAD) if(EXPR) #define for_file_lines(STR,FNAME) /* _NEW(CTX,get_context()) file_read(FNAME) for(use_context(_CTX),STR=file_line(_F);release_context(_M),(*S && !feof(_F));STR=file_line(_F),end_context()) _CATCH */ #define for_input_lines(S,L) /* _NEW(CTX,get_context()) for(use_context(_CTX),STR=file_get_line(stdin);release_context(_M),(*S && !feof(stdin));STR=file_get_line(stdin)) _CATCH */ #define for_ints(VAR,...) _NEW(I,0) while( (VAR=_cll1_for_ints(_I++,__VA_ARGS__,WEIRDINT))!=WEIRDINT ) #define for_strs(VAR,...) _NEW(I,0) while( (VAR=(char *)_cll1_for_ptrs(_I++,__VA_ARGS__,NIL))!=NIL ) -#define for_args _NEW(I,1) while(_I++1) #define switch_for_args for_args switch_str(this_arg) @@ -173,28 +178,31 @@ 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 anonymous void * -#define I_am(MEM) MEM self=(MEM)community -#define def_community(TYPE,INTERFACE) def_mem(TYPE) { INTERFACE __interface; }; +#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 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); } +#define construct(TYPE,INTERFACE) TYPE _init_##TYPE(TYPE o,INTERFACE 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_as(COMMUNITY,MEM,INTERFACE,...) (COMMUNITY)get_obj(MEM,INTERFACE,__VA_ARGS__) +#define _(METHOD,...) ((((_ARG1(__VA_ARGS__,)) || /* will not compile if object is not lvalue: */(_ARG1(__VA_ARGS__,)=NULL)) && (_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 * +/* variable declarators */ +#define Get_obj(ID,MEM,...) MEM ID=get_obj(MEM,__VA_ARGS__) +#define Get_obj_as(ID,COMMUNITY,MEM,...) MEM ID=get_obj_as(COMMUNITY,MEM,INTERFACE,__VA_ARGS__) +#define I_am(SELF,MEM) MEM SELF=(MEM)community /* .----------------------------------------------------------------------. / 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 _DECLARE_PRINT void _cll1_print(const char *s,...) #define _PRINT _DECLARE_PRINT _CLL1_FPRINT(stdout) -#define _DECLARE_FPRINT void _cll1_fprint(FILE *f,char *s,...) +#define _DECLARE_FPRINT void _cll1_fprint(FILE *f,const char *s,...) #define _FPRINT _DECLARE_FPRINT _CLL1_FPRINT(f) #define _CLL1_FECHO(IOSTREAM) { va_list ap; /* <-' */ for(va_start(ap,s);s!=NIL;s=va_arg(ap,char *)) fputs(coalesce(s,NIL),IOSTREAM); va_end(ap); } #define _ECHO void _cll1_echo(char *s,...) _CLL1_FECHO(stdout) @@ -209,7 +217,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; @@ -223,19 +231,21 @@ extern _DECLARE_STRSTR; / 10. C<<1 private infrastructure, updated 2008-02-03 by xCh. '----------------------------------------------------------------------- */ #define _I (_Iatom->I) +#define _J (_Jatom->J) #define _S (_Satom->S) #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) #define _NEW(NAME,VALUE) for(_##NAME##atom=get_mem(_##NAME##Atom),_##NAME##atom->NAME=(VALUE),_##NAME##atom->c=1,push(_##NAME##atom,_##NAME##stack);_##NAME##atom->c||(pop(_##NAME##atom,_##NAME##stack),0);_##NAME##atom->c--) #define _ANYSTACK(NAME) _##NAME##Atom _##NAME##atom,_##NAME##stack=NULL; -#define _EXPORT_STACKS _ANYSTACK(I) _ANYSTACK(S) _ANYSTACK(F) _ANYSTACK(CTX) +#define _EXPORT_STACKS _ANYSTACK(I) _ANYSTACK(J) _ANYSTACK(S) _ANYSTACK(F) _ANYSTACK(CTX) _ANYATOM(int,I); +_ANYATOM(int,J); _ANYATOM(str,S); _ANYATOM(FILE *,F); _ANYATOM(void *,CTX); @@ -342,18 +352,18 @@ 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 #define _DECLARE_PROGRAM void _PROGRAM(int argc, char **argv) -#define program _IMPLEMENT_CLL1_LIBRARY _DECLARE_PROGRAM; int main(int argc, char **argv) { setlocale(LC_ALL, ""); _PROGRAM(argc,argv); return 0; } _DECLARE_PROGRAM +#define program _IMPLEMENT_CLL1_LIBRARY _DECLARE_PROGRAM; int main(int argc, char **argv) { LANG=setlocale(LC_ALL, ""); _PROGRAM(argc,argv); return 0; } _DECLARE_PROGRAM #ifdef USE_PREPROCESSOR #include "_include.c" #endif