--- gforth/regexp-test.fs	2010/09/04 22:27:22	1.11
+++ gforth/regexp-test.fs	2010/09/12 17:10:04	1.15
@@ -118,8 +118,16 @@ s" fofoofoofofooofoobarbar" ?foos1
 s" bla baz bar" ?foos1
 s" foofoofoo" ?foos1
 
+\ backtracking on decissions
+
+: ?aab ( addr u -- flag )
+   (( {{ =" aa" || =" a" }} {{ =" ab" || =" a" }} )) ;
+s" aab" ?aab 0= [IF] .( aab failed!) cr [THEN]
+
 \ buffer overrun test (bug in =")
 
+." --- buffer overrun test ---" cr
+
  : ?long-string
     (( // \( =" abcdefghi" \) ))
     IF  \1 type  cr THEN ;
@@ -135,32 +143,45 @@ here 4096 allocate throw 4096 + 8 - cons
  
 ." --- simple replacement test ---" cr
 
-: delnum  ( addr u -- addr' u' )   s// \d s" " //g ;
+: delnum  ( addr u -- addr' u' )   s// \d >> s" " //g ;
 : test-delnum  ( addr u addr' u' -- )
    2swap delnum 2over 2over str= 0= IF
       ." test-delnum: got '" type ." ', expected '" type ." '"
-   ELSE  2drop 2drop  THEN ;
+   ELSE  2drop 2drop ." passed" cr  THEN ;
 s" 0"  s" " test-delnum
 s" 00"  s" " test-delnum
 s" 0a"  s" a" test-delnum
 s" a0"  s" a" test-delnum
 s" aa"  s" aa" test-delnum
 
-: delcomment  ( addr u -- addr' u' )  s// ` # {** .? **}  s" " //g ;
+: delcomment  ( addr u -- addr' u' )  s// ` # {** .? **} >> s" " //g ;
 s" hello # test " delcomment type cr
+: delparents  ( addr u -- addr' u' )  s// ` ( {* .? *} ` ) >> s" ()" //g ;
+s" delete (test) and (another test) " delparents type cr
 
 \ replacement tests
 
 ." --- replacement tests ---" cr
 
 : hms>s ( addr u -- addr' u' )
-  s// \( \d \d \) ` : \( \d \d \) ` : \( \d \d \)
+  s// \( \d \d \) ` : \( \d \d \) ` : \( \d \d \) >>
   \1 s>number drop 60 *
   \2 s>number drop + 60 *
   \3 s>number drop + 0 <# 's' hold #s #> //g ;
 
 s" bla 12:34:56 fasel 00:01:57 blubber" 2dup type hms>s
-."  replaced by " 2dup type
+."  -> " 2dup type
 s" bla 45296s fasel 117s blubber" str= [IF] .(  ok) [ELSE] .(  failed) [THEN] cr
 
+: hms>s,del() ( addr u -- addr' u' )
+  s// {{ \( \d \d \) ` : \( \d \d \) ` : \( \d \d \)
+         >> \1 s>number drop 60 *
+            \2 s>number drop + 60 *
+            \3 s>number drop + 0 <# 's' hold #s #> <<
+         || ` ( // ` ) >> <<" "
+      }} LEAVE //s ;
+
+\ doesn't work yet
+\ s" (bla) 12:34:56 (fasel) 00:01:57 (blubber)" 2dup type hms>s,del() space type cr
+
 script? [IF] bye [THEN]