X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=a5c4c9d60dd8c00e77fb4270ed8bea2a5fda9779;hb=dfe0680a93f0d1fd2cd668f3facd6c803af318ea;hp=47e7024ad68dab47de88c825cf6575d69cc8f3b5;hpb=79c1af4ba4ce2faca03a60d9768873f494dd4c8b;p=svn%2FCll1h%2F.git

diff --git a/cll1.h b/cll1.h
index 47e7024..a5c4c9d 100644
--- a/cll1.h
+++ b/cll1.h
@@ -14,17 +14,20 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to 
-   Michael Polak, Svojsikova 7, 169 00 Praha 6 Czech Republic          */
-/* ------------------------------------------------------------------- */
-#ifndef __CLL1H__
-#define __CLL1H__
+   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
 
 #include <string.h>
 #include <malloc.h>
 #include <time.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <unistd.h>
 #ifdef USE_LIBRARY_MYSQL
 #include <mysql/mysql.h>
@@ -43,8 +46,23 @@
 #define or ||
 #define TRUE 1
 #define FALSE 0
+#define bool_str(I) (I?"TRUE":"FALSE")
+#define boolean int
+#define mem struct
+#define construct struct
+/* ------------------------------------------------------------------- */
+/* 2. C<<1 basic data types - updated 2008-01-07 by xCh.               */
 /* ------------------------------------------------------------------- */
-/* 2. C<<1 data types - updated 2008-01-07 by xCh.                     */
+#define Create_str(ID,INIT) char *ID=INIT
+#define Define_str(ID) char *ID=NULL
+#define Create_mem(ID,TYPE) struct TYPE *ID=get_mem(TYPE)
+#define Create_mem_in_context(ID,TYPE,CONTEXT) struct TYPE *ID=get_mem_in_context(TYPE,CONTEXT)
+#define Define_mem(ID,TYPE) struct TYPE *ID=NULL
+#define Define_mems(ID1,I2,TYPE) Define_mem(ID1,TYPE);Define_mem(ID2,TYPE)
+
+/* .... well....ehm...not very useful... :-) */
+#define Create_var(ID,TYPE,INIT) TYPE ID=INIT
+#define Define_var(ID,TYPE) TYPE ID
 /* ------------------------------------------------------------------- */
 #define list(T) struct T *_next
 #define tree(T) struct T *_next;struct T *_seek
@@ -55,50 +73,90 @@
 #define remove(A,B,C) { void **_D=NULL; for_search(A,B,C) { if(_D)*_D=A->_next; else B=A->_next; free(A); } else _D=(void *)&(A->_next); }
 #define drop(A,B) for( A=B; A || (B=NULL); B=A, A=A->_next, free(B) )
 /* ------------------------------------------------------------------- */
-/* 3. C<<1 iterators - updated 2008-01-07 by xCh.                      */
+/* 3. C<<1 general iterators - updated 2008-01-07 by xCh.              */
 /* ------------------------------------------------------------------- */
 #define loop while(TRUE)
-#define repeat(N) _NEW_I for_range(_I,1,N)
-#define for_range(VAR,FROM,TO) for(VAR=FROM; FROM<=TO?VAR<=TO:VAR>=TO; FROM<=TO?VAR++:VAR--)
+#define repeat(N) if(N>0) _NEW_I for_range(_I,1,N)
+#define for_range(VAR,FROM,TO) for( VAR=FROM ; FROM<=TO?VAR<=TO:VAR>=TO ; FROM<=TO?VAR++:VAR--)
 #define for_each(A,B) for(A=B; A; A=A->_next)
 #define for_search(A,B,C) for_each(A,B) if(C)
