--- gforth/regexp-test.fs 2007/12/31 19:02:24 1.4 +++ gforth/regexp-test.fs 2010/09/12 22:14:12 1.18 @@ -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. @@ -17,8 +17,10 @@ \ You should have received a copy of the GNU General Public License \ along with this program. If not, see http://www.gnu.org/licenses/. -charclass [bl-] blanks +class '- +char -charclass [0-9(] '( +char '0 '9 ..char +: ?depth depth IF ." unbalanced: " .s clearstack cr THEN ; + +charclass [bl-] blanks +class '-' +char +charclass [0-9(] '(' +char '0' '9' ..char : telnum ( addr u -- flag ) (( {{ ` ( \( \d \d \d \) ` ) || \( \d \d \d \) }} blanks c? @@ -26,11 +28,11 @@ charclass [0-9(] '( +char '0 '9 ..char \( \d \d \d \d \) {{ \$ || -\d }} )) ; : ?tel ( addr u -- ) telnum - IF '( emit \1 type ." ) " \2 type '- emit \3 type ." succeeded" + 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 @@ -47,8 +49,8 @@ s" 123 456-78909" ?tel-f \( \d \d \d \d \) {{ \$ || -\d }} )) ; : ?tel2 ( addr u -- ) telnum2 - IF '( emit \1 type ." ) " \2 type '- emit \3 type ." succeeded" - ELSE \0 type ." failed " THEN cr ; + IF '(' emit \1 type ." ) " \2 type '-' emit \3 type ." succeeded" + ELSE \0 type ." failed " THEN cr ?depth ; ." --- Telephone number search ---" cr s" blabla (123) 456-7890" ?tel2 s" blabla (123) 456-7890 " ?tel2 @@ -65,11 +67,11 @@ s" abla 123 456-78909" ?tel2 ." --- Number extraction test ---" cr -charclass [0-9,./:] '0 '9 ..char ', +char '. +char '/ +char ': +char +charclass [0-9,./:] '0' '9' ..char ',' +char '.' +char '/' +char ':' +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,4 +120,72 @@ 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 ; + +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 ?depth + +\ simple replacement test + +." --- simple replacement test ---" cr + +: 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 ." 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 ; +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 \) >> + \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 +." -> " 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 ; + +\ doesn't work yet +s" (bla) 12:34:56 (fasel) 00:01:57 (blubber)" 2dup type hms>s,del() ." -> " type cr + script? [IF] bye [THEN]