From 8db501a078e67a152fc186cbee4ab168170b844e Mon Sep 17 00:00:00 2001
From: xchaos <xchaos@4bb87942-c103-4e5a-b51c-0ebff58f8515>
Date: Sun, 27 Jan 2008 11:30:07 +0000
Subject: [PATCH] some work

git-svn-id: https://dev.arachne.cz/repos/cll1h/trunk@43 4bb87942-c103-4e5a-b51c-0ebff58f8515
---
 cll1.h | 88 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/cll1.h b/cll1.h
index 48066c5..120da95 100644
--- a/cll1.h
+++ b/cll1.h
@@ -72,7 +72,6 @@
 #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.
@@ -83,13 +82,14 @@
 #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_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);int __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.
@@ -104,7 +104,7 @@
 #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(A,B,C) for(prefix(A,B,C);A;(A!=B)&&prefix(A,B,C)||(A=NULL))
+#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)
@@ -148,9 +148,19 @@
 #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), _ARG2(__VA_ARGS__) - 0)
+#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)
@@ -161,50 +171,51 @@
 #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 _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 *M; int _23; list(_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 _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->I)
 #define _F (_Satom->F)
 #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) 
 /* .----------------------------------------------------------------------.
-  /  10. C<<1 CGI and FASTCGI handling, updated 2008-01-16 by xCh.  
+  /  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++;}}
@@ -252,19 +263,6 @@ obsolete
 /* Useful structures, updated 2003-05-29 by xCh. */
 
 //#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 
@@ -273,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
-- 
2.30.2