peg.javascript.tokenizer: rename escape rules slightly.

locals-and-roots
John Benediktsson 2016-06-12 06:52:23 -07:00
parent e7fa92baac
commit 8aadd38071
1 changed files with 4 additions and 4 deletions

View File

@ -48,7 +48,7 @@ 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 ]]
SingleEscapeChar = "b" => [[ CHAR: \b ]] SingleEscape = "b" => [[ CHAR: \b ]]
| "f" => [[ CHAR: \f ]] | "f" => [[ CHAR: \f ]]
| "n" => [[ CHAR: \n ]] | "n" => [[ CHAR: \n ]]
| "r" => [[ CHAR: \r ]] | "r" => [[ CHAR: \r ]]
@ -58,10 +58,10 @@ SingleEscapeChar = "b" => [[ CHAR: \b ]]
| "\"" => [[ CHAR: " ]] | "\"" => [[ CHAR: " ]]
| "\\" => [[ CHAR: \\ ]] | "\\" => [[ CHAR: \\ ]]
HexDigit = [0-9a-fA-F] HexDigit = [0-9a-fA-F]
HexEscapeChar = "x" (HexDigit HexDigit):d => [[ d hex> ]] HexEscape = "x" (HexDigit HexDigit):d => [[ d hex> ]]
UnicodeEscapeChar = "u" (HexDigit HexDigit HexDigit HexDigit):d => [[ d hex> ]] UnicodeEscape = "u" (HexDigit HexDigit HexDigit HexDigit):d => [[ d hex> ]]
| "u{" HexDigit+:d "}" => [[ d hex> ]] | "u{" HexDigit+:d "}" => [[ d hex> ]]
EscapeChar = "\\" (SingleEscapeChar | HexEscapeChar | UnicodeEscapeChar):c => [[ c ]] EscapeChar = "\\" (SingleEscape | HexEscape | UnicodeEscape):c => [[ c ]]
StringChars1 = (EscapeChar | !('"""') .)* => [[ >string ]] StringChars1 = (EscapeChar | !('"""') .)* => [[ >string ]]
StringChars2 = (EscapeChar | !('"') .)* => [[ >string ]] StringChars2 = (EscapeChar | !('"') .)* => [[ >string ]]
StringChars3 = (EscapeChar | !("'") .)* => [[ >string ]] StringChars3 = (EscapeChar | !("'") .)* => [[ >string ]]