kamkow1/my-os-project2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tb String escaping

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-09-29 23:12:19 +02:00
parent 10711f7fb3
commit 39981fdbbf
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
user/tb/interp.c
View File

@ -34,7 +34,33 @@ void tz_tokenize(Tokenizer *tz) {
i++; i++;
size_t j = 0; size_t j = 0;
while (i < len && tz->str[i] != '\'') { while (i < len && tz->str[i] != '\'') {
str[j++] = tz->str[i++]; if (tz->str[i] == '\\') {
if (i + 1 < len) {
i++;
char c;
switch (tz->str[i]) {
case 'n': c = '\n'; break;
case 't': c = '\t'; break;
case 'r': c = '\r'; break;
case '\\': c = '\\'; break;
case '\'': c = '\''; break;
case '"': c = '"'; break;
default: c = tz->str[i]; break;
}
if (j + 1 < TZ_MAX_TK) {
str[j++] = c;
}
} else {
if (j + 1 < TZ_MAX_TK) {
str[j++] = '\\';
}
}
} else {
if (j + 1 < TZ_MAX_TK) {
str[j++] = tz->str[i];
}
}
i++;
} }
Token *tk = umalloc(sizeof(*tk)); Token *tk = umalloc(sizeof(*tk));
tk->str = str; tk->str = str;
@ -44,8 +70,11 @@ void tz_tokenize(Tokenizer *tz) {
char *tkstr = umalloc(TZ_MAX_TK); char *tkstr = umalloc(TZ_MAX_TK);
string_memset(tkstr, 0, TZ_MAX_TK); string_memset(tkstr, 0, TZ_MAX_TK);
size_t j = 0; size_t j = 0;
while (i < len && !string_chr_isspace(tz->str[i])) { while (i < len && !string_chr_isspace(tz->str[i]) && tz->str[i] != '\'') {
tkstr[j++] = tz->str[i++]; if (j + 1 < TZ_MAX_TK) {
tkstr[j++] = tz->str[i];
}
i++;
} }
Token *tk = umalloc(sizeof(*tk)); Token *tk = umalloc(sizeof(*tk));
tk->str = tkstr; tk->str = tkstr;