--- gforth/regexp-test.fs	2007/12/31 18:40:24	1.3
+++ gforth/regexp-test.fs	2010/09/04 11:51:09	1.8
@@ -1,6 +1,6 @@
 \ regexp test
 
-\ Copyright (C) 2005 Free Software Foundation, Inc.
+\ Copyright (C) 2005,2007,2009 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -17,8 +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/.
 
-charclass [bl-]   blanks +class '- +char
-charclass [0-9(]  '( +char '0 '9 ..char
+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,7 +26,7 @@ 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 ;
@@ -47,7 +47,7 @@ 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"
+    IF   '(' emit \1 type ." ) " \2 type '-' emit \3 type ."  succeeded"
     ELSE \0 type ."  failed " THEN  cr ;
 ." --- Telephone number search ---" cr
 s" blabla (123) 456-7890" ?tel2
@@ -65,7 +65,7 @@ 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? ++} \) ))
@@ -94,11 +94,11 @@ s" Hier kommt nichts vor" ?string
 
 : ?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 ;
 
 : ?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 ;
 
 s" foobar" ?foos
 s" foofoofoobar" ?foos
@@ -118,4 +118,28 @@ s" fofoofoofofooofoobarbar" ?foos1
 s" bla baz bar" ?foos1
 s" foofoofoo" ?foos1
 
+\ simple replacement test
+ 
+: 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 ." '"
+   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
+
+\ replacement tests
+
+: 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" hms>s
+s" bla 45296s fasel 117s" str= 0= [IF] .( replacement failed) [THEN]
+
 script? [IF] bye [THEN]