X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=a12fdfffae86f8a30fdcda710d6e6d7e812ac957;hb=b3674906486c6b6fd944b4c7ffd280589cf8a165;hp=c32debdf41c899e43b4aa8a2301090549fd4a979;hpb=f57259369784a5df46b75488d50e431ed1741235;p=svn%2FCll1h%2F.git

diff --git a/cll1.h b/cll1.h
index c32debd..a12fdff 100644
--- a/cll1.h
+++ b/cll1.h
@@ -1,6 +1,6 @@
-/* ,-----------------------------------------------------------------------
-  /  C<<1 header file - C language style sheet - GNU C/ANSI C99 compliant
- /  Cumbersome Extraction and Report Language - http://cll1h.arachne.cz/  /
+/* .----------------------------------------------------------------------.
+  /  C<<1 header file - C language style sheet - GNU C/ANSI C99 compliant 
+ /  Cumbersome Extraction and Report Language - http://cll1h.arachne.cz/ 
 '---------------------------------------------------------------------- */
 /*
    Copyright (c) 2004-2008 Michael xChaos Polak - x(at)n.cz
@@ -24,7 +24,7 @@
 #ifndef _CLL1_H
 #define _CLL1_H
 #define CLL1H_VERSION "0.7.1"
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  0. Library definitions not parsed by @CC, updated 2008-01-26 xCh.
  '---------------------------------------------------------------------- */
 /*
@@ -33,7 +33,7 @@
 @define USE_PREPROCESSOR cake *.html *.xml > _include.c
 @define USE_POSTPROCESSOR strip @
 */
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  1. C<<1 header auto include, updated 2008-01-26 xCh.
  '---------------------------------------------------------------------- */
 #include <string.h>
@@ -50,17 +50,17 @@
 #else
 #include <stdio.h>
 #endif
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  2. C<<1 then buddhist section, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
 #ifndef DISABLE_MODULE_THEN_BUDDHISM 
 #define then
 #define MAYBE (int)((RANDOM_SEED?random():(RANDOM_SEED=time(NULL),srandom(RANDOM_SEED),random()))%2)
 #define WHOKNOWS (int)(srandom(time(NULL)),random()%2)
-#define Create_var(ID,TYPE,INIT) TYPE ID=INIT
-#define Define_var(ID,TYPE) TYPE ID
+#define create_var(ID,TYPE,INIT) TYPE ID=INIT
+#define define_var(ID,TYPE) TYPE ID
 #endif
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  3. C<<1 constants and optional keywords, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
 #define not !
@@ -72,26 +72,26 @@
 #define FALSE 0
 #define coalesce(VAR,NOTNULL) (VAR?VAR:(NOTNULL))
 #define mem struct
-#define construct struct
 #define _GLOBALS time_t RANDOM_SEED=0; char *EOL="\n", *OFS=" ", *IFS=" \t\n", *NIL="NULL";
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  4. C<<1 data declaration and allocation, updated 2008-01-07 xCh.
  '----------------------------------------------------------------------- */
-#define Create_str(ID,INIT) char *ID=INIT
-#define Define_str(ID) char *ID=NULL
-#define Create_mem(ID,...) struct _ARG1(__VA_ARGS__,) *ID=get_mem(__VA_ARGS__)
-#define Define_mem(ID,TYPE) struct TYPE *ID=NULL
-#define Define_mems(ID1,ID2,TYPE) Define_mem(ID1,TYPE); Define_mem(ID2,TYPE)
-#define Create_list(ID1,I2,TYPE) Create_mem(ID1,TYPE); struct TYPE *ID2=((ID1->__next=NULL),ID1)
-#define Define_var(ID,TYPE) TYPE ID
+#define create_str(ID,INIT) char *ID=INIT
+#define define_str(ID) char *ID=NULL
+#define create_mem(ID,...) struct _ARG1(__VA_ARGS__,) *ID=get_mem(__VA_ARGS__)
+#define define_mem(ID,TYPE) struct TYPE *ID=NULL
+#define define_mems(ID1,ID2,TYPE) define_mem(ID1,TYPE); define_mem(ID2,TYPE)
+#define create_list(ID1,I2,TYPE) create_mem(ID1,TYPE); struct TYPE *ID2=((ID1->__next=NULL),ID1)
+#define create_context(ID) create_mem(ID,_MAtom)
+#define define_context(ID) define_mem(ID,_MAtom)
 #define list(TYPE) struct TYPE *__next
