/* .----------------------------------------------------------------------.
/ 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
/ 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++<N)
-#define for_range(VAR,FROM,TO) for( VAR=FROM ; FROM<=TO?VAR<=TO:VAR>=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 */
/* .----------------------------------------------------------------------.
/ 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)
'----------------------------------------------------------------------- */
/* 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)
/ 10. C<<1 private infrastructure, updated 2008-02-03 by xCh.
'----------------------------------------------------------------------- */
#define _I (_Iatom->I)
+#define _J (_Jatom->J)
#define _S (_Satom->S)
#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 _GET_MEM(TYPE) ((TYPE)malloc(sizeof(struct _##TYPE##_struct))) /* later... ((TYPE)_cll1_malloc(sizeof(struct _##TYPE##_struct))) */
#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(S) _ANYSTACK(F) _ANYSTACK(CTX)
+#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);