fix peekchar input

[iftint] / main2.c

diff --git a/main2.c b/main2.c
index 47e11ee3227a53af2964fc8d182baf68318cd989..104c2a47a021ad8b347aea2f563e184ac29f5804 100644 (file)
--- a/main2.c
+++ b/main2.c
@@ -2,6 +2,11 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>

+#include <stdbool.h>
+
+/* TODO
+- whitelist input on GetStr/GetInt
+*/

 
 // Memory
 
 
 // Memory
 


@@ -9,11 +14,13 @@
 #define NEWARR(TYPE, NUM) ((TYPE *)calloc(NUM, sizeof(TYPE)))
 
 
 #define NEWARR(TYPE, NUM) ((TYPE *)calloc(NUM, sizeof(TYPE)))
 
 

-// getch()
+// getch

 
 #ifdef _WIN32
 
 #ifdef _WIN32

+#include <windows.h>

 #include <conio.h>
 #else
 #include <conio.h>
 #else

+#include <sys/ioctl.h>

 #include <termios.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <termios.h>
 #include <unistd.h>
 #include <stdio.h>


@@ -25,21 +32,7 @@ int getch(void)
     int ch;
     tcgetattr( STDIN_FILENO, &oldattr );
     newattr = oldattr;
     int ch;
     tcgetattr( STDIN_FILENO, &oldattr );
     newattr = oldattr;

-    newattr.c_lflag &= ~( ICANON | ECHO );
-    tcsetattr( STDIN_FILENO, TCSANOW, &newattr );
-    ch = getchar();
-    tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );
-    return ch;
-}
-
-/* reads from keypress, echoes */
-int getche(void)
-{
-    struct termios oldattr, newattr;
-    int ch;
-    tcgetattr( STDIN_FILENO, &oldattr );
-    newattr = oldattr;
-    newattr.c_lflag &= ~( ICANON );
+    newattr.c_lflag &= ~( ICANON | ECHO ); // no ECHO for echo(?)

     tcsetattr( STDIN_FILENO, TCSANOW, &newattr );
     ch = getchar();
     tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );
     tcsetattr( STDIN_FILENO, TCSANOW, &newattr );
     ch = getchar();
     tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );


@@ -85,14 +78,29 @@ void vt100CursorHome() { vt100Escape("[H"); }
 void vt100CursorPos(int v, int h) { vt100Escape("[%d;%dH", v, h); }
 void vt100SaveCursor() { vt100Escape("7"); }
 void vt100RestoreCursor() { vt100Escape("8"); }
 void vt100CursorPos(int v, int h) { vt100Escape("[%d;%dH", v, h); }
 void vt100SaveCursor() { vt100Escape("7"); }
 void vt100RestoreCursor() { vt100Escape("8"); }

+void vt100GetScreenSize(int * v, int * h) {
+#ifdef _WIN32
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
+    *h = csbi.srWindow.Right - csbi.srWindow.Left + 1;
+    *v = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
+#else
+    struct winsize w;
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+    *h = w.ws_row;
+    *v = w.ws_col;
+#endif
+}

 
 
 // JSON
 
 typedef enum {
     JSONNodeKind_Nul,
 
 
 // JSON
 
 typedef enum {
     JSONNodeKind_Nul,

+    JSONNodeKind_Int,

     JSONNodeKind_Str,
     JSONNodeKind_Obj,
     JSONNodeKind_Str,
     JSONNodeKind_Obj,

+    JSONNodeKind_Arr,

 } JSONNodeKind;
 
 struct JSONNode;
 } JSONNodeKind;
 
 struct JSONNode;


@@ -112,6 +120,16 @@ JSONNodeNew(JSONNodeKind kind, size_t data) {
     return result;
 }
 
     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 *
 JSONNodeNewStr(const char * str) {
     return JSONNodeNew(JSONNodeKind_Str, (size_t)str);


@@ -123,12 +141,12 @@ JSONNodeNewObj() {
 }
 
 JSONNode *
 }
 
 JSONNode *

-JSONNodeNewNul() {
-    return JSONNodeNew(JSONNodeKind_Nul, (size_t)NULL);
+JSONNodeNewArr() {
+    return JSONNodeNew(JSONNodeKind_Arr, (size_t)NULL);

 }
 
 JSONNode *
 }
 
 JSONNode *

-JSONNodeAppend(JSONNode * this, JSONNode * that) {
+JSONNodePush(JSONNode * this, JSONNode * that) {

     if (this->children == NULL) {
         this->children = that;
     }
     if (this->children == NULL) {
         this->children = that;
     }


@@ -144,6 +162,26 @@ JSONNodeAppend(JSONNode * this, JSONNode * that) {
     return that;
 }
 
     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;
+        }
+    }
+}
+

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


@@ -164,6 +202,11 @@ JSONNodePrint(JSONNode * node) {
         printf("null");
         break;
     }
         printf("null");
         break;
     }

+    case JSONNodeKind_Int: {
+        int i = (int)node->data;
+        printf("%d", i);
+        break;
+    }

     case JSONNodeKind_Str: {
         char * str = (char *)node->data;
         printf("\"%s\"", str == NULL ? "" : str);
     case JSONNodeKind_Str: {
         char * str = (char *)node->data;
         printf("\"%s\"", str == NULL ? "" : str);


@@ -190,25 +233,80 @@ JSONNodePrint(JSONNode * node) {
         printf("}");
         break;
     }
         printf("}");
         break;
     }

+    case JSONNodeKind_Arr: {
+        printf("[ ");
+        JSONNode * ptr = node->children;
+        while (ptr != NULL) {
+            JSONNode * value = ptr;
+            JSONNodePrint(value);
+            ptr = ptr->next;
+            printf("%s", (ptr == NULL ? "" : ", "));
+        }
+        printf(" ]");
+        break;
+    }

     }
 }
 
 
 // Input
 
     }
 }
 
 
 // Input
 