-#define tree(TYPE) struct TYPE *__next;struct TYPE *__seek
-#define dictionary(TYPE) tree(TYPE);char *__key
-#define array(TYPE) tree(TYPE);char *__key
+#define tree(TYPE) struct TYPE *__next; struct TYPE *__seek
+#define dictionary(TYPE) tree(TYPE); char *__key
+#define array(TYPE) tree(TYPE); int __key
 #define interface(TYPE) struct TYPE *__interface
-#define get_mem(...) (struct _ARG1(__VA_ARGS__,)*)_cll1_malloc(sizeof(struct _ARG1(__VA_ARGS__,)),NULL)
+#define get_mem(...) (struct _ARG1(__VA_ARGS__,)*)_cll1_malloc(sizeof(struct _ARG1(__VA_ARGS__,)), _ARG2(__VA_ARGS__,,) - 0 )
 #define get_str(...) (char *)_cll1_get_str(__VA_ARGS__,(void *)&_cll1_get_str)
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  5. C<<1 string manipulation, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
 #define eq(A,B) !strcmp(A,B)
@@ -102,25 +102,34 @@
 #define echo(...) _cll1_echo(__VA_ARGS__,(void *)&_cll1_echo)
 #define fecho(...) _cll1_fecho(__VA_ARGS__,(void *)&_cll1_fecho)
 #define file_echo(...) _cll1_fecho(_F,__VA_ARGS__,(void *)&_cll1_fecho)
-/* ,-----------------------------------------------------------------------
+#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 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)
+#define switch_for_columns(A,B,C) _FOR_COLUMNS(A,B,C) switch(__I)
+#define switch_for_valid_columns(A,B,C) _FOR_VALID_COLUMNS(A,B,C) switch (_I)
+#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)
+#define tr(STR,B,C) {char *_S=STR; /***/ while(S && *_S) {if(*_S==B)*_S=C; _S++;} }
+/* .----------------------------------------------------------------------.
   /  6. C<<1 data container manipulation, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
-#define push(NODE,HEAD) ((NODE && NODE!=HEAD)?((NODE->__next=HEAD),(HEAD=NODE)):(HEAD=NODE))
-#define pop(NODE,HEAD) (HEAD?((NODE=HEAD->__next),free(HEAD),(HEAD=NODE)):(NODE=NULL))
-#define append(NODE,HEAD) if(HEAD) { void *N=NODE; /**/ NODE->__next=NULL; for_search(NODE,HEAD,!NODE->__next) {NODE->__next=N; break;} else push(NODE,HEAD); }
+#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 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
+//to do: seek
+//to do: store
 #define order_by(K1,K2) (K1>K2)
 #define desc_order_by(K1,K2) (K1<K2)
 #define sort_by(K1,K2) (strcasecmp(K1, K2)>0)
 #define desc_sort_by(K1,K2) (strcasecmp(K1, K2)<0)
 #define ascii_by(K1,K2) (strcmp(K1, K2)>0)
 #define desc_ascii_by(K1,K2) (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)->__next=NULL; }
+#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); }
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  7. C<<1 builtin iterators and conditionals, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
 #define loop while(TRUE)
@@ -138,10 +147,19 @@
 #define this_arg argv[_I]
 #define next_arg ((_I+1<argc)?argv[_I]:NULL)
 #define skip_next _I++
