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

peg.javascript: add some other escapes since we're doing this. :-)

locals-and-roots
John Benediktsson 2016-06-11 15:22:20 -07:00
parent 385cf35e7f
commit 29a2a25954
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extra/peg/javascript/tokenizer/tokenizer-tests.factor
View File

@ -25,5 +25,9 @@ IN: peg.javascript.tokenizer.tests
] unit-test ] unit-test
{ {
V{ T{ ast-string { value "abc\"def\"" } } } V{ T{ ast-string { value "abc\"def\"" } } }
} [ "\"abc\\\"def\\\"\"" tokenize-javascript ] unit-test } [ "\"abc\\\"def\\\"\"" tokenize-javascript ] unit-test
{
V{ T{ ast-string { value "\b\f\n\r\t\v'\"\\" } } }
} [ "\"\\b\\f\\n\\r\\t\\v\\'\\\"\\\\\"" tokenize-javascript ] unit-test

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

@ -48,10 +48,15 @@ Name = !(Keyword) iName => [[ ast-name boa ]]
Number = Digits:ws '.' Digits:fs => [[ ws "." fs 3array "" concat-as string>number ast-number boa ]] Number = Digits:ws '.' Digits:fs => [[ ws "." fs 3array "" concat-as string>number ast-number boa ]]
| Digits => [[ >string string>number ast-number boa ]] | Digits => [[ >string string>number ast-number boa ]]
EscapeChar = "\\n" => [[ CHAR: \n ]] EscapeChar = "\\b" => [[ CHAR: \b ]]
| "\\f" => [[ CHAR: \f ]]
| "\\n" => [[ CHAR: \n ]]
| "\\r" => [[ CHAR: \r ]] | "\\r" => [[ CHAR: \r ]]
| "\\t" => [[ CHAR: \t ]] | "\\t" => [[ CHAR: \t ]]
| "\\\"" => [[ CHAR: \" ]] | "\\v" => [[ CHAR: \v ]]
| "\\'" => [[ CHAR: ' ]]
| "\\\"" => [[ CHAR: " ]]
| "\\\\" => [[ CHAR: \\ ]]
StringChars1 = (EscapeChar | !('"""') .)* => [[ >string ]] StringChars1 = (EscapeChar | !('"""') .)* => [[ >string ]]
StringChars2 = (EscapeChar | !('"') .)* => [[ >string ]] StringChars2 = (EscapeChar | !('"') .)* => [[ >string ]]
StringChars3 = (EscapeChar | !("'") .)* => [[ >string ]] StringChars3 = (EscapeChar | !("'") .)* => [[ >string ]]