-JSONNode * g_Node;
+JSONNode * g_DrawNode = NULL;
+const char * g_DrawStr = "";

 
 void
 
 void

-Draw(JSONNode * node, const char * str) {
+Draw(void) {

     vt100ClearScreen();
     vt100CursorHome();
     
     vt100ClearScreen();
     vt100CursorHome();
     

-    printf("> %s\n\n", str);
+    if (g_DrawNode != NULL)
+        JSONNodePrint(g_DrawNode);
+
+    int v, h;
+    vt100GetScreenSize(&v, &h);
+    vt100CursorPos(v, 0);
+    printf("> %s", g_DrawStr);

 
 

-    if (node != NULL)
-        JSONNodePrint(node);
+    vt100CursorPos(v, strlen(g_DrawStr) + 3);
+}

 
 

-    vt100CursorPos(0, strlen(str) + 3);
+int
+GetChar() {
+    Draw();
+    int c = getch();
+    return c;
+}
+
+int
+PeekChar() {
+    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;

 }
 
 char *
 }
 
 char *


@@ -216,82 +314,81 @@ GetStr() {
     char * str = NEWARR(char, 16);
     int strLen = 0;
     int c;
     char * str = NEWARR(char, 16);
     int strLen = 0;
     int c;

-    while ((c = getch()), (c != '\r') && (c != '\n')) {
-        if (strLen < 16 - 1) {
+    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';
             str[strLen++] = c;
             str[strLen] = '\0';

-            Draw(g_Node, str);

         }
     }
         }
     }

+    g_DrawStr = "";

     return str;
 }
 
 JSONNode *
 GetNode(JSONNode * parent) {
     return str;
 }
 
 JSONNode *
 GetNode(JSONNode * parent) {

-    int c = getch();
+    int c = GetChar();

 
     JSONNode * result = JSONNodeNewNul();
     
     if (parent == NULL)
 
     JSONNode * result = JSONNodeNewNul();
     
     if (parent == NULL)

-        g_Node = result;
+        g_DrawNode = result;

 
     if (parent != NULL && result != NULL)
 
     if (parent != NULL && result != NULL)

-        JSONNodeAppend(parent, result);
+        JSONNodePush(parent, result);

 
     switch (c) {
 
     switch (c) {

+    case 'i': {
+        result->kind = JSONNodeKind_Int;
+        result->data = (size_t)GetInt();
+        break;
+    }

     case 's': {
         result->kind = JSONNodeKind_Str;
     case 's': {
         result->kind = JSONNodeKind_Str;

-        Draw(g_Node, "");

         result->data = (size_t)GetStr();
         result->data = (size_t)GetStr();

-        Draw(g_Node, "");

         break;
     }
     case 'o': {
         result->kind = JSONNodeKind_Obj;
         break;
     }
     case 'o': {
         result->kind = JSONNodeKind_Obj;

-        Draw(g_Node, "");
-        while ((c = peekch()), (c != '\r') && (c != '\n')) {
-            Draw(g_Node, "");
-
-            JSONNodeAppend(result, JSONNodeNewStr(GetStr()));
-            Draw(g_Node, "");
+        while ((c = PeekChar()), (c != '\r') && (c != '\n')) {
+            JSONNodePush(result, JSONNodeNewStr(GetStr()));

 
 

-            JSONNodeAppend(result, GetNode(result));
-            Draw(g_Node, "");
+            JSONNodePush(result, GetNode(result));

         }
         }

-        getch();
+        GetChar();
+        break;

     }
     }

+    case 'a': {
+        result->kind = JSONNodeKind_Arr;
+        while ((c = PeekChar()), (c != '\r') && (c != '\n')) {
+            JSONNodePush(result, GetNode(result));
+        }
+        GetChar();
+        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;
 }
 
     }
 
     return result;
 }
 

-JSONNode *
-TestNode() {
-    JSONNode * n = JSONNodeNewObj();
-    JSONNode * k1 = JSONNodeNewStr("key 1");
-    JSONNode * v1 = JSONNodeNewObj();
-    JSONNode * k11 = JSONNodeNewStr("key 11");
-    JSONNode * v11 = JSONNodeNewStr("val 11");
-    JSONNode * k12 = JSONNodeNewStr("key 12");
-    JSONNode * v12 = JSONNodeNewStr("val 12");
-    JSONNode * k2 = JSONNodeNewStr("key 2");
-    JSONNode * v2 = JSONNodeNewStr("val 2");
-
-    JSONNodeAppend(n, k1);
-    JSONNodeAppend(n, v1);
-    JSONNodeAppend(n, k2);
-    JSONNodeAppend(n, v2);
-
-    JSONNodeAppend(v1, k11);
-    JSONNodeAppend(v1, v11);
-    JSONNodeAppend(v1, k12);
-    JSONNodeAppend(v1, v12);
-
-    return n;
-}
+
+

 
 int main() {
 
 int main() {

-    Draw(NULL, "");
+    Draw();

 
     JSONNode * n = GetNode(NULL);
     //JSONNode * n = TestNode();
 
     JSONNode * n = GetNode(NULL);
     //JSONNode * n = TestNode();


@@ -299,8 +396,9 @@ int main() {
     vt100ClearScreen();
     vt100CursorHome();
     JSONNodePrint(n);
     vt100ClearScreen();
     vt100CursorHome();
     JSONNodePrint(n);

+    printf("\n");

 
     // JSONFree(n);
 
     return 0;
 
     // JSONFree(n);
 
     return 0;

-}
\ No newline at end of file
+}