reimplement GetNode, node traversal and removing :D

diff --git a/main2.c b/main2.c
index 657fd0eff417f9d40f66b174fc9fd8060600aea7..80f6a171febeda78e83f076dd945ec8fcce965af 100644 (file)
--- a/main2.c
+++ b/main2.c
@@ -28,6 +28,10 @@ bool
 isNewline(char c) {
     return c == '\n' || c == '\r';
 }
 isNewline(char c) {
     return c == '\n' || c == '\r';
 }

+bool
+isBackspace(char c) {
+    return c == 8 || c == 127;
+}

 
 
 // getch
 
 
 // getch


@@ -168,6 +172,22 @@ JSONNodePush(JSONNode * this, JSONNode * that) {
     return that;
 }
 
     return that;
 }
 

+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;
+    }
+}
+

 void
 Indent(int indent) {
     for (int i = 0; i < indent; i++)
 void
 Indent(int indent) {
     for (int i = 0; i < indent; i++)


@@ -281,98 +301,71 @@ typedef bool(*CharPredicateFunc)(char, int);
 bool predStr(char c, int i) { return c >= 'a' && c <= 'z'; }
 bool predInt(char c, int i) { return c >= '0' && c <= '9'; }
 
 bool predStr(char c, int i) { return c >= 'a' && c <= 'z'; }
 bool predInt(char c, int i) { return c >= '0' && c <= '9'; }
 

-void
-GetStr(JSONNode * node, CharPredicateFunc charPredicate) {
-    node->data = (size_t)NEWARR(char, 16);
-    int strLen = 0;
-
-    char * str = (char *)node->data;
-    
-    int c;
-    while ((c = PeekChar()), ! isNewline(c)) {
-        getch();
-        if ((c == 8 || c == 127) && strLen > 0) {
-            strLen--;
-            str[strLen] = '\0';
-        }
-        else if (strLen < 16 - 1 && charPredicate(c, strLen)) {
-            str[strLen] = c;
-            strLen++;
-            str[strLen] = '\0';
-        }
-    }
-}
-

 JSONNode *
 GetNode() {
     JSONNode * result = NULL;
 JSONNode *
 GetNode() {
     JSONNode * result = NULL;

-

     JSONNode * node = NULL;
     JSONNode * node = NULL;

+    int c;
+    int strLen = 0;
+
+    bool editingNode = false;

 
     while (true) {
 
     while (true) {

-        if (isNewline(PeekChar())) {
-            getch();
+        c = GetChar();

 
 

+        if (c == 3)
+            break;
+
+        if (isNewline(c)) {

             if (node == NULL || node->parent == NULL)
                 break;
             if (node == NULL || node->parent == NULL)
                 break;

-            
-            node = node->parent;
-            g_CurrNode = node;
-
-            continue;
-        }
-        
-        // object key
-        if (node != NULL && node->kind == JSONNodeKind_Obj && node->childCount % 2 == 0) {
-            JSONNode * newNode = JSONNodeNew(JSONNodeKind_Str);
-            JSONNodePush(node, newNode);

 
 

-            node = newNode;
-            g_CurrNode = node;
-            
-            GetStr(newNode, predStr);
+            editingNode = false;
+            g_CurrNode = node = node->parent;

             
             continue;
         }
             
             continue;
         }

-        
-        int c = GetChar();

 
 

-        if (! charInString(c, "isoa"))
-            continue;
+        if (! editingNode) {
+            JSONNode * old = node;

 
 

-        JSONNode * newNode = JSONNodeNew(JSONNodeKind_Nul);
-
-        if (result == NULL)
-            g_DrawNode = result = newNode;
-
-        if (node != NULL)
-            JSONNodePush(node, newNode);
-        
-        node = newNode;
-        g_CurrNode = node;
-        
-        switch (c) {
-        case 'i': {
-            node->kind = JSONNodeKind_Int;
-            GetStr(node, predInt);
-            break;
-        }
-        case 's': {
-            node->kind = JSONNodeKind_Str;
-            GetStr(node, predStr);
-            break;
-        }
-        case 'o': {
-            node->kind = JSONNodeKind_Obj;
-            break;
-        }
-        case 'a': {
-            node->kind = JSONNodeKind_Arr;
-            break;
+            /**/ 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 (isBackspace(c) && node != NULL) {
+                g_CurrNode = node = JSONNodeRemove(node);
+                continue;
+            }
+            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 { continue; }
+
+            g_CurrNode = node;
+
+            if (old != NULL)
+                JSONNodePush(old, node);
+            else
+                g_DrawNode = result = node;

         }
         }

-        case 8:
-        case 127:
-            break;
+        else {
+            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++;
+            }

         }
     }
 
         }
     }