mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-03 11:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip carriage return \r from raw string literals

Browse Source
This commit is contained in:
gingerBill
2020-05-23 11:39:29 +01:00
parent 26fe9b0212
commit ef539696b9
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/string.cpp
View File

@@ -661,10 +661,25 @@ bool unquote_char(String s, u8 quote, Rune *rune, bool *multiple_bytes, String *
}
String strip_carriage_return(gbAllocator a, String s) {
isize buf_len = s.len;
u8 *buf = gb_alloc_array(a, u8, buf_len);
isize i = 0;
for (isize j = 0; j < s.len; j++) {
u8 c = s.text[j];
if (c != '\r') {
buf[i++] = c;
}
}
return make_string(buf, i);
}
// 0 == failure
// 1 == original memory
// 2 == new allocation
i32 unquote_string(gbAllocator a, String *s_, u8 quote=0) {
i32 unquote_string(gbAllocator a, String *s_, u8 quote=0, bool has_carriage_return=false) {
String s = *s_;
isize n = s.len;
if (quote == 0) {
@@ -683,6 +698,11 @@ i32 unquote_string(gbAllocator a, String *s_, u8 quote=0) {
if (string_contains_char(s, '`')) {
return 0;
}
if (has_carriage_return) {
*s_ = strip_carriage_return(a, s);
return 2;
}
*s_ = s;
return 1;
}

6
src/tokenizer.cpp
View File

@@ -960,6 +960,7 @@ Token tokenizer_get_token(Tokenizer *t) {
case '`': // Raw String Literal
case '"': // String Literal
{
bool has_carriage_return = false;
i32 success;
Rune quote = curr_rune;
token.kind = Token_String;
@@ -989,10 +990,13 @@ Token tokenizer_get_token(Tokenizer *t) {
if (r == quote) {
break;
}
if (r == '\r') {
has_carriage_return = true;
}
}
}
token.string.len = t->curr - token.string.text;
success = unquote_string(heap_allocator(), &token.string);
success = unquote_string(heap_allocator(), &token.string, 0, has_carriage_return);
if (success > 0) {
if (success == 2) {
array_add(&t->allocated_strings, token.string);