X-Git-Url: https://gitweb.ps.run/iftint/blobdiff_plain/b836e0a4630c9cf8c098b18bca83a3323e181b7f..HEAD:/main2.c diff --git a/main2.c b/main2.c index 5ea32ef..3dcbf84 100644 --- a/main2.c +++ b/main2.c @@ -14,7 +14,34 @@ #define NEWARR(TYPE, NUM) ((TYPE *)calloc(NUM, sizeof(TYPE))) -// getch() +// Util + +bool +charInString(char c, const char * str) { + for (int i = 0; i < strlen(str); i++) + if (c == str[i]) + return true; + return false; +} + +bool +isNewline(char c) { + return c == '\n' || c == '\r'; +} +bool +isBackspace(char c) { + return c == 8 || c == 127; +} + + +// Key defines + +#define KEY_CTRL_C 3 +#define KEY_BACKSPACE1 8 +#define KEY_BACKSPACE2 127 + + +// getch #ifdef _WIN32 #include @@ -78,6 +105,16 @@ void vt100CursorHome() { vt100Escape("[H"); } void vt100CursorPos(int v, int h) { vt100Escape("[%d;%dH", v, h); } void vt100SaveCursor() { vt100Escape("7"); } void vt100RestoreCursor() { vt100Escape("8"); } +// void vt100GetCursor(int * v, int * h) { +// *v = *h = 0; +// printf("\033[6n"); +// getch(); getch(); +// int c; +// while ((c = getch()) != ';') +// *v = (10*(*v)+(c-'0')); +// while ((c = getch()) != 'R') +// *h = (10*(*h)+(c-'0')); +// } void vt100GetScreenSize(int * v, int * h) { #ifdef _WIN32 CONSOLE_SCREEN_BUFFER_INFO csbi; @@ -91,6 +128,8 @@ void vt100GetScreenSize(int * v, int * h) { *v = w.ws_col; #endif } +void vt100EnableAlternateBuffer() { vt100Escape("[?1049h"); } +void vt100DisableAlternateBuffer() { vt100Escape("[?1049l"); } // JSON @@ -101,6 +140,7 @@ typedef enum { JSONNodeKind_Str, JSONNodeKind_Obj, JSONNodeKind_Arr, + JSONNodeKind_COUNT } JSONNodeKind; struct JSONNode; @@ -108,78 +148,59 @@ typedef struct JSONNode { JSONNodeKind kind; size_t data; struct JSONNode * parent; - struct JSONNode * children; + struct JSONNode * firstChild; + int childCount; + struct JSONNode * prev; struct JSONNode * next; } JSONNode; JSONNode * -JSONNodeNew(JSONNodeKind kind, size_t data) { +JSONNodeNew(JSONNodeKind kind) { JSONNode * result = NEW(JSONNode); result->kind = kind; - result->data = data; return result; } -JSONNode * -JSONNodeNewNul() { - return JSONNodeNew(JSONNodeKind_Nul, (size_t)NULL); -} - -JSONNode * -JSONNodeNewInt(int i) { - return JSONNodeNew(JSONNodeKind_Int, (size_t)i); -} - -JSONNode * -JSONNodeNewStr(const char * str) { - return JSONNodeNew(JSONNodeKind_Str, (size_t)str); -} - -JSONNode * -JSONNodeNewObj() { - return JSONNodeNew(JSONNodeKind_Obj, (size_t)NULL); -} - -JSONNode * -JSONNodeNewArr() { - return JSONNodeNew(JSONNodeKind_Arr, (size_t)NULL); -} - JSONNode * JSONNodePush(JSONNode * this, JSONNode * that) { - if (this->children == NULL) { - this->children = that; + if (this->firstChild == NULL) { + this->firstChild = that; } else { - JSONNode * lastNode = this->children; + JSONNode * lastNode = this->firstChild; while (lastNode->next != NULL) lastNode = lastNode->next; lastNode->next = that; + that->prev = lastNode; } + this->childCount++; that->parent = this; - that->next = NULL; return that; } -void -JSONNodePop(JSONNode * this) { - if (this != NULL) { - JSONNode * ptr = this->children; - - if (ptr == NULL) { // no children - JSONNodePop(this->parent); - } - else if (ptr->next == NULL) { // one child - this->children = NULL; - - } - else { // more than one child - while (ptr->next->next != NULL) - ptr = ptr->next; - ptr->next = NULL; - } +JSONNode * +JSONNodeRemove(JSONNode * node) { + if (node->prev == NULL) { // first child + node->parent->firstChild = node->next; + if (node->next != NULL) + node->next->prev = NULL; + return node->parent; } + else { // second child + node->prev->next = node->next; + if (node->next != NULL) + node->next->prev = node->prev; + return node->prev; + } +} + +bool +JSONNodeEditable(JSONNode * node) { + if (node == NULL) return false; + else if (node->kind == JSONNodeKind_Int) return true; + else if (node->kind == JSONNodeKind_Str) return true; + return false; } void @@ -189,22 +210,26 @@ Indent(int indent) { } void -JSONNodePrint(JSONNode * node) { +JSONNodePrint(JSONNode * node, JSONNode * currNode) { if (node == NULL) return; static int indent; if (node->parent == NULL) indent = 0; - + + if (currNode == node) { + vt100SaveCursor(); + } + switch (node->kind) { case JSONNodeKind_Nul: { printf("null"); break; } case JSONNodeKind_Int: { - int i = (int)node->data; - printf("%d", i); + char * str = (char *)node->data; + printf("%s", (str == NULL || strlen(str) == 0) ? "0" : str); break; } case JSONNodeKind_Str: { @@ -214,19 +239,17 @@ JSONNodePrint(JSONNode * node) { } case JSONNodeKind_Obj: { printf("{\n"); - JSONNode * ptr = node->children; + JSONNode * ptr = node->firstChild; indent++; while (ptr != NULL) { - char * key = (char *)ptr->data; - JSONNode * value = ptr->next; Indent(indent); - printf("\"%s\": ", key); - JSONNodePrint(value); + JSONNodePrint(ptr, currNode); + printf(": "); + JSONNodePrint(ptr->firstChild, currNode); if (ptr->next != NULL) - ptr = ptr->next->next; - else - ptr = NULL; - printf("%s\n", (ptr == NULL ? "" : ",")); + printf(","); + ptr = ptr->next; + printf("\n"); } indent--; Indent(indent); @@ -234,15 +257,20 @@ JSONNodePrint(JSONNode * node) { break; } case JSONNodeKind_Arr: { - printf("[ "); - JSONNode * ptr = node->children; + printf("[\n"); + JSONNode * ptr = node->firstChild; + indent++; while (ptr != NULL) { - JSONNode * value = ptr; - JSONNodePrint(value); + Indent(indent); + JSONNodePrint(ptr, currNode); + if (ptr->next != NULL) + printf(","); + printf("\n"); ptr = ptr->next; - printf("%s", (ptr == NULL ? "" : ", ")); } - printf(" ]"); + indent--; + Indent(indent); + printf("]"); break; } } @@ -252,22 +280,17 @@ JSONNodePrint(JSONNode * node) { // Input JSONNode * g_DrawNode = NULL; -const char * g_DrawStr = ""; +JSONNode * g_CurrNode = NULL; void Draw(void) { vt100ClearScreen(); vt100CursorHome(); - if (g_DrawNode != NULL) - JSONNodePrint(g_DrawNode); - - int v, h; - vt100GetScreenSize(&v, &h); - vt100CursorPos(v, 0); - printf("> %s", g_DrawStr); - - vt100CursorPos(v, strlen(g_DrawStr) + 3); + if (g_DrawNode != NULL) { + JSONNodePrint(g_DrawNode, g_CurrNode); + vt100RestoreCursor(); + } } int @@ -279,106 +302,104 @@ GetChar() { int PeekChar() { - int c = GetChar(); - ungetch(c); + Draw(); + int c = peekch(); return c; } -int -GetInt() { - static char intStr[16]; - intStr[0] = '\0'; - int intStrLen = 0; - int result = 0; - int c; - g_DrawStr = intStr; - while ((c = GetChar()), (c != '\r') && (c != '\n')) { - if ((c == 8 || c == 127) && intStrLen > 0) { - intStrLen--; - intStr[intStrLen] = '\0'; - result /= 10; - } - else if (intStrLen < 16 - 1 && (c >= '0' && c <= '9')) { - intStr[intStrLen++] = c; - intStr[intStrLen] = '\0'; - result *= 10; - result += c - '0'; - } - } - g_DrawStr = ""; - return result; -} +typedef bool(*CharPredicateFunc)(char, int); -char * -GetStr() { - char * str = NEWARR(char, 16); - int strLen = 0; - int c; - g_DrawStr = str; - while ((c = GetChar()), (c != '\r') && (c != '\n')) { - if ((c == 8 || c == 127) && strLen > 0) { - strLen--; - str[strLen] = '\0'; - } - else if (strLen < 16 - 1) { - str[strLen++] = c; - str[strLen] = '\0'; - } - } - g_DrawStr = ""; - return str; -} +bool predStr(char c, int i) { return c >= 'a' && c <= 'z'; } +bool predInt(char c, int i) { return c >= '0' && c <= '9'; } JSONNode * -GetNode(JSONNode * parent) { - int c = GetChar(); +GetNode() { + JSONNode * result = NULL; + JSONNode * node = NULL; + int c; + int strLen = 0; - JSONNode * result = JSONNodeNewNul(); - - if (parent == NULL) - g_DrawNode = result; + typedef enum { + InputState_Initial, + InputState_Primitive, + InputState_Object, + InputState_KeyValue, + InputState_Array, + } InputState; + InputState inputState; - if (parent != NULL && result != NULL) - JSONNodePush(parent, result); + bool editingNode = false; - switch (c) { - case 'i': { - result->kind = JSONNodeKind_Int; - result->data = (size_t)GetInt(); - break; - } - case 's': { - result->kind = JSONNodeKind_Str; - result->data = (size_t)GetStr(); - break; - } - case 'o': { - result->kind = JSONNodeKind_Obj; - while ((c = peekch()), (c != '\r') && (c != '\n')) { - JSONNodePush(result, JSONNodeNewStr(GetStr())); + while (true) { + c = GetChar(); + + if (c == KEY_CTRL_C) + break; - JSONNodePush(result, GetNode(result)); + if (isNewline(c)) { + if (node == NULL || node->parent == NULL) + break; + + if (node->parent->kind == JSONNodeKind_Obj) // editing obj key + g_CurrNode = node = node->firstChild; + else if (node->parent->kind == JSONNodeKind_Str) // editing obj value + g_CurrNode = node = node->parent->parent; + else + g_CurrNode = node = node->parent; + + editingNode = JSONNodeEditable(node); + + continue; } - getch(); - break; - } - case 'a': { - result->kind = JSONNodeKind_Arr; - while ((c = peekch()), (c != '\r') && (c != '\n')) { - JSONNodePush(result, GetNode(result)); + + if (JSONNodeEditable(node) && editingNode) { + if (node->data == (size_t)NULL) { + node->data = (size_t)NEWARR(char, 16); + strLen = 0; + } + char * str = (char *)node->data; + + if (isBackspace(c)) { + str[strLen-1] = '\0'; + strLen--; + } + else if (strLen < 16 - 1) { + str[strLen] = c; + str[strLen+1] = '\0'; + strLen++; + } + } + else { + JSONNode * old = node; + + /**/ if (c == 'i') { node = JSONNodeNew(JSONNodeKind_Int); editingNode = true; } + else if (c == 's') { node = JSONNodeNew(JSONNodeKind_Str); editingNode = true; } + else if (c == 'o') { node = JSONNodeNew(JSONNodeKind_Obj); } + else if (c == 'a') { node = JSONNodeNew(JSONNodeKind_Arr); } + else if (c == 'h') { if (node->prev != NULL) g_CurrNode = node = node->prev; continue; } + else if (c == 'l') { if (node->next != NULL) g_CurrNode = node = node->next; continue; } + else if (c == 'k') { if (node->parent != NULL) g_CurrNode = node = node->parent; continue; } + else if (c == 'j') { if (node->firstChild != NULL) g_CurrNode = node = node->firstChild; continue; } + else if (c == ' ') { if (JSONNodeEditable(node)) editingNode = true; continue; } + else if (isBackspace(c) && node != NULL) { g_CurrNode = node = JSONNodeRemove(node); continue; } + else { continue; } + + if (old != NULL) { + // new node was added to an object + if (old->kind == JSONNodeKind_Obj) { + JSONNode * keyNode = JSONNodeNew(JSONNodeKind_Str); + JSONNodePush(keyNode, node); + node = keyNode; + editingNode = true; + } + JSONNodePush(old, node); + } + else { + g_DrawNode = result = node; + } + + g_CurrNode = node; } - getch(); - break; - } - case 8: - case 127: - JSONNodePop(parent); - result = GetNode(parent); - break; - case 't': - result->kind = JSONNodeKind_Int; - result->data = (size_t)GetChar(); - break; } return result; @@ -388,15 +409,13 @@ GetNode(JSONNode * parent) { int main() { - Draw(); + vt100EnableAlternateBuffer(); - JSONNode * n = GetNode(NULL); - //JSONNode * n = TestNode(); + JSONNode * n = GetNode(); + + vt100DisableAlternateBuffer(); - vt100ClearScreen(); - vt100CursorHome(); - JSONNodePrint(n); - printf("\n"); + JSONNodePrint(n, NULL); // JSONFree(n);