-/*to do: #define for_file_lines(STR,F) _NEW_F for() */
-#ifdef USE_LIBRARY_MYSQL
-#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))
-#endif
+#define for_file_lines(STR,F) /* _NEW_F for() */
+#define for_ints(VAR,...) _NEW_I while(_iterate_ints(&VAR,_I,__VA_LIST) )
+#define for_strs(VAR,...)  _NEW_S
+/* obsolete #define every(A,B) for( A=B; A; A=A->_next) */
+/* obsolete #define search(A,B,C) every(A,B) if(C) */
+/* obsolete #define find(A,B,C) search(A,B,C) break; if(A) */
+/* ------------------------------------------------------------------- */
+/* 4.C<<1 conditionals - updated 2008-01-07 by xCh.                    */ 
+/* ------------------------------------------------------------------- */
+#define if_exists(A,B,C) for_search(A,B,C) break; if(A)
+/* ------------------------------------------------------------------- */
+/* 5. C<<1 argument handling, updated 2008-01-16 by xCh.               */
+/* ------------------------------------------------------------------- */
+#define for_args _NEW_I for(_I=1;_I<argc;_I++)
+#define if_args if(argc>1)
+#define if_arg(VAL) if(eq(argv[_I],VAL))
+#define this_arg argv[_I]
+#define next_arg ((_I+1<argc)?argv[_I]:NULL)
+/* ------------------------------------------------------------------- */
+/* 6. C<<1 va_list based library functions, updated 2008-01-22 by xCh. */
+/* ------------------------------------------------------------------- */
+#define _ECHO void _cll1_print(int nl,char *s, ... ) { va_list ap; for(va_start(ap,s);s!=(void *)&_cll1_print;s=va_arg(ap,char *)) fputs(s?s:"",stdout); va_end(ap); if(nl) putchar('\n');}
+#define print(...) _cll1_print(1,__VA_ARGS__,(void *)&_cll1_print)
+#define echo(...) _cll1_print(0,__VA_ARGS__,(void *)&_cll1_print)
+/* ------------------------------------------------------------------- */
+/* 8. 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;
 #endif
-/*obsolete #define every(A,B) for( A=B; A; A=A->_next) */
-/*obsolete #define search(A,B,C) every(A,B) if(C) */
-/*obsolete #define find(A,B,C) search(A,B,C) break; if(A) */
-
 /* ------------------------------------------------------------------- */
-/* 4.C<<1 conditionals - updated 2008-01-07 by xCh.                    */ 
+/* 9. MySQL infrastructure and wrappers  -  updated 2007-12-19 by xCh. */
 /* ------------------------------------------------------------------- */
-#define if_exists(A,B,C) for_search(A,B,C) break; if(A)
-
+#ifdef USE_LIBRARY_MYSQL
+#define mysql_connect(S,U,P,D) (create(_Matom,_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;
+#else
+#define _MSTACK
+#define _RSTACK
+#endif
 /* ------------------------------------------------------------------- */
-/* old - from version 0.6 */
+/* old - from version 0.6                                              */
 /* ------------------------------------------------------------------- */
-/* EXP macros for Dummysort sequences, updated 2003-05-29 by xCh. */
 
+/* ------------------------------------------------------------------- */
+/* EXP macros for dummysort sequences, updated 2003-05-29 by xCh.      */
+/* ------------------------------------------------------------------- */
 #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)
-
-/* Dummysort sequences, updated 2003-05-29 by xCh. */
-
+/* ------------------------------------------------------------------- */
+/* Dummysort sequences, updated 2003-05-29 by xCh.                     */
+/* ------------------------------------------------------------------- */
 #define insert(A,B,EXP,K) { if(B) { void **_L=NULL, *H=B; for_search(B,H,EXP(B->K,A->K)) { if(_L) {*_L=A; A->_next=B; } else push(A,H); break; } else _L=(void *)&(B->_next); if(!B)*_L=A; B=H; } else push(A,B); }
 #define sort(A,B,EXP,K) { void *_C; A=B; B=NULL; do { _C=A->_next; A->_next=NULL; insert(A,B,EXP,K); A=_C; } while(_C); }
-
-/* String macros & sequences, updated 2004-04-19 by xCh. */
-
-#define eq(A,B) !strcmp(A,B)
+/* ------------------------------------------------------------------- */
+/* String macros & sequences, updated 2008-01-22               by xCh. */
+/* ------------------------------------------------------------------- */
+#define eq(A,B) (A && B && !strcmp(A,B))
+#define eqi(A,B) (A && B && !strcasecmp(A,B))
+/* Borland C legacy */
 #define strcmpi(A,B) strcasecmp(A,B)
