Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

solve '\r\n' in PikaVM_runFile()

Browse Source
This commit is contained in:
pikastech 2022-06-07 17:39:55 +08:00
parent 70f40df524
commit 21cf379456
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
port/linux/test/cJSON-test.cpp
View File

@ -428,7 +428,7 @@ TEST(cJSON, test7) {
/* collect */ /* collect */
/* assert */ /* assert */
EXPECT_STREQ(log_buff[0], "Android\r\n"); EXPECT_STREQ(log_buff[0], "shopping\r\n");
/* deinit */ /* deinit */
obj_deinit(pikaMain); obj_deinit(pikaMain);
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);

12
src/PikaVM.c
View File

@ -1091,9 +1091,17 @@ exit:
VMParameters* pikaVM_runFile(PikaObj* self, char* filename) { VMParameters* pikaVM_runFile(PikaObj* self, char* filename) {
Arg* file_arg = arg_loadFile(NULL, filename); Arg* file_arg = arg_loadFile(NULL, filename);
char* py_lines = (char*)arg_getBytes(file_arg); char* lines = (char*)arg_getBytes(file_arg);
VMParameters* res = pikaVM_run(self, py_lines); Args buffs = {0};
/* replace the "\r\n" to "\n" */
lines = strsReplace(&buffs, lines, "\r\n", "\n");
/* clear the void line */
lines = strsReplace(&buffs, lines, "\n\n", "\n");
/* add '\n' at the end */
lines = strsAppend(&buffs, lines, "\n\n");
VMParameters* res = pikaVM_run(self, lines);
arg_deinit(file_arg); arg_deinit(file_arg);
strsDeinit(&buffs);
return res; return res;
} }