OctaForge
/
libcubescript
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

use the new algo stuff

master
Daniel Kolesa 2015-08-11 01:39:25 +01:00
parent 634277a31c
commit 64d770474f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cubescript.cc
View File

@ -1431,10 +1431,10 @@ static bool compileblockstr(GenState &gs, ostd::ConstCharRange str, bool macro)
char *buf = (char *)&gs.code[gs.code.size()];
int len = 0;
while (!str.empty()) {
int n = strcspn(str.data(), "\r/\"@]\0");
memcpy(&buf[len], str.data(), n);
len += n;
str.pop_front_n(n);
const char *p = str.data();
str = ostd::find_one_of(str, ostd::ConstCharRange("\r/\"@]"));
memcpy(&buf[len], p, str.data() - p);
len += str.data() - p;
if (str.empty())
goto done;
switch (str.front()) {
@ -1451,7 +1451,8 @@ static bool compileblockstr(GenState &gs, ostd::ConstCharRange str, bool macro)
break;
}
case '/':
if (str[1] == '/') str.pop_front_n(strcspn(str.data(), "\n\0"));
if (str[1] == '/')
str = ostd::find(str, '\n');
else {
buf[len++] = str.front();
str.pop_front();