--- gforth/regexp-test.fs	2005/12/31 15:46:10	1.2
+++ gforth/regexp-test.fs	2009/09/16 15:21:59	1.5
@@ -1,12 +1,12 @@
 \ regexp test
 
-\ Copyright (C) 2005 Free Software Foundation, Inc.
+\ Copyright (C) 2005,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,11 +15,10 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ 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?
@@ -27,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 ;
@@ -48,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
@@ -66,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? ++} \) ))
@@ -95,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