Skip to content

[Enhancement] add raw string support #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khchen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Enhancement] add raw string support #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/core/compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ static void setNextValueToken(Parser* parser, _TokenType type, Var value);
static void setNextToken(Parser* parser, _TokenType type);
static bool matchChar(Parser* parser, char c);

static void eatString(Compiler* compiler, bool single_quote) {
static void eatString(Compiler* compiler, bool single_quote, bool is_raw) {
Parser* parser = &compiler->parser;

pkByteBuffer buff;
Expand All @@ -701,7 +701,7 @@ static void eatString(Compiler* compiler, bool single_quote) {
break;
}

if (c == '$') {
if (c == '$' && !is_raw) {
if (parser->si_depth < MAX_STR_INTERP_DEPTH) {
tk_type = TK_STRING_INTERP;

Expand Down Expand Up @@ -740,7 +740,7 @@ static void eatString(Compiler* compiler, bool single_quote) {
break;
}

if (c == '\\') {
if (c == '\\' && !is_raw) {
switch (eatChar(parser)) {
case '"': pkByteBufferWrite(&buff, parser->vm, '"'); break;
case '\'': pkByteBufferWrite(&buff, parser->vm, '\''); break;
Expand Down Expand Up @@ -1044,7 +1044,7 @@ static void lexToken(Compiler* compiler) {
if (parser->si_name_end != NULL) {
if (parser->current_char == parser->si_name_end) {
parser->si_name_end = NULL;
eatString(compiler, parser->si_name_quote == '\'');
eatString(compiler, parser->si_name_quote == '\'', false);
return;
} else {
ASSERT(parser->current_char < parser->si_name_end, OOPS);
Expand Down Expand Up @@ -1074,7 +1074,7 @@ static void lexToken(Compiler* compiler) {

char quote = parser->si_quote[parser->si_depth - 1];
parser->si_depth--; //< Exit the depth.
eatString(compiler, quote == '\'');
eatString(compiler, quote == '\'', false);
return;

} else { // Decrease the open brace at the current depth.
Expand Down Expand Up @@ -1187,17 +1187,21 @@ static void lexToken(Compiler* compiler) {
setNextTwoCharToken(parser, '=', TK_FSLASH, TK_DIVEQ);
return;

case '"': eatString(compiler, false); return;
case '"': eatString(compiler, false, false); return;

case '\'': eatString(compiler, true); return;
case '\'': eatString(compiler, true, false); return;

default: {

if (utilIsDigit(c)) {
char c2 = peekChar(parser);
if (c == 'r' && (c2 == '"' || c2 == '\'')) {
eatChar(parser);
eatString(compiler, c2 == '\'', true); return;
}
else if (utilIsDigit(c)) {
eatNumber(compiler);
if (parser->has_syntax_error) return;

} else if (utilIsName(c)) {
}
else if (utilIsName(c)) {
eatName(parser);

} else {
Expand Down