-/* ,-----------------------------------------------------------------------
-  /  8. C<<1 va_list based library functions, updated 2008-01-26 xCh.
+/* .----------------------------------------------------------------------.
+  /  8. C<<1 object oriented infrastructure, updated 2008-01-26
+ '----------------------------------------------------------------------- */
+#define define_metaobject(METATYPE,ITYPE) struct METATYPE { struct ITYPE *__interface; };
+#define define_interface(MTYPE,ITYPE) struct ITYPE *_construct_##_##MTYPE##_##ITYPE(void *dummy, ...) { define_mem(_FACE,IFACE); va_list(ap); _FACE=get_mem(IFACE) _bind_##_##MTYPE##_##ITYPE(_FACE); return _FACE; } void _bind_##_##MTYPE##_##ITYPE(struct IFACE *_FACE)
+#define bind_method(METHOD,FUNCTION) _FACE->METHOD=FUNCTION
+#define construct_interface(MTYPE,...) _construct_##_##MTYPE##_##_ARG1(__VA_ARGS__)((void *)__get_##_##MTYPE##_##__VA_ARGS__)
+#define get_object(TYPE,...) (struct TYPE *)_cll1_allocate_object(sizeof(struct TYPE), __VA_ARGS__)
+#define construct_object(TYPE,...)
+//#define _(OBJECT,...) (_ASSERT(OBJECT),/**/(*(OBJECT->interface->_ARG1(__VA_ARGS__,)))/**/(OBJECT,OBJECT->interface->__VA_ARGS__)/**/)
+/* .----------------------------------------------------------------------.
+  /  9. implementation of C<<1 library functions, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
-#define _ARG1(ARG1,...) ARG1
 #define _MALLOC void *_cll1_malloc(size_t size,...) { /*temporary solution*/ return malloc(size); }
 #define _CLL1_FPRINT(IOSTREAM,LASTARG) { int p2=0;char *ofs=coalesce(OFS,"\0");va_list ap; /**/ for(va_start(ap,s);s!=LASTARG;s=va_arg(ap,char *)) { if(p2 && *ofs) fputs(ofs,IOSTREAM); else p2=1; fputs(coalesce(s,NIL),IOSTREAM); } va_end(ap); if(EOL && *EOL) fputs(EOL,IOSTREAM); }
 #define _PRINT void _cll1_print(char *s,...) _CLL1_FPRINT(stdout,(void *)&_cll1_print)
@@ -151,49 +169,53 @@
 #define _FECHO void _cll1_fecho(FILE *f,char *s,...) _CLL1_FECHO(f,(void *)&_cll1_fecho)
 #define _IT_INTS int _cll1_it_ints(int i, int n, ...) { int j=0;va_list ap; /**/ va_start(ap,n); while(n>=0 && j++<i) n=va_arg(ap,int); return n; }
 #define _IT_STRS char *_cll1_it_strs(int i, char *s, ...) { int j=0;va_list ap; /**/ va_start(ap,s); while(s!=(void *)&_cll1_it_strs && j++<i) s=va_arg(ap,char *); return s; }
-/* ,-----------------------------------------------------------------------
-  /  9. C<<1 hidden stack infrastructure, updated 2008-01-26 by xCh.
+/* .----------------------------------------------------------------------.
+  /  10. C<<1 globals and private macros, updated 2008-01-27 by xCh.
  '----------------------------------------------------------------------- */
-#define _ISTACK struct _IStack { int I; int _23; list(_IStack); } *_Iatom,*_Istack=NULL;
-#define _SSTACK struct _SStack { char *S; int _23; list(_SSTACK); } *_Satom,*_Sstack=NULL;
-#define _FSTACK struct _FStack { FILE *F; int _23; list(_FSTACK); } *_Fatom,*_Fstack=NULL;
+#define _ARG1(ARG1,...) ARG1
+#define _ARG2(ARG1,ARG2,...) ARG2
+#define _ISTACK struct _IAtom { int i; int _23; list(_IAtom); } *_Iatom,*_Istack=NULL;
+#define _SSTACK struct _SAtom { char *s; int _23; list(_SAtom); } *_Satom,*_Sstack=NULL;
+#define _FSTACK struct _FAtom { FILE *F; int _23; list(_FAtom); } *_Fatom,*_Fstack=NULL;
+#define _MSTACK struct _MAtom { void *ptr; size_t size; int _23; tree(_MAtom); } *_Matom,*_Mstack=NULL;
 #define _NEW_(ATOM,STACK,TYPE) (ATOM=get_mem(TYPE),ATOM->_23=1,push(ATOM,STACK);ATOM->_23||pop(ATOM,STACK)&&0;ATOM->_23--)
