RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 20:25:07 +00:00
Code Issues Activity Actions

LibJS: Unescape strings in Token::string_value()

Browse source
This commit is contained in:
Stephan Unverwerth 2020-03-14 13:39:05 +01:00 • committed by Andreas Kling
parent 644b4f4201
commit 3389021291
2 changed files with 59 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Base/home/anon/js/strings.js
View file

@ -1,7 +1,12 @@
var d = "Double quoted string"; var d = "Double quoted string\n";
var s = 'Single quoted string'; print(d);
var e = "Escaped characters \n \" \t \\" var s = 'Single quoted string\n';
print(s)
var e = "Escaped characters \b \f \n \r \t \v \' \" \\ \n";
print(e)
var u = "Unterminated string var u = "Unterminated string
this is not possible in js" this is not possible in js\n";
print(u);
var u2 = 'This is neither var u2 = 'This is neither\n
print(u2);

53
Libraries/LibJS/Token.cpp
View file

@ -26,6 +26,7 @@
#include "Token.h" #include "Token.h"
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/StringBuilder.h>
namespace JS { namespace JS {
@ -209,6 +210,7 @@ const char* Token::name() const
double Token::double_value() const double Token::double_value() const
{ {
ASSERT(type() == TokenType::NumericLiteral);
// FIXME: need to parse double instead of int // FIXME: need to parse double instead of int
bool ok; bool ok;
return m_value.to_int(ok); return m_value.to_int(ok);
@ -216,15 +218,58 @@ double Token::double_value() const
String Token::string_value() const String Token::string_value() const
{ {
if (m_value.length() >= 2 && m_value[0] == '"' && m_value[m_value.length() - 1]) { ASSERT(type() == TokenType::StringLiteral);
return m_value.substring_view(1, m_value.length() - 2); StringBuilder builder;
for (size_t i = 1; i < m_value.length() - 1; ++i) {
if (m_value[i] == '\\' && i + 1 < m_value.length() - 1) {
i++;
switch (m_value[i]) {
case 'b':
builder.append('\b');
break;
case 'f':
builder.append('\f');
break;
case 'n':
builder.append('\n');
break;
case 'r':
builder.append('\r');
break;
case 't':
builder.append('\t');
break;
case 'v':
builder.append('\v');
break;
case '0':
builder.append((char)0);
break;
case '\'':
builder.append('\'');
break;
case '"':
builder.append('"');
break;
case '\\':
builder.append('\\');
break;
default:
// FIXME: Also parse octal, hex and unicode sequences
// should anything else generate a syntax error?
builder.append(m_value[i]);
} }
// FIXME: unescape the string and remove quotes
return m_value; } else {
builder.append(m_value[i]);
}
}
return builder.to_string();
} }
bool Token::bool_value() const bool Token::bool_value() const
{ {
ASSERT(type() == TokenType::BoolLiteral);
return m_value == "true"; return m_value == "true";
} }