X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=cll1.h;h=48aa0a1d98c8b5e26f18764570592030785fc346;hb=7e4d757514e0d9904d6b31b5a08760eff306a9f2;hp=c49fa3c2a98997bb8a92bc28c0435d36310a0c6f;hpb=eeff2724ab61172d037fbba78785a25d691b6ad1;p=svn%2FCll1h%2F.git

diff --git a/cll1.h b/cll1.h
index c49fa3c..48aa0a1 100644
--- a/cll1.h
+++ b/cll1.h
@@ -93,11 +93,12 @@ extern  unsigned RANDOM_SEED;
 /* .----------------------------------------------------------------------.
   /  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
@@ -151,18 +152,18 @@ extern  unsigned RANDOM_SEED;
   /  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 */
 #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++<argc)
+#define for_args(STR) _NEW(I,1) while(_I++<argc)
 #define this_arg argv[_I]
 #define next_arg ((_I+1<argc)?argv[_I]:NULL)
-#define skip_next _I++
+#define continue_args _I++
 #define if_exists(NODE,HEAD,EXPR) for_search(NODE,HEAD,EXPR) break; if(NODE)
 #define if_args if(argc>1)
 #define switch_for_args for_args switch_str(this_arg)
@@ -178,8 +179,8 @@ extern  unsigned RANDOM_SEED;
 /* .----------------------------------------------------------------------.
   /  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)
@@ -196,13 +197,23 @@ extern  unsigned RANDOM_SEED;
 #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.
+  /  9. C<<1 setjmp()/longjmp() based exceptions, updated 2008-09-30
+ '----------------------------------------------------------------------- */
+#include <setjmp.h>
+#define try if(!(_exception_type=setjmp(_exception_env)))
+#define fail(E) longjmp(_exception_env, (E))
+#define else_switch_exceptions else switch(_exception_type)
+#define else_catch_exception(E) else if (_exception_type==(E))
+static jmp_buf _exception_env;
+static int _exception_type;
+/* .----------------------------------------------------------------------.
+  /  10. implementation of C<<1 library functions, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
 /* 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)
@@ -231,19 +242,21 @@ extern  _DECLARE_STRSTR;
   /  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);