Diff for /gforth/quotes.fs between versions 1.1 and 1.7

version 1.1, 2002/04/27 14:52:30 version 1.7, 2003/01/23 21:45:59
Line 33 Line 33
 create \-escape-table  create \-escape-table
     7 c,        8 c,  char c c,  char d c,      27 c,      12 c,  char g c,      7 c,        8 c,  char c c,  char d c,      27 c,      12 c,  char g c,
 char h c,  char i c,  char j c,  char k c,  char l c,  char m c,      10 c,  char h c,  char i c,  char j c,  char k c,  char l c,  char m c,      10 c,
 char o c,  char p c,  char q c,      13 c,  char s c,       8 c,  char u c,  char o c,  char p c,  char " c,      13 c,  char s c,       9 c,  char u c,
     11 c,      11 c,
   
 : \-escape ( c-addr1 -- c-addr2 c )  : \-escape ( c-addr1 -- c-addr2 c )
     \ c-addr1 points at a char right after a '\', c-addr2 points right      \ c-addr1 points at a char right after a '\', c-addr2 points right
     \ after the whole sequence, c is the translated char      \ after the whole sequence, c is the translated char
     dup c@ dup [char] x = if      dup c@
       dup [char] x = if
         drop char+ 16 parse-num exit          drop char+ 16 parse-num exit
     endif      endif
     dup [char] 0 [char] 8 within if      dup [char] 0 [char] 8 within if
         drop 8 parse-num exit          drop 8 parse-num exit
     endif      endif
     dup [char] a [char] w within if      dup [char] n = if
         [char] a - chars \-escape-table + c@          \ \-escapes were designed to translate to one character, so
           \ this is quite ugly: copy all but the last char right away
           drop newline 1-
           2dup here swap chars dup allot move
           chars + c@
       else
           dup [char] a [char] w within if
               [char] a - chars \-escape-table + c@
           endif
     endif      endif
     1 chars under+ ;      1 chars under+ ;
   
Line 54  char o c,  char p c,  char q c,      13 Line 63  char o c,  char p c,  char q c,      13
 \G parses string, translating @code{\}-escapes to characters (as in  \G parses string, translating @code{\}-escapes to characters (as in
 \G C).  The resulting string resides at @code{here char+}.  The  \G C).  The resulting string resides at @code{here char+}.  The
 \G supported @code{\-escapes} are: @code{\a} BEL (alert), @code{\b}  \G supported @code{\-escapes} are: @code{\a} BEL (alert), @code{\b}
 \G BS, @code{\e} ESC (not in C99), @code{\f} FF, @code{\n} LF (or  \G BS, @code{\e} ESC (not in C99), @code{\f} FF, @code{\n} newline,
 \G newline?), @code{\r} CR, @code{\t} HT, @code{\v} VT, @code{\"} ",  \G @code{\r} CR, @code{\t} HT, @code{\v} VT, @code{\"} ",
 \G @code{\}[0-7]+ octal numerical character value, @code{\x}[0-9a-f]+  \G @code{\}[0-7]+ octal numerical character value, @code{\x}[0-9a-f]+
 \G hex numerical character value; a @code{\} before any other  \G hex numerical character value; a @code{\} before any other
 \G character represents that character (only ', \, ? in C99).  \G character represents that character (only ', \, ? in C99).
     here >r 0 c,      here >r
     >in @ chars source chars over + >r + begin ( parse-area R: here parse-end )      >in @ chars source chars over + >r + begin ( parse-area R: here parse-end )
         dup r@ < while          dup r@ < while
             dup c@ [char] " <> while              dup c@ [char] " <> while
Line 73  char o c,  char p c,  char q c,      13 Line 82  char o c,  char p c,  char q c,      13
     char+ source >r - r> min char/ >in !      char+ source >r - r> min char/ >in !
     r> drop      r> drop
     here r> - dup negate allot      here r> - dup negate allot
     here swap char/ 1 /string ;      here swap char/ ;
   
 :noname \"-parse save-mem ;  :noname \"-parse save-mem ;
 :noname postpone (s") \"-parse dup c, 1+ chars allot drop ;  :noname \"-parse save-mem 2dup postpone sliteral drop free throw ;
 interpret/compile: s\" ( compilation 'ccc"' -- ; run-time -- c-addr u ) \ gforth        s-backslash-quote  interpret/compile: s\" ( compilation 'ccc"' -- ; run-time -- c-addr u ) \ gforth        s-backslash-quote
 \G Like @code{S"}, but translates C-like \-escape-sequences into  \G Like @code{S"}, but translates C-like \-escape-sequences into
 \G single characters.  See @code{\"-parse} for details.  \G single characters.  See @code{\"-parse} for details.
   
 :noname \"-parse type ;  :noname \"-parse type ;
 :noname postpone (.") \"-parse dup c, 1+ chars allot drop ;  :noname postpone s\" postpone type ;
 interpret/compile: .\" ( compilation 'ccc"' -- ; run-time -- )  \ gforth        dot-backslash-quote  interpret/compile: .\" ( compilation 'ccc"' -- ; run-time -- )  \ gforth        dot-backslash-quote
   
 0 [if] \ test  0 [if] \ test
Line 91  interpret/compile: .\" ( compilation 'cc Line 100  interpret/compile: .\" ( compilation 'cc
     s" x1fg" drop \-escape 31 <> throw drop .s      s" x1fg" drop \-escape 31 <> throw drop .s
     s" 00129" drop \-escape 10 <> throw drop .s      s" 00129" drop \-escape 10 <> throw drop .s
     s" a" drop \-escape 7 <> throw drop .s      s" a" drop \-escape 7 <> throw drop .s
     \"-parse " s" " compare 0<> throw .s      \"-parse " s" " str= 0= throw .s
     \"-parse \a\b\c\e\f\n\r\t\v\100\x40xabcde" dump      \"-parse \a\b\c\e\f\n\r\t\v\100\x40xabcde" dump
     s\" \a\bcd\e\fghijklm\nopq\rs\tu\v" \-escape-table over compare 0<> throw      s\" \a\bcd\e\fghijklm\12op\"\rs\tu\v" \-escape-table over str= 0= throw
     s\" \0101\x041\"\\" name AA"\ compare 0<> throw      s\" \w\0101\x041\"\\" name wAA"\ str= 0= throw
     s\" s\\\" \\" ' evaluate catch 0= throw      s\" s\\\" \\" ' evaluate catch 0= throw
 [endif]  [endif]

Removed from v.1.1  
changed lines
  Added in v.1.7


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