diff --git a/port/linux/.vscode/launch.json b/port/linux/.vscode/launch.json index 4fe8617ef..38efb2039 100644 --- a/port/linux/.vscode/launch.json +++ b/port/linux/.vscode/launch.json @@ -14,7 +14,7 @@ // "--gtest_filter=queue*" // "--gtest_filter=parser*" // "--gtest_filter=args*", - "--gtest_filter=content*", + // "--gtest_filter=content*", // "--gtest_filter=object_test.printa", // "--gtest_filter=object_test*", // "--gtest_filter=stack*", diff --git a/port/linux/.vscode/settings.json b/port/linux/.vscode/settings.json index 5bb5ecfab..644d4d2d6 100644 --- a/port/linux/.vscode/settings.json +++ b/port/linux/.vscode/settings.json @@ -9,7 +9,8 @@ "*.tcc": "c", "istream": "c", "cstring": "cpp", - "variant": "cpp" + "variant": "cpp", + "pikaplatform.h": "c" }, "python.formatting.provider": "yapf" } \ No newline at end of file diff --git a/port/linux/CMakeLists.txt b/port/linux/CMakeLists.txt index 710fbf0f7..9bc47795d 100644 --- a/port/linux/CMakeLists.txt +++ b/port/linux/CMakeLists.txt @@ -1,4 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) +add_compile_options(-Wall) + project(pikascript VERSION 0.1.0) include_directories(package/pikascript/pikascript-core) diff --git a/port/linux/test/VM-test.cpp b/port/linux/test/VM-test.cpp index 9df3ac336..ab20d019d 100644 --- a/port/linux/test/VM-test.cpp +++ b/port/linux/test/VM-test.cpp @@ -161,7 +161,6 @@ TEST(VM, JEZ) { "B0\n"; PikaObj* self = New_TinyObj(NULL); int lineAddr = 0; - int size = strGetSize(pikaAsm); Args* sysRes = New_args(NULL); args_setErrorCode(sysRes, 0); args_setSysOut(sysRes, (char*)""); @@ -185,7 +184,6 @@ TEST(VM, JMP) { "B0\n"; PikaObj* self = New_TinyObj(NULL); int lineAddr = 0; - int size = strGetSize(pikaAsm); Args* sysRes = New_args(NULL); args_setErrorCode(sysRes, 0); args_setSysOut(sysRes, (char*)""); @@ -209,7 +207,6 @@ TEST(VM, JMP_back1) { "B0\n"; PikaObj* self = New_TinyObj(NULL); int lineAddr = 0; - int size = strGetSize(pikaAsm); Args* sysRes = New_args(NULL); args_setErrorCode(sysRes, 0); args_setSysOut(sysRes, (char*)""); @@ -334,6 +331,7 @@ TEST(VM, mem_x) { Parameters* globals = pikaVM_runAsm(self, pikaAsm); int res = obj_getInt(globals, (char*)"mem.x"); + EXPECT_EQ(2, res); obj_deinit(self); obj_deinit(globals); args_deinit(buffs); @@ -355,8 +353,6 @@ TEST(VM, DEF_instruct) { "0 RET\n" "B0\n"; PikaObj* self = New_TinyObj(NULL); - int lineAddr = 0; - int size = strGetSize(pikaAsm); Parameters* globals = pikaVM_runAsm(self, pikaAsm); char* methodPtr = (char*)obj_getPtr(self, (char*)"test"); EXPECT_STREQ(methodCode, methodPtr); @@ -374,8 +370,6 @@ TEST(VM, RET_instruct) { "0 RET\n" "B0\n"; PikaObj* self = New_TinyObj(NULL); - int lineAddr = 0; - int size = strGetSize(pikaAsm); Parameters* globals = pikaVM_runAsm(self, pikaAsm); Arg* returnArg = args_getArg(globals->list, (char*)"return"); int num = arg_getInt(returnArg); diff --git a/port/linux/test/arg-test.cpp b/port/linux/test/arg-test.cpp index 97cb5599a..0de135e26 100644 --- a/port/linux/test/arg-test.cpp +++ b/port/linux/test/arg-test.cpp @@ -3,7 +3,6 @@ extern "C" { #include "dataArg.h" #include "dataString.h" } -static int mem; TEST(arg_test, int_) { Arg* arg = New_arg(NULL); diff --git a/port/linux/test/args-test.cpp b/port/linux/test/args-test.cpp index 285f1817b..9c5da9bd6 100644 --- a/port/linux/test/args-test.cpp +++ b/port/linux/test/args-test.cpp @@ -25,7 +25,6 @@ TEST(args, test4) { TEST(args, test2) { Args* args = New_args(NULL); - float floatOut = 0; int64_t int64Out = 0; void* pointer = NULL; char* strOut = NULL; @@ -64,7 +63,7 @@ TEST(args, test3) { TEST(args, buff) { Args* buffs = New_args(NULL); - char* buff = args_getBuff(buffs, 256); + args_getBuff(buffs, 256); args_deinit(buffs); EXPECT_EQ(pikaMemNow(), 0); } diff --git a/port/linux/test/content-test.cpp b/port/linux/test/content-test.cpp index 36a6d5d64..cf24fe74f 100644 --- a/port/linux/test/content-test.cpp +++ b/port/linux/test/content-test.cpp @@ -3,7 +3,6 @@ extern "C" { #include "dataArg.h" #include "dataString.h" } -static int mem; TEST(content, init) { uint8_t contentIn[4] = {0}; @@ -11,7 +10,6 @@ TEST(content, init) { contentIn[1] = 2; contentIn[2] = 3; contentIn[3] = 4; - uint16_t sizeIn = 4; uint8_t* self = content_init((char*)"name", (char*)"type", contentIn, 4, NULL); diff --git a/port/linux/test/object-test.cpp b/port/linux/test/object-test.cpp index ee5483d0b..f78aa9888 100644 --- a/port/linux/test/object-test.cpp +++ b/port/linux/test/object-test.cpp @@ -87,9 +87,6 @@ PikaObj* New_MYROOT1(Args* args) { TEST(object_test, test10) { PikaObj* root = newRootObj((char*)"root", New_MYROOT1); - PikaObj* usart = obj_getObj(root, (char*)"usart", 0); - // PikaObj* context = obj_getContext(usart); - // EXPECT_EQ(context, root); obj_run(root, (char*)"usart.send('hello world')"); obj_deinit(root); EXPECT_EQ(pikaMemNow(), 0); diff --git a/port/linux/test/queue-test.cpp b/port/linux/test/queue-test.cpp index b3312ec6d..a2af81a3f 100644 --- a/port/linux/test/queue-test.cpp +++ b/port/linux/test/queue-test.cpp @@ -5,7 +5,6 @@ extern "C" { #include "dataQueue.h" #include "dataQueueObj.h" } -static int mem; TEST(queue, NEW) { Queue* q = New_queue(); @@ -134,7 +133,9 @@ TEST(queueObj, currentObj) { queueObj_pushObj(q, (char*)"type1"); PikaObj* currentObj = queueObj_getCurrentObj(q); + EXPECT_TRUE(currentObj != NULL); char* type = args_getType(q->list, (char*)"0"); + EXPECT_STREQ((char*)"c", type); obj_setInt(queueObj_getCurrentObj(q), (char*)"test", 1); queueObj_pushObj(q, (char*)"type2"); @@ -156,4 +157,4 @@ TEST(queueObj, currentObj) { EXPECT_EQ(obj_getInt(obj3, (char*)"test"), 3); obj_deinit(q); EXPECT_EQ(pikaMemNow(), 0); -} \ No newline at end of file +} diff --git a/port/linux/test/stack-test.cpp b/port/linux/test/stack-test.cpp index 33f50ff25..3fbc86bfd 100644 --- a/port/linux/test/stack-test.cpp +++ b/port/linux/test/stack-test.cpp @@ -4,7 +4,6 @@ extern "C" { #include "dataMemory.h" #include "dataStack.h" } -static int mem; TEST(stack, NEW) { Stack* s = New_Stack(); diff --git a/port/linux/test/strs-test.cpp b/port/linux/test/strs-test.cpp index 05600ec50..2d39662a8 100644 --- a/port/linux/test/strs-test.cpp +++ b/port/linux/test/strs-test.cpp @@ -7,67 +7,69 @@ extern "C" { } static void printInfo(const char* argName, char* argVal) { - printf("\t\t[info] %s: \"%s\"\r\n", argName, argVal); + printf("\t\t[info] %s: \"%s\"\r\n", argName, argVal); } static int mem; TEST(strs, append) { - Args* buffs = New_strBuff(); - char* res = strsAppend(buffs, (char*)"a", (char*)"b"); - EXPECT_STREQ((char*)"ab", res); - args_deinit(buffs); - EXPECT_EQ(pikaMemNow(), 0); + Args* buffs = New_strBuff(); + char* res = strsAppend(buffs, (char*)"a", (char*)"b"); + EXPECT_STREQ((char*)"ab", res); + args_deinit(buffs); + EXPECT_EQ(pikaMemNow(), 0); } TEST(strs, formatInt) { - Args* buffs = New_strBuff(); - char* res = strsFormat(buffs, 32, "test: %d", 3); - args_deinit(buffs); - EXPECT_EQ(pikaMemNow(), 0); + Args* buffs = New_strBuff(); + char* res = strsFormat(buffs, 32, "test: %d", 3); + EXPECT_STREQ((char*)"test: 3", res); + args_deinit(buffs); + EXPECT_EQ(pikaMemNow(), 0); } TEST(strs, analizeDef) { - mem = pikaMemNow(); - Args* buffs = New_args(NULL); - char currentClassName[] = "Compiler"; - char line[] = " def analizeFile(pythonApiPath: str):"; - printInfo("currentClassName", currentClassName); - char* defSentenceWithBlock = strsRemovePrefix(buffs, line, (char*)" def "); - char* defSentence = strsDeleteChar(buffs, defSentenceWithBlock, ' '); - printInfo("defSentence", defSentence); - char* methodName = strsGetFirstToken(buffs, defSentence, '('); - printInfo("methodName", methodName); - char* methodObjPath = strsAppend( - buffs, strsAppend(buffs, currentClassName, (char*)"."), methodName); - printInfo("methodObjPath", methodObjPath); - char* returnType = strsCut(buffs, defSentence, '>', ':'); - printInfo("returnType", returnType); + mem = pikaMemNow(); + Args* buffs = New_args(NULL); + char currentClassName[] = "Compiler"; + char line[] = " def analizeFile(pythonApiPath: str):"; + printInfo("currentClassName", currentClassName); + char* defSentenceWithBlock = + strsRemovePrefix(buffs, line, (char*)" def "); + char* defSentence = strsDeleteChar(buffs, defSentenceWithBlock, ' '); + printInfo("defSentence", defSentence); + char* methodName = strsGetFirstToken(buffs, defSentence, '('); + printInfo("methodName", methodName); + char* methodObjPath = strsAppend( + buffs, strsAppend(buffs, currentClassName, (char*)"."), methodName); + printInfo("methodObjPath", methodObjPath); + char* returnType = strsCut(buffs, defSentence, '>', ':'); + printInfo("returnType", returnType); - char* typeList = strsCut(buffs, defSentence, '(', ')'); - printInfo("typeList", typeList); - if (0 != strGetSize(typeList)) { - int argNum = strCountSign(typeList, ',') + 1; - char* typeListBuff = strsCopy(buffs, typeList); - for (int i = 0; i < argNum; i++) { - char* typeDeclearation = strsPopToken(buffs, typeListBuff, ','); - printInfo("typeDeclearation", typeDeclearation); - char* argName = strsGetFirstToken(buffs, typeDeclearation, ':'); - printInfo("argName", argName); - char* argType = strsGetLastToken(buffs, typeDeclearation, ':'); - printInfo("argType", argType); + char* typeList = strsCut(buffs, defSentence, '(', ')'); + printInfo("typeList", typeList); + if (0 != strGetSize(typeList)) { + int argNum = strCountSign(typeList, ',') + 1; + char* typeListBuff = strsCopy(buffs, typeList); + for (int i = 0; i < argNum; i++) { + char* typeDeclearation = strsPopToken(buffs, typeListBuff, ','); + printInfo("typeDeclearation", typeDeclearation); + char* argName = strsGetFirstToken(buffs, typeDeclearation, ':'); + printInfo("argName", argName); + char* argType = strsGetLastToken(buffs, typeDeclearation, ':'); + printInfo("argType", argType); + } } - } - args_deinit(buffs); - return; + args_deinit(buffs); + return; } TEST(strs, format) { - Args* buffs = New_args(NULL); - char* fmt = strsFormat(buffs, 128, "test int: %d, float %f", 1, 34.2); - EXPECT_TRUE(strEqu((char*)"test int: 1, float 34.200000", fmt)); - args_deinit(buffs); + Args* buffs = New_args(NULL); + char* fmt = strsFormat(buffs, 128, "test int: %d, float %f", 1, 34.2); + EXPECT_TRUE(strEqu((char*)"test int: 1, float 34.200000", fmt)); + args_deinit(buffs); } TEST(strs, mem) { - EXPECT_EQ(pikaMemNow(), mem); + EXPECT_EQ(pikaMemNow(), mem); } diff --git a/src/BaseObj.c b/src/BaseObj.c index c3a185f24..9d3457f54 100644 --- a/src/BaseObj.c +++ b/src/BaseObj.c @@ -10,11 +10,6 @@ #include "dataString.h" #include "dataStrs.h" -static void* getClassPtr(PikaObj* classObj, char* classPath) { - char* ptrPath = classPath; - return obj_getPtr(classObj, ptrPath); -} - Arg* arg_setMetaObj(char* objName, char* className, NewFun objPtr) { Args* buffs = New_strBuff(); Arg* argNew = New_arg(NULL); diff --git a/src/PikaObj.c b/src/PikaObj.c index 23e1df87e..56ef5b7a9 100644 --- a/src/PikaObj.c +++ b/src/PikaObj.c @@ -292,9 +292,6 @@ PikaObj* initObj(PikaObj* obj, char* name) { PikaObj* thisClass = obj_getClassObjByNewFun(obj, name, newObjFun); PikaObj* newObj = removeMethodInfo(thisClass); - char* mateObjType = args_getType(obj->list, name); - char* pureType = strsGetLastToken(buffs, mateObjType, ']'); - char* objType = strsAppend(buffs, "c", pureType); args_setPtrWithType(obj->list, name, "c", newObj); res = obj_getPtr(obj, name); goto exit; @@ -557,4 +554,4 @@ PikaObj* New_PikaObj(void) { /* List */ self->list = New_args(NULL); return self; -} \ No newline at end of file +} diff --git a/src/PikaParser.c b/src/PikaParser.c index 00ba3f4d6..c9d90135f 100644 --- a/src/PikaParser.c +++ b/src/PikaParser.c @@ -16,7 +16,6 @@ char* strsPopTokenWithSkip(Args* buffs, return NULL; } char* strOut = args_getBuff(buffs, size); - int32_t iOut = 0; int32_t stmtEnd = 0; uint8_t isGetSign = 0; int32_t parentheseDeepth = 0; @@ -500,4 +499,4 @@ char* AST_toPikaAsm(AST* ast, Args* buffs) { int32_t AST_deinit(AST* ast) { return obj_deinit(ast); -} \ No newline at end of file +} diff --git a/src/PikaParser.h b/src/PikaParser.h index bcd9c4a7a..9e0ade85d 100644 --- a/src/PikaParser.h +++ b/src/PikaParser.h @@ -10,4 +10,4 @@ int32_t AST_deinit(AST* ast); char* AST_toPikaAsm(AST* ast, Args* buffs); char* pikaParseMultiLineToAsm(Args* outBuffs, char* multiLine); -#endif \ No newline at end of file +#endif diff --git a/src/PikaPlatform.c b/src/PikaPlatform.c index a7301d61f..f07a3c196 100644 --- a/src/PikaPlatform.c +++ b/src/PikaPlatform.c @@ -4,11 +4,11 @@ #include #include -PIKA_WEAK void __platformDisableIrqHandle() { +PIKA_WEAK void __platformDisableIrqHandle(void) { /* disable irq to support thread */ } -PIKA_WEAK void __platformEnableIrqHandle() { +PIKA_WEAK void __platformEnableIrqHandle(void) { /* disable irq to support thread */ } @@ -23,12 +23,11 @@ PIKA_WEAK void __platformFree(void* ptr) { PIKA_WEAK void __platformPrintf(char* fmt, ...) { va_list args; va_start(args, fmt); - char sysOut[128] = {0}; vprintf(fmt, args); va_end(args); } -PIKA_WEAK char* __platformLoadPikaAsm() { +PIKA_WEAK char* __platformLoadPikaAsm(void) { /* faild */ return NULL; } @@ -43,6 +42,6 @@ PIKA_WEAK uint8_t __platformAsmIsToFlash(char* pyMultiLine) { return 0; } -PIKA_WEAK int32_t __platformSavePikaAsmEOF() { +PIKA_WEAK int32_t __platformSavePikaAsmEOF(void) { return 1; } diff --git a/src/PikaPlatform.h b/src/PikaPlatform.h index d55295dbe..7a1a4f2e6 100644 --- a/src/PikaPlatform.h +++ b/src/PikaPlatform.h @@ -14,12 +14,12 @@ void __platformPrintf(char* fmt, ...); void* __platformMalloc(size_t size); void __platformFree(void* ptr); -void __platformEnableIrqHandle(); -void __platformDisableIrqHandle(); +void __platformEnableIrqHandle(void); +void __platformDisableIrqHandle(void); -char* __platformLoadPikaAsm(); +char* __platformLoadPikaAsm(void); int32_t __platformSavePikaAsm(char *PikaAsm); uint8_t __platformAsmIsToFlash(char *pyMultiLine); -int32_t __platformSavePikaAsmEOF(); +int32_t __platformSavePikaAsmEOF(void); -#endif \ No newline at end of file +#endif diff --git a/src/PikaVM.c b/src/PikaVM.c index d18108089..7ecc1abd2 100644 --- a/src/PikaVM.c +++ b/src/PikaVM.c @@ -73,14 +73,16 @@ static enum Instruct getInstruct(char* line) { int fast_atoi(char* src) { const char* p = src; static const uint64_t a[][10] = { - 0, 1e0, 2e0, 3e0, 4e0, 5e0, 6e0, 7e0, 8e0, 9e0, 0, 1e1, 2e1, - 3e1, 4e1, 5e1, 6e1, 7e1, 8e1, 9e1, 0, 1e2, 2e2, 3e2, 4e2, 5e2, - 6e2, 7e2, 8e2, 9e2, 0, 1e3, 2e3, 3e3, 4e3, 5e3, 6e3, 7e3, 8e3, - 9e3, 0, 1e4, 2e4, 3e4, 4e4, 5e4, 6e4, 7e4, 8e4, 9e4, 0, 1e5, - 2e5, 3e5, 4e5, 5e5, 6e5, 7e5, 8e5, 9e5, 0, 1e6, 2e6, 3e6, 4e6, - 5e6, 6e6, 7e6, 8e6, 9e6, 0, 1e7, 2e7, 3e7, 4e7, 5e7, 6e7, 7e7, - 8e7, 9e7, 0, 1e8, 2e8, 3e8, 4e8, 5e8, 6e8, 7e8, 8e8, 9e8, 0, - 1e9, 2e9, 3e9, 4e9, 5e9, 6e9, 7e9, 8e9, 9e9, + {0, 1e0, 2e0, 3e0, 4e0, 5e0, 6e0, 7e0, 8e0, 9e0}, + {0, 1e1, 2e1, 3e1, 4e1, 5e1, 6e1, 7e1, 8e1, 9e1}, + {0, 1e2, 2e2, 3e2, 4e2, 5e2, 6e2, 7e2, 8e2, 9e2}, + {0, 1e3, 2e3, 3e3, 4e3, 5e3, 6e3, 7e3, 8e3, 9e3}, + {0, 1e4, 2e4, 3e4, 4e4, 5e4, 6e4, 7e4, 8e4, 9e4}, + {0, 1e5, 2e5, 3e5, 4e5, 5e5, 6e5, 7e5, 8e5, 9e5}, + {0, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, 7e6, 8e6, 9e6}, + {0, 1e7, 2e7, 3e7, 4e7, 5e7, 6e7, 7e7, 8e7, 9e7}, + {0, 1e8, 2e8, 3e8, 4e8, 5e8, 6e8, 7e8, 8e8, 9e8}, + {0, 1e9, 2e9, 3e9, 4e9, 5e9, 6e9, 7e9, 8e9, 9e9}, }; uint16_t size = strGetSize(src); p = p + size - 1; @@ -180,12 +182,10 @@ Arg* pikaVM_runInstruct(PikaObj* self, } } if (instruct == OPT) { - char* operator= data; Arg* outArg = NULL; Arg* arg1 = arg_copy(queue_popArg(invokeQuene1)); Arg* arg2 = arg_copy(queue_popArg(invokeQuene1)); - if (strEqu(arg_getType(arg1), "i") && - strEqu(arg_getType(arg2), "i")) { + if (strEqu(arg_getType(arg1), "i") && strEqu(arg_getType(arg2), "i")) { int num1 = arg_getInt(arg1); int num2 = arg_getInt(arg2); if (strEqu("+", data)) { @@ -217,8 +217,7 @@ Arg* pikaVM_runInstruct(PikaObj* self, goto OPT_exit; } } - if (strEqu(arg_getType(arg1), "f") && - strEqu(arg_getType(arg2), "i")) { + if (strEqu(arg_getType(arg1), "f") && strEqu(arg_getType(arg2), "i")) { float num1 = arg_getFloat(arg1); int num2 = arg_getInt(arg2); if (strEqu("+", data)) { @@ -250,8 +249,7 @@ Arg* pikaVM_runInstruct(PikaObj* self, goto OPT_exit; } } - if (strEqu(arg_getType(arg1), "i") && - strEqu(arg_getType(arg2), "f")) { + if (strEqu(arg_getType(arg1), "i") && strEqu(arg_getType(arg2), "f")) { int num1 = arg_getInt(arg1); float num2 = arg_getFloat(arg2); if (strEqu("+", data)) { @@ -283,8 +281,7 @@ Arg* pikaVM_runInstruct(PikaObj* self, goto OPT_exit; } } - if (strEqu(arg_getType(arg1), "f") && - strEqu(arg_getType(arg2), "f")) { + if (strEqu(arg_getType(arg1), "f") && strEqu(arg_getType(arg2), "f")) { float num1 = arg_getFloat(arg1); float num2 = arg_getFloat(arg2); if (strEqu("+", data)) { @@ -531,7 +528,6 @@ int32_t pikaVM_runAsmLine(PikaObj* self, args_setErrorCode(locals->list, 0); args_setSysOut(locals->list, (char*)""); __clearInvokeQueues(locals); - uint8_t blockDeepth = line[1] - '0'; goto nextLine; } @@ -627,7 +623,6 @@ Parameters* pikaVM_runAsm(PikaObj* self, char* pikaAsm) { Parameters* pikaVM_run(PikaObj* self, char* multiLine) { Args* buffs = New_strBuff(); char* pikaAsm = pikaParseMultiLineToAsm(buffs, multiLine); - uint32_t asm_size = strGetSize(pikaAsm); Parameters* globals = pikaVM_runAsm(self, pikaAsm); if (NULL != buffs) { args_deinit(buffs); diff --git a/src/PikaVM.h b/src/PikaVM.h index ba4c2734d..7ea99f2ee 100644 --- a/src/PikaVM.h +++ b/src/PikaVM.h @@ -20,4 +20,4 @@ int32_t pikaVM_runAsmLine(PikaObj* self, char* pikaAsm, int32_t lineAddr); -#endif \ No newline at end of file +#endif diff --git a/src/dataArg.c b/src/dataArg.c index 63f95c744..594c6f16f 100644 --- a/src/dataArg.c +++ b/src/dataArg.c @@ -103,7 +103,6 @@ uint8_t* content_init(char* name, } uint16_t content_totleSize(uint8_t* self) { - Hash nameHash = content_getNameHash(self); char* type = content_getType(self); const uint8_t sizeLenth = 2; const uint8_t nextLength = sizeof(uint8_t*); @@ -219,7 +218,6 @@ char* content_getType(uint8_t* self) { uint16_t content_contentOffset(uint8_t* self) { const uint8_t nextLength = sizeof(uint8_t*); const uint8_t sizeLength = 2; - Hash nameHash = content_getNameHash(self); return nextLength + sizeLength + sizeof(Hash); } diff --git a/src/dataQueue.c b/src/dataQueue.c index 6e774b78f..5ae2e5422 100644 --- a/src/dataQueue.c +++ b/src/dataQueue.c @@ -139,4 +139,4 @@ Arg* queue_popArg(Queue* queue) { char buff[11]; Arg* res = args_getArg(args, fast_itoa(buff, bottom)); return res; -} \ No newline at end of file +} diff --git a/src/dataQueue.h b/src/dataQueue.h index 28f82ce9b..f46111848 100644 --- a/src/dataQueue.h +++ b/src/dataQueue.h @@ -21,4 +21,4 @@ int64_t queue_popInt(Queue* queue); float queue_popFloat(Queue* queue); char* queue_popStr(Queue* queue); Arg* queue_popArg(Queue* queue); -#endif \ No newline at end of file +#endif diff --git a/src/dataQueueObj.c b/src/dataQueueObj.c index 1d57d014c..cc4c447dd 100644 --- a/src/dataQueueObj.c +++ b/src/dataQueueObj.c @@ -95,4 +95,4 @@ char* queueObj_popStr(QueueObj* self) { /* add bottom */ obj_setInt(self, "bottom", bottom + 1); return obj_getStr(self, bottomStr); -} \ No newline at end of file +} diff --git a/src/dataQueueObj.h b/src/dataQueueObj.h index 0c6a9ea0d..19f904f92 100644 --- a/src/dataQueueObj.h +++ b/src/dataQueueObj.h @@ -18,4 +18,4 @@ PikaObj* queueObj_popObj(QueueObj* self); PikaObj* queueObj_getCurrentObj(QueueObj* self); -#endif \ No newline at end of file +#endif diff --git a/src/dataStack.c b/src/dataStack.c index 74cf588e1..4518d42e3 100644 --- a/src/dataStack.c +++ b/src/dataStack.c @@ -31,4 +31,4 @@ char* stack_popStr(Stack* queue, char* outBuff) { strcpy(outBuff, args_getStr(args, topStr)); args_removeArg(args, args_getArg(args, topStr)); return outBuff; -} \ No newline at end of file +} diff --git a/src/dataStack.h b/src/dataStack.h index d8003cae0..0f74e74c3 100644 --- a/src/dataStack.h +++ b/src/dataStack.h @@ -13,4 +13,4 @@ int32_t stack_deinit(Stack* stack); int32_t stack_pushStr(Stack* stack, char* str); char* stack_popStr(Stack* queue, char* outBuff); -#endif \ No newline at end of file +#endif diff --git a/src/dataString.c b/src/dataString.c index 3333a5b71..28d702899 100644 --- a/src/dataString.c +++ b/src/dataString.c @@ -130,7 +130,6 @@ char* strGetLastLine(char* strOut, char* strIn) { char* strGetLastToken(char* strOut, char* strIn, char sign) { int32_t size = strGetSize(strIn); - int32_t isGetSign = 0; int32_t buffSize = 0; for (int32_t i = size - 1; i > -1; i--) { if (strIn[i] != sign) { @@ -138,7 +137,6 @@ char* strGetLastToken(char* strOut, char* strIn, char sign) { buffSize++; } if (strIn[i] == sign) { - isGetSign = 1; break; } }