X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=535d933e447161ffde7cf5efa95d8445ab818ce1;hb=99cd47b15d13ea0126dab46bcbec912a2f920f24;hp=356d70d716d3ce295dc8af6293917e40d9e22830;hpb=a3c2aecbff1dd82a26f3a69a3e1fdc04349b8d7a;p=svn%2FCll1h%2F.git diff --git a/cll1.h b/cll1.h index 356d70d..535d933 100644 --- a/cll1.h +++ b/cll1.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #ifdef USE_LIBRARY_FASTCGI #include @@ -53,15 +54,23 @@ #include #endif /* .----------------------------------------------------------------------. - / 0. C<<1 typedefs and public gloabl variables, updated 2008-02-03 xCh. + / 0. C<<1 typedefs and public global variables, updated 2008-02-03 xCh. '----------------------------------------------------------------------- */ -typedef char * str; /* #ifdef USE_MODULE_UNICODE...typedef wchar_t * str; */ +typedef void * any; typedef unsigned char * buf; /* this will be always 8-bit usigned char * */ typedef FILE * file; typedef int bool; -extern str NIL,EOL,OFS,IFS; +#ifdef USE_WCHAR_T +typedef wchar_t * str; +#else +typedef char * str; /* Warning: full wchar_t support not yet implemented! */ +#endif +extern str NIL, EOL, OFS, IFS, LANG, errstr; /* used for: perror(errstr) */ extern unsigned RANDOM_SEED; -#define _EXPORT_GLOBALS str NIL="(null)", EOL="\n", OFS=" ", IFS=" \t\n", LANG=NULL; unsigned RANDOM_SEED=0; +#define _EXPORT_GLOBALS \ +str NIL="(null)", EOL="\n", OFS=" ", IFS=" \t\n", LANG=NULL; \ +str errstr="C<<1 0xdead"; \ +unsigned RANDOM_SEED=0; /* .----------------------------------------------------------------------. / 1. C<<1 then buddhist section, updated 2008-02-04 xCh. '----------------------------------------------------------------------- */ @@ -93,16 +102,17 @@ 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 def_type(TYPE) typedef struct _##TYPE##_struct * TYPE +#define def_mem(TYPE) def_type(TYPE); struct _##TYPE##_struct #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 size_of_mem(TYPE) sizeof(struct _##TYPE##_struct) +#define copy_of_mem(TYPE,SRC) _cll1_mem_cpy(sizeof(struct _##TYPE##_struct),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 -/* variable declarators */ +/* ---- variable declarators -------------------------------------------- */ #define Get_mem(ID,TYPE) TYPE ID=get_mem(TYPE) #define Get_buf(ID,SIZE) buf ID=get_buf(SIZE) /* .----------------------------------------------------------------------. @@ -126,7 +136,7 @@ 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 */ +/* ---- variable declarators -------------------------------------------- */ #define Get_str(ID,...) str ID=get_str(__VA_ARGS__) /* .----------------------------------------------------------------------. / 6. C<<1 data container manipulation, updated 2008-01-26 xCh. @@ -139,8 +149,8 @@ extern unsigned RANDOM_SEED; //to do: seek //to do: store #define count(NODE,HEAD,VAR) { _NEW(I,0) for(NODE=HEAD; NODE || ((VAR=_I),0) ; (NODE=NODE->__next)?(_I++):0 ); } -#define order_by_int(K1,K2) (K1>K2) -#define order_by_int_desc(K1,K2) (K1K2) +#define order_by_num_desc(K1,K2) (K10) #define order_by_str_desc(K1,K2) (str_order(K1,K2)<0) #define order_by_ascii(K1,K2) (str_ascii(K1,K2)>0) @@ -151,8 +161,8 @@ extern unsigned RANDOM_SEED; / 7. C<<1 builtin iterators and conditionals, updated 2008-01-26 xCh. '----------------------------------------------------------------------- */ #define loop while(TRUE) -#define repeat(N) _NEW(I,0) _NEW(J,N) while(_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 repeat(N) _NEW(I,(_J=(N),0)) while(_I++<_J) /* C99 version would be: for(int _i=0,_j=(N);_i++<_j;) */ +#define for_range(VAR,FROM,TO) _NEW(I,((_J=(TO)),FROM)) 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 */ @@ -165,9 +175,9 @@ extern unsigned RANDOM_SEED; #define continue_args _I++ #define if_exists(NODE,HEAD,EXPR) for_search(NODE,HEAD,EXPR) break; if(NODE) #define if_args if(argc>1) -#define switch_for_args for_args switch_str(this_arg) -#define switch_str(STR) _NEW(S,STR) -#define if_case(VAL) if(eq(argv[_I],VAL)) +#define switch_for_args for_args with_str(this_arg) +#define with_str(STR) _NEW(S,STR) +#define if_case(VAL) if(eq(_S,VAL)) #define for_fields(FIELD,STR) for_valid_split(FIELD,STR,*OFS) #define for_split_str(A,B,C) for(prefix(A,B,C);A;(A!=B)&&prefix(A,B,C)||(A=NULL)) #define for_valid_split(A,B,C) for_split_str(A,B,C) if(*A) @@ -178,8 +188,8 @@ 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 def_interface(TYPE,INTERFACE) def_type(TYPE); def_mem(INTERFACE) +#define def_obj(TYPE) struct _##TYPE##_struct #define interface(TYPE) TYPE __interface #define interface_of(SELF) SELF->__interface #define method(NAME) (*NAME) @@ -187,22 +197,34 @@ extern unsigned RANDOM_SEED; #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 __(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 */ +/* ---- 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. + / 9. C<<1 setjmp()/longjmp() based exceptions, updated 2008-09-30 + '----------------------------------------------------------------------- */ +#define FAILED_TO_FAIL -273 +#define SYSTEM_FAILURE -1 +#define LOCAL_FAILURE 13 +#define LIBRARY_FAILURE 23 +#define EVIL_FAILURE 666 +#define try _NEW(E,0) if(!(_E=setjmp(_EENV))) +#define fail(E) longjmp(_EENV,((E)>0?(E):FAILED_TO_FAIL)) +#define pass_failure (_Eatom->__next?longjmp((pop(_Eatom,_Estack),_EENV),_E):_SYSFAIL(FAILED_TO_FAIL)) +#define else_switch_failures else switch(_E) +#define else_catch(E) else if (_E==(E)) +/* .----------------------------------------------------------------------. + / 10. implementation of C<<1 library functions, updated 2008-01-26 xCh. '----------------------------------------------------------------------- */ /* 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) @@ -231,24 +253,27 @@ extern _DECLARE_STRSTR; / 10. C<<1 private infrastructure, updated 2008-02-03 by xCh. '----------------------------------------------------------------------- */ #define _I (_Iatom->I) -#define _J (_Jatom->J) +#define _J (_Iatom->J) #define _S (_Satom->S) #define _F (_Fatom->F) #define _CTX (_CTXatom->CTX) +#define _E (_Eatom->E) +#define _EENV (_Eatom->ENV) #define _ARG1(ARG1,...) ARG1 -#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 _ASSERT(EXPR) (expr?expr:fail(CONSISTENCY_FAILURE)) +#define _SYSFAIL(E) longjmp(_EENV,(E)) +#define _GET_MEM(TYPE) ((TYPE)malloc(sizeof(struct _##TYPE##_struct))) /* later... ((TYPE)_cll1_malloc(sizeof(struct _##TYPE##_struct))) */ +#define _ANYATOM(NAME,DECL) def_mem(_##NAME##Atom ) { DECL; 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(J) _ANYSTACK(S) _ANYSTACK(F) _ANYSTACK(CTX) -_ANYATOM(int,I); -_ANYATOM(int,J); -_ANYATOM(str,S); -_ANYATOM(FILE *,F); -_ANYATOM(void *,CTX); +#define _ANYSTACK(NAME) extern _##NAME##Atom _##NAME##atom, _##NAME##stack; _##NAME##Atom _##NAME##atom,_##NAME##stack=NULL; +#define _EXPORT_STACKS _ANYSTACK(I) _ANYSTACK(S) _ANYSTACK(F) _ANYSTACK(CTX) _ANYSTACK(E) +_ANYATOM(I, int I;int J); +_ANYATOM(S, str S); +_ANYATOM(F, file F); +_ANYATOM(CTX, void *CTX); +_ANYATOM(E, int E;jmp_buf ENV); /* .----------------------------------------------------------------------. / 11. C<<1 memory contexts - alternative to garbage collection '----------------------------------------------------------------------- */ @@ -353,7 +378,6 @@ obsolete //#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 { } - /* .----------------------------------------------------------------------. / 98. We have have done our homework - now let's have some fun: '----------------------------------------------------------------------- */ @@ -361,9 +385,37 @@ obsolete #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 +//this will be probably accomplished some other way... +#ifndef DISABLE_LIBRARY_CLL1 +_IMPLEMENT_CLL1_LIBRARY +#endif +#ifdef USE_LC_NUMERIC +#define _LC_ALL LC_ALL +#else +//#define _LC_ALL LC_COLLATE|LC_CTYPE|LC_MESSAGES|LC_MONETARY|LC_TIME +#define _LC_ALL LC_TIME +#endif #define _DECLARE_PROGRAM void _PROGRAM(int argc, char **argv) -#define program _IMPLEMENT_CLL1_LIBRARY _DECLARE_PROGRAM; int main(int argc, char **argv) { LANG=setlocale(LC_ALL, ""); _PROGRAM(argc,argv); return 0; } _DECLARE_PROGRAM +#define _PROGRAM _cll1_program +#define program \ +_DECLARE_PROGRAM; \ +int main(int argc, char **argv) \ +{ \ + LANG=setlocale(_LC_ALL, ""); \ + try \ + { \ + _PROGRAM(argc,argv); \ + return 0; \ + } \ + else_switch_failures \ + { \ + case SYSTEM_FAILURE: \ + perror(errstr); /* and return -1 */ \ + default: \ + return -1; \ + } \ +} \ +_DECLARE_PROGRAM #ifdef USE_PREPROCESSOR #include "_include.c" #endif