steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding escaping to CHAR: " -> CHAR: \" 

It is not necessary to escape the " character, but it doesn't hurt and
is necessary for syntax-highlighting (FUEL) to work correctly.
char-rename
Björn Lindqvist 2016-09-04 06:40:43 +02:00
parent a36ac6e435
commit 20711a0fd3
25 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
basis/csv/csv.factor
View File

@ -20,7 +20,7 @@ DEFER: quoted-field,
2over stream-read1 swap over = 2over stream-read1 swap over =
[ nip ] [ [ nip ] [
{ {
{ CHAR: " [ [ CHAR: " , ] when quoted-field, ] } { CHAR: \" [ [ CHAR: \" , ] when quoted-field, ] }
{ CHAR: \n [ ] } ! Error: cr inside string? { CHAR: \n [ ] } ! Error: cr inside string?
{ CHAR: \r [ ] } ! Error: lf inside string? { CHAR: \r [ ] } ! Error: lf inside string?
[ [ , drop f maybe-escaped-quote ] when* ] [ [ , drop f maybe-escaped-quote ] when* ]
@ -45,7 +45,7 @@ DEFER: quoted-field,
swap ?trim [ drop ] 2dip ; inline swap ?trim [ drop ] 2dip ; inline
: field ( delimiter stream field-seps quote-seps -- sep/f field ) : field ( delimiter stream field-seps quote-seps -- sep/f field )
pick stream-read-until dup CHAR: " = [ pick stream-read-until dup CHAR: \" = [
drop [ drop quoted-field ] [ continue-field ] if-empty drop [ drop quoted-field ] [ continue-field ] if-empty
] [ [ 3drop ] 2dip swap ?trim ] if ; ] [ [ 3drop ] 2dip swap ?trim ] if ;
@ -89,10 +89,10 @@ PRIVATE>
'[ dup "\n\"\r" member? [ drop t ] [ _ = ] if ] any? ; inline '[ dup "\n\"\r" member? [ drop t ] [ _ = ] if ] any? ; inline
: escape-quotes ( cell stream -- ) : escape-quotes ( cell stream -- )
CHAR: " over stream-write1 swap [ CHAR: \" over stream-write1 swap [
[ over stream-write1 ] [ over stream-write1 ]
[ dup CHAR: " = [ over stream-write1 ] [ drop ] if ] bi [ dup CHAR: \" = [ over stream-write1 ] [ drop ] if ] bi
] each CHAR: " swap stream-write1 ; ] each CHAR: \" swap stream-write1 ;
: escape-if-required ( cell delimiter stream -- ) : escape-if-required ( cell delimiter stream -- )
[ dupd needs-escaping? ] dip [ dupd needs-escaping? ] dip

2
basis/help/html/html.factor
View File

@ -15,7 +15,7 @@ IN: help.html
: escape-char ( ch -- ) : escape-char ( ch -- )
dup ascii? [ dup ascii? [
dup H{ dup H{
{ CHAR: " "__quo__" } { CHAR: \" "__quo__" }
{ CHAR: * "__star__" } { CHAR: * "__star__" }
{ CHAR: : "__colon__" } { CHAR: : "__colon__" }
{ CHAR: < "__lt__" } { CHAR: < "__lt__" }

2
basis/html/templates/fhtml/fhtml.factor
View File

@ -16,7 +16,7 @@ TUPLE: template-lexer < lexer ;
M: template-lexer skip-word M: template-lexer skip-word
[ [
{ {
{ [ 2dup nth CHAR: " = ] [ drop 1 + ] } { [ 2dup nth CHAR: \" = ] [ drop 1 + ] }
{ [ 2dup swap tail-slice "%>" head? ] [ drop 2 + ] } { [ 2dup swap tail-slice "%>" head? ] [ drop 2 + ] }
[ f skip ] [ f skip ]
} cond } cond

2
basis/http/parsers/parsers.factor
View File

@ -97,7 +97,7 @@ PEG: parse-response-line ( string -- triple )
[ " \t" member? ] satisfy repeat1 ; [ " \t" member? ] satisfy repeat1 ;
: qdtext-parser ( -- parser ) : qdtext-parser ( -- parser )
{ [ CHAR: " = ] [ control? ] } except-these ; { [ CHAR: \" = ] [ control? ] } except-these ;
: quoted-char-parser ( -- parser ) : quoted-char-parser ( -- parser )
"\\" token hide any-char 2seq ; "\\" token hide any-char 2seq ;

4
basis/io/launcher/windows/windows.factor
View File

@ -64,10 +64,10 @@ TUPLE: CreateProcess-args
[ [
{ [ drop CHAR: \ = ] [ nip "\\\"" member? ] } 2&& { [ drop CHAR: \ = ] [ nip "\\\"" member? ] } 2&&
] monotonic-split [ ] monotonic-split [
dup last CHAR: " = [ dup last CHAR: \" = [
dup length 1 > [ dup length 1 > [
! String of backslashes + double-quote ! String of backslashes + double-quote
length 1 - 2 * CHAR: \ <repetition> "\\\"" append length 1 - 2 * CHAR: \\ <repetition> "\\\"" append
] [ ] [
! Single double-quote ! Single double-quote
drop "\\\"" drop "\\\""

2
basis/json/reader/reader.factor
View File

@ -44,7 +44,7 @@ DEFER: (read-json-string)
: (read-json-escape) ( stream accum -- accum ) : (read-json-escape) ( stream accum -- accum )
{ sbuf } declare { sbuf } declare
over stream-read1 { over stream-read1 {
{ CHAR: " [ CHAR: " ] } { CHAR: \" [ CHAR: \" ] }
{ CHAR: \\ [ CHAR: \\ ] } { CHAR: \\ [ CHAR: \\ ] }
{ CHAR: / [ CHAR: / ] } { CHAR: / [ CHAR: / ] }
{ CHAR: b [ CHAR: \b ] } { CHAR: b [ CHAR: \b ] }

6
basis/json/writer/writer.factor
View File

@ -59,9 +59,9 @@ M: json-null stream-json-print
PRIVATE> PRIVATE>
M: string stream-json-print M: string stream-json-print
CHAR: " over stream-write1 swap [ CHAR: \" over stream-write1 swap [
{ {
{ CHAR: " [ "\\\"" over stream-write ] } { CHAR: \" [ "\\\"" over stream-write ] }
{ CHAR: \\ [ "\\\\" over stream-write ] } { CHAR: \\ [ "\\\\" over stream-write ] }
{ CHAR: / [ { CHAR: / [
json-escape-slashes? get json-escape-slashes? get
@ -87,7 +87,7 @@ M: string stream-json-print
] if ] if
] ]
} case } case
] each CHAR: " swap stream-write1 ; ] each CHAR: \" swap stream-write1 ;
M: integer stream-json-print M: integer stream-json-print
[ number>string ] [ stream-write ] bi* ; [ number>string ] [ stream-write ] bi* ;

2
basis/peg/ebnf/ebnf.factor
View File

@ -114,7 +114,7 @@ C: <ebnf> ebnf
[ [
[ CHAR: \ = ] satisfy [ CHAR: \ = ] satisfy
[ "\"\\" member? ] satisfy 2seq , [ "\"\\" member? ] satisfy 2seq ,
[ CHAR: " = not ] satisfy , [ CHAR: \" = not ] satisfy ,
] choice* repeat1 "\"" "\"" surrounded-by , ] choice* repeat1 "\"" "\"" surrounded-by ,
[ CHAR: ' = not ] satisfy repeat1 "'" "'" surrounded-by , [ CHAR: ' = not ] satisfy repeat1 "'" "'" surrounded-by ,
] choice* [ "" flatten-as unescape-string ] action ; ] choice* [ "" flatten-as unescape-string ] action ;

6
basis/peg/parsers/parsers.factor
View File

@ -74,9 +74,9 @@ PRIVATE>
: string-parser ( -- parser ) : string-parser ( -- parser )
[ [
[ CHAR: " = ] satisfy hide , [ CHAR: \" = ] satisfy hide ,
[ CHAR: " = not ] satisfy repeat0 , [ CHAR: \" = not ] satisfy repeat0 ,
[ CHAR: " = ] satisfy hide , [ CHAR: \" = ] satisfy hide ,
] seq* [ first >string ] action ; ] seq* [ first >string ] action ;
: (range-pattern) ( pattern -- string ) : (range-pattern) ( pattern -- string )

2
basis/xml/dtd/dtd.factor
View File

@ -24,7 +24,7 @@ UNION: dtd-acceptable
[ [
take-word pass-blank get-char { take-word pass-blank get-char {
{ CHAR: ' [ parse-quote ] } { CHAR: ' [ parse-quote ] }
{ CHAR: " [ parse-quote ] } { CHAR: \" [ parse-quote ] }
[ drop take-external-id close ] [ drop take-external-id close ]
} case } case
] dip '[ swap _ [ ?set-at ] change ] 2keep ; ] dip '[ swap _ [ ?set-at ] change ] 2keep ;

4
basis/xml/entities/entities.factor
View File

@ -15,7 +15,7 @@ CONSTANT: quoted-entities-out
H{ H{
{ CHAR: & "&amp;" } { CHAR: & "&amp;" }
{ CHAR: ' "&apos;" } { CHAR: ' "&apos;" }
{ CHAR: " "&quot;" } { CHAR: \" "&quot;" }
{ CHAR: < "&lt;" } { CHAR: < "&lt;" }
} }
@ -35,7 +35,7 @@ CONSTANT: entities
{ "gt" CHAR: > } { "gt" CHAR: > }
{ "amp" CHAR: & } { "amp" CHAR: & }
{ "apos" CHAR: ' } { "apos" CHAR: ' }
{ "quot" CHAR: " } { "quot" CHAR: \" }
} }
: with-entities ( entities quot -- ) : with-entities ( entities quot -- )

2
basis/xml/writer/writer.factor
View File

@ -48,7 +48,7 @@ PRIVATE>
<PRIVATE <PRIVATE
: write-quoted ( string -- ) : write-quoted ( string -- )
CHAR: " write1 write CHAR: " write1 ; CHAR: \" write1 write CHAR: \" write1 ;
: print-attrs ( assoc -- ) : print-attrs ( assoc -- )
[ [

2
core/lexer/lexer.factor
View File

@ -85,7 +85,7 @@ GENERIC: skip-word ( lexer -- )
M: lexer skip-word M: lexer skip-word
[ [
2dup nth CHAR: " eq? [ drop 1 + ] [ f skip ] if 2dup nth CHAR: \" eq? [ drop 1 + ] [ f skip ] if
] change-lexer-column ; ] change-lexer-column ;
: still-parsing? ( lexer -- ? ) : still-parsing? ( lexer -- ? )

12
extra/c/lexer/lexer-tests.factor
View File

@ -51,32 +51,32 @@ IN: c.lexer.tests
{ f } { f }
[ [
"\"abc\" asdf" <sequence-parser> "\"abc\" asdf" <sequence-parser>
[ CHAR: \ CHAR: " take-quoted-string drop ] [ "asdf" take-sequence ] bi [ CHAR: \ CHAR: \" take-quoted-string drop ] [ "asdf" take-sequence ] bi
] unit-test ] unit-test
{ "abc\\\"def" } { "abc\\\"def" }
[ [
"\"abc\\\"def\" asdf" <sequence-parser> "\"abc\\\"def\" asdf" <sequence-parser>
CHAR: \ CHAR: " take-quoted-string CHAR: \ CHAR: \" take-quoted-string
] unit-test ] unit-test
{ "asdf" } { "asdf" }
[ [
"\"abc\" asdf" <sequence-parser> "\"abc\" asdf" <sequence-parser>
[ CHAR: \ CHAR: " take-quoted-string drop ] [ CHAR: \ CHAR: \" take-quoted-string drop ]
[ skip-whitespace "asdf" take-sequence ] bi [ skip-whitespace "asdf" take-sequence ] bi
] unit-test ] unit-test
{ f } { f }
[ [
"\"abc asdf" <sequence-parser> "\"abc asdf" <sequence-parser>
CHAR: \ CHAR: " take-quoted-string CHAR: \ CHAR: \" take-quoted-string
] unit-test ] unit-test
{ "\"abc" } { "\"abc" }
[ [
"\"abc asdf" <sequence-parser> "\"abc asdf" <sequence-parser>
[ CHAR: \ CHAR: " take-quoted-string drop ] [ CHAR: \ CHAR: \" take-quoted-string drop ]
[ "\"abc" take-sequence ] bi [ "\"abc" take-sequence ] bi
] unit-test ] unit-test
@ -87,7 +87,7 @@ IN: c.lexer.tests
[ "" <sequence-parser> take-token ] unit-test [ "" <sequence-parser> take-token ] unit-test
{ "abcd e \\\"f g" } { "abcd e \\\"f g" }
[ "\"abcd e \\\"f g\"" <sequence-parser> CHAR: \ CHAR: " take-token* ] unit-test [ "\"abcd e \\\"f g\"" <sequence-parser> CHAR: \ CHAR: \" take-token* ] unit-test
{ "123" } { "123" }
[ "123jjj" <sequence-parser> take-c-integer ] unit-test [ "123jjj" <sequence-parser> take-c-integer ] unit-test

2
extra/c/lexer/lexer.factor
View File

@ -69,7 +69,7 @@ IN: c.lexer
} case ; } case ;
: take-token ( sequence-parser -- string/f ) : take-token ( sequence-parser -- string/f )
CHAR: \ CHAR: " take-token* ; CHAR: \ CHAR: \" take-token* ;
: c-identifier-begin? ( ch -- ? ) : c-identifier-begin? ( ch -- ? )
CHAR: a CHAR: z [a,b] CHAR: a CHAR: z [a,b]

2
extra/c/preprocessor/preprocessor.factor
View File

@ -74,7 +74,7 @@ ERROR: header-file-missing path ;
: handle-include ( preprocessor-state sequence-parser -- ) : handle-include ( preprocessor-state sequence-parser -- )
skip-whitespace/comments advance dup previous { skip-whitespace/comments advance dup previous {
{ CHAR: < [ CHAR: > take-until-object read-standard-include ] } { CHAR: < [ CHAR: > take-until-object read-standard-include ] }
{ CHAR: " [ CHAR: " take-until-object read-local-include ] } { CHAR: \" [ CHAR: \" take-until-object read-local-include ] }
[ bad-include-line ] [ bad-include-line ]
} case ; } case ;

2
extra/cuesheet/cuesheet.factor
View File

@ -58,7 +58,7 @@ ERROR: unknown-syntax syntax ;
dup [ CHAR: ; = ] find drop [ head ] when* ; dup [ CHAR: ; = ] find drop [ head ] when* ;
: trim-quotes ( str -- str' ) : trim-quotes ( str -- str' )
[ CHAR: " = ] trim ; [ CHAR: \" = ] trim ;
: last-track ( cuesheet -- cuesheet track ) : last-track ( cuesheet -- cuesheet track )
dup files>> last tracks>> last ; dup files>> last tracks>> last ;

2
extra/fjsc/fjsc.factor
View File

@ -32,7 +32,7 @@ TUPLE: ast-hashtable elements ;
[ [
{ {
[ blank? not ] [ blank? not ]
[ CHAR: " = not ] [ CHAR: \" = not ]
[ CHAR: ; = not ] [ CHAR: ; = not ]
[ LETTER? not ] [ LETTER? not ]
[ letter? not ] [ letter? not ]

2
extra/flip-text/flip-text.factor
View File

@ -71,7 +71,7 @@ CONSTANT: CHARS H{
{ CHAR: 9 CHAR: 6 } { CHAR: 9 CHAR: 6 }
{ CHAR: & 0x214B } { CHAR: & 0x214B }
{ CHAR: ! 0x00A1 } { CHAR: ! 0x00A1 }
{ CHAR: " 0x201E } { CHAR: \" 0x201E }
{ CHAR: . 0x02D9 } { CHAR: . 0x02D9 }
{ CHAR: ; 0x061B } { CHAR: ; 0x061B }
{ CHAR: [ CHAR: ] } { CHAR: [ CHAR: ] }

2
extra/html/parser/parser.factor
View File

@ -43,7 +43,7 @@ SYMBOL: tagstack
CHAR: ' (read-quote) ; CHAR: ' (read-quote) ;
: read-double-quote ( sequence-parser -- string ) : read-double-quote ( sequence-parser -- string )
CHAR: " (read-quote) ; CHAR: \" (read-quote) ;
: read-quote ( sequence-parser -- string ) : read-quote ( sequence-parser -- string )
dup get+increment CHAR: ' = dup get+increment CHAR: ' =

4
extra/ini-file/ini-file.factor
View File

@ -19,7 +19,7 @@ IN: ini-file
{ CHAR: t CHAR: \t } { CHAR: t CHAR: \t }
{ CHAR: v CHAR: \v } { CHAR: v CHAR: \v }
{ CHAR: ' CHAR: ' } { CHAR: ' CHAR: ' }
{ CHAR: " CHAR: " } { CHAR: \" CHAR: \" }
{ CHAR: \\ CHAR: \\ } { CHAR: \\ CHAR: \\ }
{ CHAR: ? CHAR: ? } { CHAR: ? CHAR: ? }
{ CHAR: ; CHAR: ; } { CHAR: ; CHAR: ; }
@ -50,7 +50,7 @@ USE: xml.entities
{ CHAR: \t "\\t" } { CHAR: \t "\\t" }
{ 0x0b "\\v" } { 0x0b "\\v" }
{ CHAR: ' "\\'" } { CHAR: ' "\\'" }
{ CHAR: " "\\\"" } { CHAR: \" "\\\"" }
{ CHAR: \\ "\\\\" } { CHAR: \\ "\\\\" }
{ CHAR: ? "\\?" } { CHAR: ? "\\?" }
{ CHAR: ; "\\;" } { CHAR: ; "\\;" }

2
extra/morse/morse.factor
View File

@ -71,7 +71,7 @@ CONSTANT: morse-code-table $[
{ CHAR: + ".-.-." } { CHAR: + ".-.-." }
{ CHAR: - "-....-" } { CHAR: - "-....-" }
{ CHAR: _ "..--.-" } { CHAR: _ "..--.-" }
{ CHAR: " ".-..-." } { CHAR: \" ".-..-." }
{ CHAR: $ "...-..-" } { CHAR: $ "...-..-" }
{ CHAR: @ ".--.-." } { CHAR: @ ".--.-." }
{ CHAR: \s "/" } { CHAR: \s "/" }

6
extra/parser-combinators/simple/simple.factor
View File

@ -11,9 +11,9 @@ IN: parser-combinators.simple
[ digit? ] satisfy <*> [ string>number ] <@ ; [ digit? ] satisfy <*> [ string>number ] <@ ;
: string-parser ( -- parser ) : string-parser ( -- parser )
[ CHAR: " = ] satisfy [ CHAR: \" = ] satisfy
[ CHAR: " = not ] satisfy <*> &> [ CHAR: \" = not ] satisfy <*> &>
[ CHAR: " = ] satisfy <& [ >string ] <@ ; [ CHAR: \" = ] satisfy <& [ >string ] <@ ;
: bold-parser ( -- parser ) : bold-parser ( -- parser )
"*" token "*" token

2
extra/peg/javascript/tokenizer/tokenizer.factor
View File

@ -55,7 +55,7 @@ SingleEscape = "b" => [[ CHAR: \b ]]
| "t" => [[ CHAR: \t ]] | "t" => [[ CHAR: \t ]]
| "v" => [[ CHAR: \v ]] | "v" => [[ CHAR: \v ]]
| "'" => [[ CHAR: ' ]] | "'" => [[ CHAR: ' ]]
| "\"" => [[ CHAR: " ]] | "\"" => [[ CHAR: \" ]]
| "\\" => [[ CHAR: \\ ]] | "\\" => [[ CHAR: \\ ]]
HexDigit = [0-9a-fA-F] HexDigit = [0-9a-fA-F]
HexEscape = "x" (HexDigit HexDigit):d => [[ d hex> ]] HexEscape = "x" (HexDigit HexDigit):d => [[ d hex> ]]

2
extra/tnetstrings/tnetstrings.factor
View File

@ -44,7 +44,7 @@ DEFER: parse-tnetstring
: parse-tnetstring ( data -- remain value ) : parse-tnetstring ( data -- remain value )
parse-payload { parse-payload {
{ CHAR: # [ string>number ] } { CHAR: # [ string>number ] }
{ CHAR: " [ ] } { CHAR: \" [ ] }
{ CHAR: } [ parse-dict ] } { CHAR: } [ parse-dict ] }
{ CHAR: ] [ parse-list ] } { CHAR: ] [ parse-list ] }
{ CHAR: ! [ parse-bool ] } { CHAR: ! [ parse-bool ] }