+/* ------------------------------------------------------------------- */
+/*
+obsolete
 #define strlwr(A) {char *_S=A; while(_&&*_S){*_S=tolower(*_S);_S++;}}
 #define strupr(A) {char *_S=A; while(_&&*_S){*_S=toupper(*_S);_S++;}}
 #define string(S,L) (S=(char *)malloc(L),*S=0)
@@ -122,6 +180,7 @@
 #define stroption(STR) if(eq(STR,_K))
 #define match(KEY,VAL) {char *_K=KEY, *_V=VAL; FILE *_F=NULL; {{ 
 #define assign(STR,SETVAR) stroption(STR) SETVAR=_V
+*/
 /* ------------------------------------------------------------------- */
 /* Infrastructure, updated 2008-01-08 by xCh.                          */
 /* ------------------------------------------------------------------- */
@@ -129,28 +188,16 @@
 #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;
-#ifdef USE_LIBRARY_MYSQL
-#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;
-#else
-#define _MSTACK
-#define _RSTACK
-#endif
-#define program _ISTACK _SSTACK _FSTACK _MSTACK _RSTACK int main(int argc, char **argv)
+
 
 #define _NEW_(ATOM,STACK,TYPE) (create(ATOM,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_I for(create(_Iatom,_IStack),_Iatom->_23=1,push(_Iatom,_Istack);_Iatom->_23||pop(_Iatom,_Istack)&&0;_Iatom->_23--)
 #define _NEW_S for(create(_Satom,_SStack),_Satom->_23=1,push(_Satom,_Sstack);_Satom->_23||pop(_Satom,_Sstack)&&0;_Satom->_23--)
-#define _I _Iatom->I
-#define _S _Satom->I
-
-/* Section For Dummies part 2, updated 2004-05-07 by xCh. */
-
-#define arguments if(argc>1) for(_I=1;_I<argc;_I++) 
-#define argument(A) if(eq(argv[_I],A))
-#define thisargument(S) (S=argv[_I])
-#define nextargument(S) if(_I+1<argc && (S=argv[++_I]))
+#define _I (_Iatom->I)
+#define _S (_Satom->I)
+#define _F (_Satom->F)
+#define skip_one _I++
 
 /* I/O iterations, updated 2004-04-19 by xCh. */
 
@@ -192,11 +239,30 @@
 #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); }
 
-#ifdef USE_LIBRARY_MYSQL
 /* ------------------------------------------------------------------- */
-/* MySQL Infrastructure and basic macros -  updated 2007-12-19 by xCh. */
+/* Object infrastructure and basic macros - updated 2008-01-13 by xCh. */
+/* unfinished */ 
+#define bind_interface(TYPE) struct TYPE *__class
+#define method(NAME)
+#define define_interface(IFACE,TYPE) struct TYPE *__get_##_##IFACE(void) { struct TYPE *_FACE=get_mem(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)
+// must be function #define get_object(TYPE) (_CLL1_MALLOC(TYPE),CLL1_ASSERT(),)
+//#define _(OBJECT,FUNCTION) OBJECT==NULL?NULL::(*(OBJECT->__class->METHOD))(OBJECT
+
 /* ------------------------------------------------------------------- */
-#define mysql_connect(S,U,P,D) (create(_Matom,_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))
-#endif
+/* some general ideas, unfinished */
+//#define _CLL1_THROW(ERR)
+//#define _CLL1_TRY _NEW_E for(;;) if () {.... if(_Eatom->SYS) { if(_Eatom->RET) return; else break;} else { }
+//#define _ASSERT(EXPR) assert(EXPR)
+//#define _CLL1_MALLOC(TYPE) malloc(sizeof(TYPE))
 
+/* ------------------------------------------------------------------- */
+/* Voila - here we go !                                                */
+/* ------------------------------------------------------------------- */
+#define define_cll1_globals _ISTACK _SSTACK _FSTACK _MSTACK _RSTACK //_QSTACK
+#define implement_cll1_functions _ECHO /* _GET_STR _GET_MEM */
+#define implement_cll1_library define_cll1_globals implement_cll1_functions
+#define program implement_cll1_library int main(int argc, char **argv)
+/* ------------------------------------------------------------------- */
 #endif