fix test case

Author: pikasTech

port/linux/.vscode/launch.json

@@ -13,7 +13,8 @@
             "args": [
                 // "--gtest_filter=module.REPL_big_script"
                 // "--gtest_filter=parser.input_issue1"
-                "--gtest_filter=except.raise_type"
+                // "--gtest_filter=except.raise_type"
+                "--gtest_filter=module.REPL_big_script"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",

port/linux/test/module-test.cpp

@@ -603,7 +603,7 @@ TEST(module, REPL_big_script) {
     fclose((FILE*)f_getchar_fp);
     /* collect */
     /* assert */
-    EXPECT_STREQ(log_buff[3],
+    EXPECT_STREQ(log_buff[0],
                  "\r\nError: line buff overflow, please use bigger "
                  "'PIKA_LINE_BUFF_SIZE'\r\n");
     /* deinit */

port/linux/test/pikaMain-test.cpp

@@ -2755,8 +2755,8 @@ TEST(pikaMain, REPL_backspace) {
 
 #if PIKA_TAB_ENABLE
 TEST(pikaMain, REPL_tab_completion) {
-    char lines[] = {'p', 'r', 0x09, '(', '\"',
-                    't', 'e', 's', 't', '\"', ')', '\r', '\n', 0x00};
+    char lines[] = {'p', 'r', 0x09, '(', '\"', 't',  'e',
+                    's', 't', '\"', ')', '\r', '\n', 0x00};
     /* init */
     g_PikaMemInfo.heapUsedMax = 0;
     PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);

src/PikaObj.c

@@ -1395,121 +1395,6 @@ typedef enum {
     __FILTER_SUCCESS_DROP_ALL_PEEKED
 } FilterReturn;
 
-typedef struct {
-    int count;
-    char **completions;
-} CompletionList;
-
-typedef struct {
-    char lineBuff[PIKA_LINE_BUFF_SIZE];
-    size_t line_position;
-    size_t line_curpos;
-    char prefix[32];
-} Shell;
-
-const char *dictionary[] = {
-    "import", "PikaStdLib", "from", "high", "low", "Pin", "value", "def", 
-    "PikaStdDevice", "setPin", "enable", "print", "sleep_ms", "read", 
-    "setMode", "setCallBack", "setPull", "as", "MemChecker", "max", "min",
-    "float", "int", "str", "list", "dict", "tuple", "if", "else", 
-    "elif", "for", "while", "break", "continue", "return", "try", "except",
-    "finally", "with", "open", "write", "append", "close", "True", "False", 
-    "None", "self", "class", "init", "len", "range", "input", "output",
-    "config", "setup", "loop", "GPIO", "UART", "I2C", "SPI", "ADC", "PWM",
-    "digitalRead", "digitalWrite", "analogRead", "analogWrite", "time", "datetime",
-    "random", "OS", "sys", "math", "json", "readFile", "writeFile",
-    ""
-};
-
-int dictSize = sizeof(dictionary) / sizeof(dictionary[0]);
-
-static CompletionList filtered_complete = {0, NULL};
-
-void shCompletePrint(CompletionList *completeList, const char *prefix) {
-    for (int i = 0; i < completeList->count; i++) {
-        printf("%s  ", completeList->completions[i]);
-    }
-}
-
-void getFilteredCompletions(const char* prefix, const char** dictionary, int dictSize, CompletionList *result) {
-    printf("\n");
-    if (result->completions != NULL) {
-        for (int i = 0; i < result->count; i++) {
-            free(result->completions[i]);
-        }
-        free(result->completions);
-        result->completions = NULL;
-    }
-    result->count = 0;
-    result->completions = (char**)malloc(dictSize * sizeof(char*));
-    if (result->completions == NULL) {
-        printf("Memory allocation failed\n");
-        return;
-    }
-
-    for (int i = 0; i < dictSize; i++) {
-        if (strncmp(dictionary[i], prefix, strlen(prefix)) == 0) {
-            result->completions[result->count] = strdup(dictionary[i]);
-            if (result->completions[result->count] == NULL) {
-                printf("Memory allocation failed for completion\n");
-                continue;
-            }
-            result->count++;
-        }
-    }
-
-    if (result->count == 0) {
-        printf("Warning: No matches found for '%s'\n", prefix);
-    }
-}
-
-/*free CompletionList*/
-void freeCompletionList(CompletionList *list) {
-    for (int i = 0; i < list->count; ++i) {
-        free(list->completions[i]);
-    }
-    free(list->completions);
-    list->completions = NULL;
-    list->count = 0;
-}
-
-void handleTabCompletion(ShellConfig* shell, char* prefix) {
-#if PIKA_TAB_ENABLE
-    if (shell->line_position > 0) {
-        if (prefix == NULL) {
-            printf("Memory allocation failed for prefix\n");
-            return;
-        }
-
-        // printf("\n================[fetch : %s ]=====================\n", prefix);
-        getFilteredCompletions(prefix, dictionary, dictSize, &filtered_complete);
-
-        if (filtered_complete.count == 1) {
-            char* last_space = strrchr(shell->lineBuff, ' ');
-            size_t start_pos = 0;
-
-            if (last_space != NULL) {
-                /*保留空格以前的内容*/
-                start_pos = last_space - shell->lineBuff + 1;
-            }
-
-            memset(shell->lineBuff + start_pos, 0, sizeof(shell->lineBuff) - start_pos);
-            strncpy(shell->lineBuff + start_pos, filtered_complete.completions[0], sizeof(shell->lineBuff) - start_pos - 1);
-            shell->lineBuff[sizeof(shell->lineBuff) - 1] = '\0';
-            shell->line_position = strlen(shell->lineBuff);
-            shell->line_curpos = shell->line_position;
-
-            printf(">>> %s", shell->lineBuff);
-        } else {
-            shCompletePrint(&filtered_complete, prefix);
-            printf("\n>>> %s", shell->lineBuff);
-        }
-        free(prefix);
-    }
-#endif
-    freeCompletionList(&filtered_complete);
-}
-
 pika_bool _filter_msg_hi_pika_handler(FilterItem* msg,
                                       PikaObj* self,
                                       ShellConfig* shell) {
@@ -1783,14 +1668,6 @@ enum shellCTRL _inner_do_obj_runChar(PikaObj* self,
                                      ShellConfig* shell) {
     char* input_line = NULL;
     enum shellCTRL ctrl = SHELL_CTRL_CONTINUE;
-    static uint64_t tick_start_block_input = 0;
-    if (tick_start_block_input != 0) {
-        if (pika_platform_get_tick() - tick_start_block_input < 5000) {
-            return SHELL_CTRL_CONTINUE;
-        } else {
-            tick_start_block_input = 0;
-        }
-    }
     if (inputChar == 0x7F) {
         inputChar = '\b';
     }
@@ -1805,33 +1682,6 @@ enum shellCTRL _inner_do_obj_runChar(PikaObj* self,
         ctrl = SHELL_CTRL_CONTINUE;
         goto __exit;
     }
-    if (inputChar == 0x09) {
-#if PIKA_TAB_ENABLE
-        if (shell->line_position > 0) {
-            // printf("Current cursor position: %zu, Line position: %zu\n", shell->line_curpos, shell->line_position);
-            char* shell_content = NULL;
-            char* last_space = strrchr(shell->lineBuff, ' ');
-
-            if (last_space == NULL) {
-                shell_content = strndup(shell->lineBuff, shell->line_position);
-            } else {
-                shell_content = strdup(last_space + 1);
-            }
-
-            if (shell_content == NULL) {
-                printf("Memory allocation failed for shell_content\n");
-                // return;
-            }
-
-            handleTabCompletion(shell, shell_content);
-            ctrl = SHELL_CTRL_CONTINUE;
-            // __clearBuff(shell);
-            goto __exit;
-        }
-#endif
-        ctrl = SHELL_CTRL_CONTINUE;
-        goto __exit;
-    }
     if (inputChar == 0x1b) {
         shell->stat = PIKA_SHELL_STATE_WAIT_SPEC_KEY;
         ctrl = SHELL_CTRL_CONTINUE;
@@ -1912,12 +1762,7 @@ enum shellCTRL _inner_do_obj_runChar(PikaObj* self,
             pika_platform_printf(
                 "\r\nError: line buff overflow, please use bigger "
                 "'PIKA_LINE_BUFF_SIZE'\r\n");
-            ctrl = SHELL_CTRL_CONTINUE;
-            pika_platform_printf(
-                "Input is blocked for 5 seconds to protect the "
-                "kernel...\r\n");
-            tick_start_block_input = pika_platform_get_tick();
-            pika_platform_printf(">>> ");
+            ctrl = SHELL_CTRL_EXIT;
             __clearBuff(shell);
             goto __exit;
         }
@@ -2136,12 +1981,6 @@ void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg) {
     while (1) {
         inputChar[1] = inputChar[0];
         inputChar[0] = _await_getchar(cfg->fn_getchar);
-#ifdef __linux
-        if (inputChar[0] == EOF) {
-            pika_platform_printf("\r\n");
-            return;
-        }
-#endif
 #if !PIKA_NANO_ENABLE
         /* run python script */
         if (inputChar[0] == '!' && inputChar[1] == '#') {

src/PikaObj.h

@@ -498,10 +498,6 @@ char* shHistory_getPrev(ShellHistory* self);
 char* shHistory_getNext(ShellHistory* self);
 #endif
 
-#if PIKA_TAB_ENABLE
-void handleTabCompletion(ShellConfig* shell, char* prefix);
-#endif
-
 void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg);
 
 void _temp__do_pikaScriptShell(PikaObj* self, ShellConfig* cfg);

src/PikaParser.c

@@ -2720,9 +2720,7 @@ static char* Suger_semicolon(Args* outbuffs, char* sLine) {
         sStmtItem = strsAppend(&buffs, sStmtItem, "\n");
         sStmtAfter = strsAppend(&buffs, sStmtAfter, sStmtItem);
     }
-    if (sStmtAfter[0] != '\0') {
-        sStmtAfter[strGetSize(sStmtAfter) - 1] = '\0';
-    }
+    sStmtAfter[strGetSize(sStmtAfter) - 1] = '\0';
     sStmtAfter = strsCopy(outbuffs, sStmtAfter);
     strsDeinit(&buffs);
     return sStmtAfter;

src/PikaVersion.h

@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 4
 
-#define PIKA_EDIT_TIME "2024/12/02 21:04:57"
+#define PIKA_EDIT_TIME "2025/05/21 20:12:08"

src/pika_config_valid.h

@@ -93,10 +93,6 @@ extern "C" {
             #define PIKA_SHELL_HISTORY_ENABLE 0
         #endif
 
-        #ifndef PIKA_TAB_ENABLE
-            #define PIKA_TAB_ENABLE 0
-        #endif
-        
     #endif
 
     /* default optimize */
@@ -499,10 +495,6 @@ extern "C" {
         #define PIKA_SHELL_HISTORY_ENABLE 1
     #endif
 
-    #ifndef PIKA_TAB_ENABLE
-        #define PIKA_TAB_ENABLE 1
-    #endif
-
     #ifndef PIKA_SHELL_HISTORY_NUM
         #define PIKA_SHELL_HISTORY_NUM 5
     #endif