X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=ccef2effbfae9aa5e3ea22b3d671fcc9d3770832;hb=eb0d8f8c793b40623f60e51c055f8a7cb7cae668;hp=b3c65a41e204708ea4cb2a37554a66fb7d903bd1;hpb=9ae3b2218ffacd28b7bfccaa23d804fb0d399f9b;p=svn%2FCll1h%2F.git diff --git a/cll1.h b/cll1.h index b3c65a4..ccef2ef 100644 --- a/cll1.h +++ b/cll1.h @@ -1,4 +1,4 @@ -/* .----------------------------------------------------------------------. + /* .---------------------------------------------------------------------. / C<<1 header file - C language style sheet - GNU C/ANSI C99 compliant / Cumbersome Extraction and Report Language - http://cll1h.arachne.cz/ '---------------------------------------------------------------------- */ @@ -18,7 +18,6 @@ You should have received a copy of the GNU Lesser General Public License along with C<<1 header file; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ #ifndef _CLL1_H #define _CLL1_H @@ -35,7 +34,7 @@ /* .----------------------------------------------------------------------. / 1. C<<1 header auto include, updated 2008-01-26 xCh. '---------------------------------------------------------------------- */ -#ifndef DISABLE_LIBRARY_LIBC +#ifndef DISABLE_MODULE_AUTOINCLUDE #include #include #include @@ -43,6 +42,7 @@ #include #include #include +#include #ifdef USE_LIBRARY_FASTCGI #include #else @@ -53,64 +53,70 @@ #include #endif /* .----------------------------------------------------------------------. - / 2. C<<1 then buddhist section, updated 2008-01-26 xCh. + / 0. C<<1 typedefs and public gloabl variables, updated 2008-02-03 xCh. + '----------------------------------------------------------------------- */ +typedef char * str; /* #ifdef USE_MODULE_UNICODE...typedef wchar_t * str; */ +typedef unsigned char * buf; /* this will be always 8-bit usigned char * */ +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", LANG=NULL; unsigned RANDOM_SEED=0; +/* .----------------------------------------------------------------------. + / 1. C<<1 then buddhist section, updated 2008-02-04 xCh. '----------------------------------------------------------------------- */ #ifndef DISABLE_MODULE_THEN_BUDDHISM #define then #define MAYBE (int)((long)(RANDOM_SEED?random():((RANDOM_SEED=(unsigned)time(NULL)),srandom(RANDOM_SEED),random()))%2) #define WHOKNOWS (int)(srandom((unsigned)time(NULL)),random()%2) -#define create_var(ID,TYPE,EXPR) TYPE ID=(EXPR) -#define def_var(ID,TYPE) TYPE ID -//#define _CLL1_YES char *YES="TRUE\nYES\nJA\nOUI\nDA\nANO\nY\n1"; +#define for_samsara(MIND,SOUL) for(MIND=SOUL; MIND || ((MIND->__next=SOUL),0) ; MIND=MIND->__next) +#define samsara(MIND,SOUL) for(MIND=SOUL; MIND || ((MIND->__next=SOUL),0) ; MIND=MIND->__next) //#define atob(EXPR) (word_in_stri(YES,(EXPR))?1:0) +//#define _EXPORT_YES str YES="TRUE\nYES\nJA\nOUI\nDA\nANO\nY\n1"; //#else -#define _CLL1_YES char *YES="TRUE"; -#define atob(EXPR) (eqi((EXPR),YES)?1:0) +#define atob(EXPR) (eqi((EXPR),YES)?TRUE:FALSE) +#define _EXPORT_YES str YES="TRUE"; #endif /* .----------------------------------------------------------------------. - / 1. C<<1 almost then buddhist section, updated 2008-01-26 xCh. + / 2. C<<1 almost then buddhist section, updated 2008-02-02 xCh. '----------------------------------------------------------------------- */ #define not ! #define and && #define or || -#define bool int #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 _CLL1_GLOBALS char *NIL="NULL", *EOL="\n", *OFS=" ", *IFS=" \t\n"; unsigned RANDOM_SEED=0; +#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 mem struct -#define this_is(TYPE) struct *TYPE this -#define create_mem(ID,...) struct _ARG1(__VA_ARGS__,) *ID=get_mem(__VA_ARGS__) -#define new_mem(ID,...) struct _ARG1(__VA_ARGS__,) *ID=init_mem(__VA_ARGS__) -#define def_mem(ID,TYPE) struct TYPE *ID=NULL -#define def_mems(ID1,ID2,TYPE) struct TYPE *ID1=NULL, *ID2=NULL -#define get_mem(...) (struct _ARG1(__VA_ARGS__,)*)_cll1_malloc(sizeof(struct _ARG1(__VA_ARGS__,)), _ARG2(__VA_ARGS__,,) - 0 ) -#define init_mem(...) _mem_##TYPE##_( _ARG2(__VA_ARGS__,,) - 0 ) -#define construct_mem(TYPE) (struct TYPE *)_mem_##TYPE##_(void) { create_mem(this,TYPE);/* <-' */ _init_mem_##TYPE##_(this); return this; } _init_mem_##TYPE##_(this_is(TYPE)) -#define create_list(ID1,I2,TYPE) create_mem(ID1,TYPE); struct TYPE *ID2=((ID1->__next=NULL),ID1) -#define create_str(ID,EXPR) char *ID=(EXPR) -#define new_str(ID,...) char *ID=_cll1_get_str(__VA_ARGS__,NIL) -#define def_str(ID) char *ID=NULL -#define get_str(...) _cll1_get_str(__VA_ARGS__,NIL) -#define create_context(ID) create_mem(ID,_CTXAtom) -#define def_context(ID) def_mem(ID,_CTXAtom) -#define list(TYPE) struct TYPE *__next -#define tree(TYPE) struct TYPE *__next; struct TYPE *__seek -#define dictionary(TYPE) struct TYPE *__next; struct TYPE *__seek; char *__key -#define array(TYPE) struct TYPE *__next; struct TYPE *__seek; int __key -#define interface(TYPE) struct TYPE *__interface +#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 +/* 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 eq(A,B) !_cll1_strcmp(A,B) -#define eqi(A,B) !_cll1_strcmpi(A,B) -#define in_str(A,B) _cll1_strstr(A,B) -#define word_in_str(A,B) _cll1_wordinstr(A,B,0) +#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_order(A,B) _cll1_str_coll(A,B) +#define str_ascii(A,B) _cll1_str_cmp(A,B) +#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) #define fprint(...) _cll1_fprint(__VA_ARGS__,NIL) #define file_print(...) _cll1_fprint(_F,__VA_ARGS__,NIL) @@ -120,43 +126,46 @@ #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) { void *N=NODE; /* <-' */ NODE->__next=NULL; for_search(NODE,HEAD,!NODE->__next) { NODE->__next=N; 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 //to do: store -#define order_by(K1,K2) (K1>K2) -#define desc_order_by(K1,K2) (K10) -#define desc_sort_by(K1,K2) (_cll1_strcmpi(K1,K2)<0) -#define ascii_by(K1,K2) (_cll1_strcmp(K1,K2)>0) -#define desc_ascii_by(K1,K2) (_cll1_strcmp(K1,K2)<0) -#define insert(NODE,HEAD,EXP,K) { if(HEAD) { void **_L=NULL, *H=HEAD; /* <-' */ for_search(HEAD,H,EXP(HEAD->K,NODE->K)) { if(_L) {*_L=NODE; NODE->__next=HEAD; } else push(NODE,H); break; } else _L=(void *)&(HEAD->__next); if(!HEAD)*_L=NODE; HEAD=H; } else if (NODE) { push(NODE,HEAD); HEAD->__next=NULL; } } -#define sort(NODE,HEAD,EXP,K) { void *_NEXT; /* <-' */ NODE=HEAD; HEAD=NULL; do { _NEXT=NODE->__next; NODE->__next=NULL; insert(NODE,HEAD,EXP,K); NODE=_NEXT; } while(_NEXT); } +#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) (K10) +#define order_by_str_desc(K1,K2) (str_order(K1,K2)<0) +#define order_by_ascii(K1,K2) (str_ascii(K1,K2)>0) +#define order_by_ascii_desc(K1,K2) (str_ascii(K1,K2)<0) +#define insert(NODE,HEAD,ORDERBY,KEY) { if(HEAD) { void **_L=NULL, *H=HEAD; /* <-' */ for_search(HEAD,H,ORDERBY(HEAD->KEY,NODE->KEY)) { if(_L) {*_L=NODE; NODE->__next=HEAD; } else push(NODE,H); break; } else _L=(void *)&(HEAD->__next); if(!HEAD)*_L=NODE; HEAD=H; } else if (NODE) { push(NODE,HEAD); HEAD->__next=NULL; } } +#define sort(NODE,HEAD,ORDERBY,KEY) { void *_NEXT; /* <-' */ NODE=HEAD; HEAD=NULL; do { _NEXT=NODE->__next; NODE->__next=NULL; insert(NODE,HEAD,ORDERBY,KEY); NODE=_NEXT; } while(_NEXT); } /* .----------------------------------------------------------------------. / 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) +#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 for_fields(FIELD,STR) for_valid_split(FIELD,STR,*OFS) @@ -167,58 +176,86 @@ #define if_column_number(A,B,C,V) _FOR_COLUMNS(A,B,C) if(_I==V) #define if_valid_column_number(A,B,C,V) _FOR_VALID_COLUMNS(A,B,C) if(_I==V) /* .----------------------------------------------------------------------. - / 8. C<<1 object oriented infrastructure, updated 2008-01-31 + / 8. C<<1 object oriented infrastructure, updated 2008-02-04 '----------------------------------------------------------------------- */ -#define my_self(TYPE) struct *TYPE self, void *_method -#define we_are(TYPE) struct *TYPE _self, void *_method -#define anonymous void *_self, void *_method -#define I_am(TYPE) struct TYPE *self=(struct TYPE *)_self -#define def_community(METATYPE,ITYPE) struct METATYPE { struct ITYPE *__interface; }; -#define construct_interface(MTYPE,ITYPE) struct ITYPE *_interface_##MTYPE##ITYPE(void *dummy, ...) { def_mem(_FACE,ITYPE); va_list(ap); _bind_##MTYPE##ITYPE(_FACE); return _FACE; } void _bind_##MTYPE##ITYPE(struct IFACE *_FACE) -#define bind_method(METHOD,FUNCTION) _FACE->METHOD=FUNCTION -#define new_interface(ID,MTYPE,...) struct _ARG1(__VA_ARGS__,) *ID=_interface_##MTYPE##_ARG1(__VA_ARGS__,) ((void *)__get_##TYPE##__VA_ARGS__,) -#define init_interface(TYPE,...) -#define construct_object(TYPE,...) (struct _ARG2(__VA_ARGS__,TYPE,) *)_object_##TYPE##_() -#define init_object(TYPE,...) (struct TYPE *)_object_##TYPE##_(__VA_ARGS__) -#define init_polymorph(TYPE,...) _object_##TYPE##_(__VA_ARGS__) -#define _(OBJECT,...) ( _ASSERT(OBJECT), (*( OBJECT->interface->_ARG1(__VA_ARGS__,) )) ( OBJECT,OBJECT->interface->__VA_ARGS__ ) ) -#define __(OBJECT,...) ( _ASSERT(OBJECT), (*( __cll1_seekmethod(OBJECT->interface,_ARG1(__VA_ARGS__,)) )) ( OBJECT,OBJECT->interface->__VA_ARGS__ ) ) -#define call(OBJTYPE,METHOD,...) { int _N=0; struct OBJTYPE *_OBJ; /* <-' */ while( (_OBJ=(struct OBJTYPE *)_cll1_for_ptrs(_N++,__VA_ARGS__,NIL))!=(struct OBJTYPE *)NIL ) _(_OBJ,METHOD); } +#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,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 _PRINT void _cll1_print(char *s,...) _CLL1_FPRINT(stdout) -#define _FPRINT void _cll1_fprint(FILE *f,char *s,...) _CLL1_FPRINT(f) +#define _DECLARE_PRINT void _cll1_print(const char *s,...) +#define _PRINT _DECLARE_PRINT _CLL1_FPRINT(stdout) +#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) #define _FECHO void _cll1_fecho(FILE *f,char *s,...) _CLL1_FECHO(f) -#define _CLL1_OUT _PRINT _FPRINT _ECHO _FECHO #define _FOR_INTS int _cll1_for_ints(int i, int n, ...) { int j=0;va_list ap; /* <-' */ va_start(ap,n); while(n!=WEIRDINT && j++NAME=(VALUE),_##NAME##atom->C=1,push(_##NAME##atom,_##NAME##stack);_##NAME##atom->C||(pop(_##NAME##atom,_##NAME##stack),0);_##NAME##atom->C--) #define _I (_Iatom->I) +#define _J (_Jatom->J) #define _S (_Satom->S) -#define _F (_Satom->F) +#define _F (_Fatom->F) #define _CTX (_CTXatom->CTX) +#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 _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); /* .----------------------------------------------------------------------. - / 11. C<<1 CGI and FASTCGI handling, updated 2008-01-16 by xCh. + / 11. C<<1 memory contexts - alternative to garbage collection + '----------------------------------------------------------------------- */ +typedef _CTXAtom * context; +#define create_context(ID) create_mem(ID,context) +/* .----------------------------------------------------------------------. + / 12. C<<1 CGI and FASTCGI handling, updated 2008-01-16 by xCh. '----------------------------------------------------------------------- */ #ifdef USE_LIBRARY_FASTCGI #define while_fastcgi_accept while(FCGI_Accept()>=0) @@ -227,13 +264,13 @@ #ifdef USE_MODULE_CGI #define cgi(MIME) { char *PTR; /* <-' */ recycle_context(_CGI); _CGIdict=NULL; for_split_str(PTR,getenv("QUERY_STRING"),'&') /* _init_cgi */ if(MIME) printf("Content-type: %s\r\n\r\n",MIME); } #define _GETCGI char *getcgi(VAR) { } -#define _CGI_GLOBALS def_context(_CGI); struct _CGIVariable { char *V; dictionary(_CGIVariable); } *_CGIvariable,*_CGIdict; +#define _CGI_GLOBALS def_context(_CGI); struct _CGIVariable { char *V; dict(_CGIVariable); } *_CGIvariable,*_CGIdict; #else #define _GETCGI #define _CGI_GLOBALS #endif /* .----------------------------------------------------------------------. - / 12. MySQL wrappers + SQL object interface, updated 2007-12-19 by xCh. + / 13. MySQL wrappers + SQL object interface, updated 2007-12-19 by xCh. '----------------------------------------------------------------------- */ #ifdef USE_LIBRARY_MYSQL #define def_sql(CONN) MYSQL *CONN @@ -259,6 +296,7 @@ //todo #define _SQL_OBJECT mem Sql { interface(SqlInterface); char *hostname; char *username; char *password; char *database; } //todo #define _SQL_CONSTRUCT def_construct(Sql) { self->hostname="localhost"; } //#endif + /* ------------------------------------------------------------------- */ /* old - from version 0.6 */ /* =================================================================== */ @@ -309,24 +347,27 @@ obsolete /* Useful structures, updated 2003-05-29 by xCh. */ //#define date(S) { time_t _T; _T=time(NULL); duplicate(ctime(&_T),S); } -/* ------------------------------------------------------------------- */ + /* some general ideas, unfinished */ //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) -/* =================================================================== */ + /* .----------------------------------------------------------------------. - / 99. We have have done our homework - now let's have some fun: + / 98. We have have done our homework - now let's have some fun: '----------------------------------------------------------------------- */ -#define _DEF_VARIABLES _CLL1_GLOBALS _CLL1_YES _CLL1_STACKS _SQL_GLOBALS _CGI_GLOBALS -#define _DEF_FUNCTIONS _MALLOC _CLL1_OUT _CLL1_ARGS _CLL1_STRS // _GET_MEM -#define _DEF_INTERFACE //_SQL_IFC _CAKE_IFC _STD_IFC _X_IFC -#define _IMPLEMENT_CLL1_LIBRARY _DEF_VARIABLES _DEF_FUNCTIONS _DEF_INTERFACE +#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_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) { LANG=setlocale(LC_ALL, ""); _PROGRAM(argc,argv); return 0; } _DECLARE_PROGRAM #ifdef USE_PREPROCESSOR #include "_include.c" #endif -#define program _IMPLEMENT_CLL1_LIBRARY int main(int argc, char **argv) -/* #ifndef _CLL1_H */ +/* .----------------------------------------------------------------------. + / 99. C<<1 is up and running. It's your turn now to show something new. + '----------------------------------------------------------------------- */ #endif