-#define _NEW_I for _NEW_(_Iatom,_Istack,_IStack)
-#define _NEW_S for _NEW_(_Satom,_Sstack,_SStack)
-#define _NEW_F for _NEW_(_Fatom,_Fstack,_FStack)
-#define _I (_Iatom->I)
-#define _S (_Satom->I)
+#define _NEW_I for _NEW_(_Iatom,_Istack,_IAtom)
+#define _NEW_S for _NEW_(_Satom,_Sstack,_SAtom)
+#define _NEW_F for _NEW_(_Fatom,_Fstack,_FAtom)
+#define _I (_Iatom->i)
+#define _S (_Satom->s)
 #define _F (_Satom->F)
-/* ,-----------------------------------------------------------------------
-  /  10. C<<1 CGI and FASTCGI handling, updated 2008-01-16 by xCh.  
+#define _FOR_COLUMNS(A,B,C) _NEW_I for(_I=0,prefix(A,B,C);A;((A!=B)&&prefix(A,B,C)||(A=NULL)),_I++) 
+#define _FOR_VALID_COLUMNS(A,B,C) _NEW_I for(_I=0,prefix(A,B,C);A;((A!=B)&&prefix(A,B,C))||(A=NULL)) if(*A&&++_I) 
+/* .----------------------------------------------------------------------.
+  /  11. C<<1 CGI and FASTCGI handling, updated 2008-01-16 by xCh.  
  '----------------------------------------------------------------------- */
 #ifdef USE_LIBRARY_FASTCGI
 #define while_fastcgi_accept while(FCGI_Accept()>=0)
 #define USE_MODULE_CGI
 #endif
 #ifdef USE_MODULE_CGI
-#define cgi(MIME) /* _init_cgi */ if(MIME) printf("Content-type: %s\r\n\r\n",MIME);
-//todo getcgi(VAR)
-//todo define_init_cgi
-//todo #define _QSTACK struct _QStack { char *Q; int _23; list(_QStack); } *_Qatom,*_Qstack=NULL;
+#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); }
+//todo #define _GETCGI char *getcgi(VAR) {     }
+#define _CGIDICT define_context(_CGI); struct _CGIVariable { char *V; dictionary(_CGIVariable); } *_CGIvariable,*_CGIdict;
+#else
+#define _CGIDICT
 #endif
-/* ,-----------------------------------------------------------------------
-  /  11. MySQL infrastructure and wrappers  -  updated 2007-12-19 by xCh.
+/* .----------------------------------------------------------------------.
+  /  12. MySQL infrastructure and wrappers  -  updated 2007-12-19 by xCh.
  '----------------------------------------------------------------------- */
 #ifdef USE_LIBRARY_MYSQL
-#define mysql_connect(S,U,P,D) ((_Matom=get_mem(_MStack)) && push(_Matom,_Mstack) && (_Matom->M=mysql_init(NULL)),(_Matom->M && mysql_real_connect(_Matom->M,S,U,P,D,0,NULL,0)?_Matom->M:NULL))
-#define for_mysql_query_results(ROW,QUERY) _NEW_(_Ratom,_Rstack,_RStack)for(_Ratom->R=(mysql_query(_Matom->M,QUERY)?NULL:mysql_use_result(_Matom->M)),ROW=(_Ratom->R?mysql_fetch_row(_Ratom->R):NULL);ROW;ROW=mysql_fetch_row(_Ratom->R))
-#define _MSTACK struct _MStack { MYSQL *M; int _23; list(_MStack); } *_Matom,*_Mstack=NULL;
-#define _RSTACK struct _RStack { MYSQL_RES *R; int _23; list(_RStack); } *_Ratom,*_Rstack=NULL;
+#define mysql_connect(S,U,P,D) ((_SQLCatom=get_mem(_SQLCAtom)) && push(_SQLCatom,_SQLCstack) && (_SQLCatom->C=mysql_init(NULL)),(_SQLCatom->C && mysql_real_connect(_SQLCatom->C,S,U,P,D,0,NULL,0)?_SQLCatom->C:NULL))
+#define for_mysql_query_results(ROW,QUERY) _NEW_(_SQLRatom,_SQLRstack,_SQLRAtom)for(_SQLRatom->R=(mysql_query(_SQLCatom->C,QUERY)?NULL:mysql_use_result(_SQLCatom->C)),ROW=(_SQLRatom->R?mysql_fetch_row(_SQLRatom->R):NULL);ROW;ROW=mysql_fetch_row(_SQLRatom->R))
+#define _SQLCSTACK struct _SQLCAtom { MYSQL *C; int _23; list(_SQLCAtom); } *_SQLCatom,*_SQLCstack=NULL;
+#define _SQLRSTACK struct _SQLRAtom { MYSQL_RES *R; int _23; list(_SQLRAtom); } *_SQLRatom,*_SQLRstack=NULL;
 #else
