--- gforth/string.fs	2007/12/31 18:40:24	1.7
+++ gforth/string.fs	2010/12/30 21:46:14	1.10
@@ -1,6 +1,6 @@
 \ dynamic string handling                              10aug99py
 
-\ Copyright (C) 2000,2005 Free Software Foundation, Inc.
+\ Copyright (C) 2000,2005,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -42,7 +42,7 @@
 : $ins ( addr1 u addr2 off -- ) >r
   2dup dup $@len rot + swap $!len  $@ 1+ r> /string insert ;
 : $+! ( addr1 u addr2 -- ) dup $@len $ins ;
-: $off ( addr -- )  dup @ free throw off ;
+: $off ( addr -- )  dup @ dup IF  free throw off  ELSE  2drop  THEN ;
 
 \ dynamic string handling                              12dec99py
 
@@ -50,6 +50,6 @@
   >r 2dup r> scan dup >r dup IF  1 /string  THEN
   2swap r> - 2swap ;
 
-: $iter ( .. $addr char xt -- .. ) { char xt }
-  $@ BEGIN  dup  WHILE  char $split >r >r xt execute r> r>
-     REPEAT  2drop ;
+: $iter ( .. $addr char xt -- .. ) >r >r
+  $@ BEGIN  dup  WHILE  r@ $split i' -rot >r >r execute r> r>
+     REPEAT  2drop rdrop rdrop ;