--- gforth/regexp-test.fs 2009/09/16 15:21:59 1.5 +++ gforth/regexp-test.fs 2010/09/05 19:09:55 1.12 @@ -1,6 +1,6 @@ \ regexp test -\ Copyright (C) 2005,2007 Free Software Foundation, Inc. +\ Copyright (C) 2005,2007,2009 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -118,4 +118,62 @@ s" fofoofoofofooofoobarbar" ?foos1 s" bla baz bar" ?foos1 s" foofoofoo" ?foos1 +\ buffer overrun test (bug in =") + + : ?long-string + (( // \( =" abcdefghi" \) )) + IF \1 type cr THEN ; + +here 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 + +\ simple replacement test + +." --- simple replacement test ---" cr + +: delnum ( addr u -- addr' u' ) s// \d ?end s" " //g ; +: test-delnum ( addr u addr' u' -- ) + 2swap delnum 2over 2over str= 0= IF + ." test-delnum: got '" type ." ', expected '" type ." '" + 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 ; +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 \) >> + \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 +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]