-#define _MSTACK
-#define _RSTACK
+#define _SQLCSTACK
+#define _SQLRSTACK
 #endif
-
 /* ------------------------------------------------------------------- */
 /* old - from version 0.6                                              */
 /* =================================================================== */
-
 /*
 obsolete
 #define strlwr(A) {char *_S=A; while(_&&*_S){*_S=tolower(*_S);_S++;}}
@@ -201,8 +223,6 @@ obsolete
 #define string(S,L) (S=(char *)malloc(L),*S=0)
 #define duplicate(A,B) if(A) { string(B,strlen(A)+1); strcpy(B,A); }
 #define concatenate(A,B,C) if (A && B) { string(C,strlen(A)+strlen(B)+1); strcpy(C,A); strcat(C,B); }
-#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 gotoalpha(CHAR) if(CHAR)while(*CHAR && !isalpha(*CHAR))CHAR++
 #define goto_alpha(CHAR) if(CHAR)while(*CHAR && !isalpha(*CHAR) && *CHAR!='_')CHAR++
 #define gotoalnum(CHAR) if(CHAR)while(*CHAR && !isalnum(*CHAR))CHAR++
@@ -214,7 +234,6 @@ obsolete
 #define skipspaces(CHAR) if(CHAR)while(*CHAR==' ')CHAR++
 #define cutspaces(CHAR) if(CHAR){int _L=strlen(CHAR); while(--_L>0 && CHAR[_L]==' ')CHAR[_L]=0;}
 #define gotochr(CHAR,C) if(CHAR)while(*CHAR && *CHAR!=C)CHAR++
-#define tr(CHAR,B,C) {char *_S=CHAR; while(*_S){ if(*_S==B)*_S=C; _S++; }}
 #define strswitch(CHAR) {char *_K=CHAR; FILE *_F=NULL; {{ 
 #define stroption(STR) if(eq(STR,_K))
 #define match(KEY,VAL) {char *_K=KEY, *_V=VAL; FILE *_F=NULL; {{ 
@@ -230,15 +249,10 @@ obsolete
 //#define parse(F) {char *_; FILE *_F=fopen(F,"r"); if(_F) { while(!feof(_F)) { fstring(_,_F);  
 //#define fail }} else {{
 //#define done }} if(_F)fclose(_F);}
-#define option(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=_V; _=NULL;} else free(_Q);}
-#define ioption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=atoi(_V); _=NULL;} free(_Q);}
-#define loption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#');  cutspaces(_V); SETVAR=atol(_V); _=NULL;} free(_Q);}
-
-/* Dynamic list advanced I/O, updated 2003-05-30 by xCh. */
+//to do #define option(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=_V; _=NULL;} else free(_Q);}
+//to do #define ioption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#'); cutspaces(_V); SETVAR=atoi(_V); _=NULL;} free(_Q);}
+//to do #define loption(STR,SETVAR) if(_){char *_K,*_V,*_O,*_Q; duplicate(_,_Q); _O=_Q; tr(_O,'\t',' '); prefix(_K,_O,' '); if(eq(STR,_K)) {skipspaces(_O); prefix(_V,_O,'#');  cutspaces(_V); SETVAR=atol(_V); _=NULL;} free(_Q);}
 
