Add support of escaping backslash and backtick to String.raw #3736
Conversation
Template literals already supports escaping backslash and backtick, this commit enables escaping this in String.raw. It also fixes invalid behaviour of String.raw when using new line character. JerryScript-DCO-1.0-Signed-off-by: Rafal Walczyna [email protected]
| { | ||
| source_p += 3; | ||
| #if ENABLED (JERRY_ES2015) | ||
| length += 3 * raw_length_inc; |
There was a problem hiding this comment.
Do we need this raw_length_inc, or can the raw length be computed as source_p - string_start_p. If yes, perhaps we could just remove the variable. This could be more future proof approach.
There was a problem hiding this comment.
IMO that way is not completely valid, since in raw strings there are character sequences like (\r\n) which going to be transformed (into \n) therefore a single subtraction is not enough.
There was a problem hiding this comment.
Yes, we could remove raw_length_inc, but we still would need another variable (which also has to be guarded with JERRY_ES2015) to check for \r\n to \n conversions, as rerobika said. Also, source_p points to one character after literal ends when there is $ in string. So length (for raw string) would be source_p - string_start_p - raw_length_dec
@zherczeg I can add it to this commit, there is not so much to change, if you think this would improve performance or code readability :)
zherczeg
left a comment
zherczeg
left a comment
There was a problem hiding this comment.
LGTM
I would not mind to improve the code later with source_p - string_start_p - raw_length_dec.
4 participants
Template literals already supports escaping backslash and backtick, this commit enables escaping this in String.raw.
It also fixes invalid behaviour of String.raw when using new line character - escaped new line characters were not included in string.
There was also application crash when escaping backtick in String.raw argument.
JerryScript-DCO-1.0-Signed-off-by: Rafal Walczyna [email protected]