nic

git-svn-id: https://dev.arachne.cz/repos/cll1h/trunk@85 4bb87942-c103-4e5a-b51c-0ebff58f8515

diff --git a/cll1.h b/cll1.h
index c49fa3c2a98997bb8a92bc28c0435d36310a0c6f..00756e3d5831a779fe786c767d995f4aea2cd60a 100644 (file)
--- a/cll1.h
+++ b/cll1.h
@@ -159,10 +159,10 @@ extern  unsigned RANDOM_SEED;
 #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)

diff --git a/demos/arguments1.c b/demos/arguments1.c
index 609dcdde359621aae8757c72304dbc232933f3b1..f92d90d1f068fd02100550d87cc122eb5c6e3fb6 100644 (file)
--- a/demos/arguments1.c
+++ b/demos/arguments1.c
@@ -4,7 +4,7 @@
 
 program
 {
- def_str(ptr);
+ str ptr;
  
  if_args then
  {