-/* obsolete #define load(A,B,F,T,K) {char *_S; parses(_S,F) { create(A,T); A->K=_S; A->_eoln=TRUE; append(A,B);} done; A->_eoln=FALSE;} */
-/* obsolete #define save(A,B,F,K) {FILE *_F=fopen(F,"w"); if(_F) { for_each(A,B) {fputs(A->K,_F); if(A->_eoln) fputc('\n',_F);} fclose(_F);}} */
-     
 /* I/O sequences, updated 2003-05-29 by xCh. */
 
 #define nullreopen(F) F=freopen("/dev/null","r",F)
@@ -246,33 +260,9 @@ obsolete
 #define shell(CMD) stdinredir(system(CMD))
 #define paste(STR) stdinredir(fputs(STR,stdout))
 
-/* String iterations, updated 2003-06-19 by xCh. */
-
-#define split(A,B,C) for(prefix(A,B,C);A;(A!=B)&&prefix(A,B,C)||(A=NULL))
-#define valid_split(A,B,C) split(A,B,C) if(*A)
-#define columns(A,B,C,V) for(V=0,prefix(A,B,C);A;((A!=B)&&prefix(A,B,C)||(A=NULL)),V++)
-#define valid_columns(A,B,C,V) for(V=0,prefix(A,B,C);A;((A!=B)&&prefix(A,B,C))||(A=NULL)) if(*A&&++V)
-#define column(A,B,C,V) { int _V; columns(A,B,C,_V) if(_V==V) break; }
-#define valid_column(A,B,C,V) { int _V; valid_columns(A,B,C,_V) if(_V==V) break; }
-
 /* Useful structures, updated 2003-05-29 by xCh. */
 
-//#define hashtable(TYPE,NAME,VALUE) struct TYPE { char *NAME; char *VALUE; list(TYPE); }
-//#define textfile(TYPE,LINE) struct TYPE { char *LINE; char _eoln; list(TYPE); }
 //#define date(S) { time_t _T; _T=time(NULL); duplicate(ctime(&_T),S); }
-
-/* ------------------------------------------------------------------- */
-/* Object infrastructure and basic macros - updated 2008-01-13 by xCh. */
-/* unfinished */ 
-
-#define method(NAME)
-#define define_interface(IFACE,TYPE) struct TYPE *__get_##_##IFACE(void) { Create_mem(_FACE,TYPE); __bind_##_##IFACE(_FACE); return _IFC; } void __bind_##_##IFACE(struct TYPE *_FACE)
-#define bind_method(METHOD,FUNCTION) _IFACE->METHOD=FUNCTION
-#define get_interface(IFACE) __get_##_##IFACE(void)
-//get_dynamic_interface
-//#define get_object(TYPE)
-//#define _(OBJECT,...) (assert(OBJECT),/**/(*(OBJECT->interface->_ARG1(__VA_ARGS__,)))/**/(OBJECT,OBJECT->interface->__VA_ARGS__)/**/)
-
 /* ------------------------------------------------------------------- */
 /* some general ideas, unfinished */
 //bind_exception, unbind_exception 
@@ -281,12 +271,10 @@ obsolete
 //#define _ASSERT(EXPR) assert(EXPR)
 /* =================================================================== */
 
-
-
-/* ,-----------------------------------------------------------------------
+/* .----------------------------------------------------------------------.
   /  99. We have have done our homework - now let's have some fun:          
  '----------------------------------------------------------------------- */
-#define _DEF_VARIABLES _GLOBALS _ISTACK _SSTACK _FSTACK _MSTACK _RSTACK //_QSTACK
+#define _DEF_VARIABLES _GLOBALS _ISTACK _SSTACK _FSTACK _MSTACK //_SQLCSTACK _SQLRSTACK _CGIDICT
 #define _DEF_FUNCTIONS _MALLOC _ECHO _PRINT _FECHO _FPRINT _IT_INTS _IT_STRS // _GET_STR _GET_MEM
 #define _DEF_INTERFACE //_CAKE _STD _X
 #define implement_cll1_library _DEF_VARIABLES _DEF_FUNCTIONS _DEF_INTERFACE