--- gforth/quotes.fs 2002/04/27 14:52:30 1.1 +++ gforth/quotes.fs 2002/05/01 05:33:56 1.4 @@ -33,20 +33,29 @@ create \-escape-table 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 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 q c, 13 c, char s c, 9 c, char u c, 11 c, : \-escape ( c-addr1 -- c-addr2 c ) \ c-addr1 points at a char right after a '\', c-addr2 points right \ 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 endif dup [char] 0 [char] 8 within if drop 8 parse-num exit endif - dup [char] a [char] w within if - [char] a - chars \-escape-table + c@ + dup [char] n = if + \ \-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 1 chars under+ ; @@ -54,8 +63,8 @@ char o c, char p c, char q c, 13 \G parses string, translating @code{\}-escapes to characters (as in \G C). The resulting string resides at @code{here char+}. The \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 newline?), @code{\r} CR, @code{\t} HT, @code{\v} VT, @code{\"} ", +\G BS, @code{\e} ESC (not in C99), @code{\f} FF, @code{\n} newline, +\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 hex numerical character value; a @code{\} before any other \G character represents that character (only ', \, ? in C99). @@ -93,7 +102,7 @@ interpret/compile: .\" ( compilation 'cc s" a" drop \-escape 7 <> throw drop .s \"-parse " s" " compare 0<> throw .s \"-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\" \0101\x041\"\\" name AA"\ compare 0<> throw + s\" \a\bcd\e\fghijklm\12opq\rs\tu\v" \-escape-table over compare 0<> throw + s\" \w\0101\x041\"\\" name wAA"\ compare 0<> throw s\" s\\\" \\" ' evaluate catch 0= throw [endif]