gforth/string.fs - diff

Return to string.fs CVS log

Up to [gforth] / gforth

Diff for /gforth/string.fs between versions 1.17 and 1.19

-version 1.17, 2012/08/17 22:35:27
+version 1.19, 2012/10/07 19:34:01
  Line 83
      $@ BEGIN  dup  WHILE  r@ $split i' -rot >r >r execute r> r>
      REPEAT  2drop rdrop rdrop ;
+ : $over ( addr u $addr off -- )
+     \G overwrite string at offset off with addr u
+     swap >r
+     r@ @ 0= IF  s" " r@ $!  THEN
+dup + r@ $@len > IF
+dup + r@ $@len tuck max r@ $!len
+         r@ $@ rot /string bl fill
+     THEN
+     r> $@ rot /string rot umin move ;
  \ string array words
  : $[] ( n addr -- addr' ) >r
+     \G index into the string array and return the address at index n
      r@ @ 0= IF  s" " r@ $!  THEN
      r@ $@ 2 pick cells /string
      dup cell < IF
- Line 95
+ Line 106
          r@ $@ 2 pick cells /string
      THEN  drop nip rdrop ;
- : $[]! ( addr u n $addr -- )  $[] $! ;
+ : $[]! ( addr u n $[]addr -- )  $[] $! ;
- : $[]+! ( addr u n $addr -- )  $[] $+! ;
+ \G store a string into an array at index n
- : $[]@ ( n $addr -- addr u )  $[] dup @ IF $@ ELSE drop s" " THEN ;
+ : $[]+! ( addr u n $[]addr -- )  $[] $+! ;
+ \G add a string to the string at addr n
- : $over ( addr u $addr off -- )
+ : $[]@ ( n $[]addr -- addr u )  $[] dup @ IF $@ ELSE drop s" " THEN ;
-     \G overwrite string at offset off with addr u
+ \G fetch a string from array index n -- return the zero string if empty
-     swap >r
-     r@ @ 0= IF  s" " r@ $!  THEN
-dup + r@ $@len > IF
-dup + r@ $@len tuck max r@ $!len
-         r@ $@ rot /string bl fill
-     THEN
-     r> $@ rot /string rot min move ;
  [THEN]

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.17
changed lines
	Added in v.1.19