--- gforth/regexp-test.fs	2010/09/04 22:27:22	1.11
+++ gforth/regexp-test.fs	2010/12/27 22:39:38	1.21
@@ -17,6 +17,8 @@
 \ You should have received a copy of the GNU General Public License
 \ along with this program. If not, see http://www.gnu.org/licenses/.
 
+: ?depth  depth IF  ." unbalanced: " .s clearstack cr  THEN ;
+
 charclass [bl-]   blanks +class '-' +char
 charclass [0-9(]  '(' +char '0' '9' ..char
 
@@ -29,8 +31,8 @@ charclass [0-9(]  '(' +char '0' '9' ..ch
     IF  '(' emit \1 type ." ) " \2 type '-' emit \3 type ."  succeeded"
     ELSE \0 type ."  failed " THEN ;
 
-: ?tel-s ( addr u -- ) ?tel ."  should succeed" space depth . cr ;
-: ?tel-f ( addr u -- ) ?tel ."  should fail" space depth . cr ;
+: ?tel-s ( addr u -- ) ?tel ."  should succeed" space cr ?depth ;
+: ?tel-f ( addr u -- ) ?tel ."  should fail" space cr ?depth ;
 
 ." --- Telephone number match ---" cr
 s" (123) 456-7890" ?tel-s
@@ -48,7 +50,7 @@ s" 123 456-78909" ?tel-f
 
 : ?tel2 ( addr u -- ) telnum2
     IF   '(' emit \1 type ." ) " \2 type '-' emit \3 type ."  succeeded"
-    ELSE \0 type ."  failed " THEN  cr ;
+    ELSE \0 type ."  failed " THEN  cr ?depth ;
 ." --- Telephone number search ---" cr
 s" blabla (123) 456-7890" ?tel2
 s" blabla (123) 456-7890 " ?tel2
@@ -69,7 +71,7 @@ charclass [0-9,./:]  '0' '9' ..char ','
 
 : ?num
     (( // \( {++ [0-9,./:] c? ++} \) ))
-    IF  \1 type  ELSE  \0 type ."  failed"  THEN   cr ;
+    IF  \1 type  ELSE  \0 type ."  failed"  THEN   cr ?depth ;
 
 s" 1234" ?num
 s" 12,345abc" ?num
@@ -90,15 +92,15 @@ s" Hier kommt nichts vor" ?string
 
 : ?foos
     (( \( {** =" foo" **} \) ))
-    IF  \1 type  ELSE  \0 type ."  failed"  THEN  cr ;
+    IF  \1 type  ELSE  \0 type ."  failed"  THEN  cr ?depth ;
 
 : ?foobars
     (( // \( {** =" foo" **} \) \( {++ =" bar" ++} \) ))
-    IF  \1 type ',' emit \2 type  ELSE  \0 type ."  failed"  THEN  cr ;
+    IF  \1 type ',' emit \2 type  ELSE  \0 type ."  failed"  THEN  cr ?depth ;
 
 : ?foos1
     (( // \( {+ =" foo" +} \) \( {++ =" bar" ++} \) ))
-    IF  \1 type ',' emit \2 type  ELSE  \0 type ."  failed"  THEN  cr ;
+    IF  \1 type ',' emit \2 type  ELSE  \0 type ."  failed"  THEN  cr ?depth ;
 
 s" foobar" ?foos
 s" foofoofoobar" ?foos
@@ -118,49 +120,108 @@ 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 ;
 
-here 4096 allocate throw 4096 + 8 - constant test-string
+4096 allocate throw 4096 + 8 - constant test-string
  s" abcdefgh" test-string swap cmove>
  .( provoking overflow [i.e. see valgrind output]) cr
  test-string . cr
  test-string 8 ?long-string
-.( done) cr
+.( done) cr ?depth
 
 \ simple replacement test
  
 ." --- 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 ." test-delnum passed" cr  THEN  ?depth ;
 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
+?depth
 
 \ 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
+?depth
+
+: 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 ;
+
+s" (bla) 12:34:56 (fasel) 00:01:57 (blubber)" 2dup type hms>s,del() ."  -> " type cr
+
+\ more tests from David Kühling
+
+require test/ttester.fs
+
+: underflow1  ( c-addr u -- flag )
+   (( {{
+         {{ ` - || }} \d
+         || \d
+      }} )) ;
+T{ s" -1dummy" underflow1 -> true }T
+
+: underflow2  ( -- )
+   (( \( {{ \s {** \s **} 
+	 || =" /*" // =" */"
+	 || =" //" {** \d **} }} \) )) ;
+T{ s" /*10203030203030404*/   " underflow2 -> true }T
+T{ pad 0 underflow2 -> false }T
+
+charclass [*] '* +char
+charclass [*/] '* +char '/ +char
+
+: underflow3  ( -- )
+   ((
+      =" /*"
+      \( {** {{ [*] -c? || ` * [*/] -c? }}  **} \)
+      {++ ` * ++} ` /
+   )) ;
+
+\ this still seems to be too complicated
+T{ s" /*10203030203030404*/   " underflow3 -> true }T
+\1 type cr
+
+: underflow4  ( -- )
+   (( \( {{ {** \d **} || {** \d **} }} \d \) )) ;
+
+T{ s" 0  " underflow4 -> true }T
 
 script? [IF] bye [THEN]