updated throw_wrongchar(), removoved null parsing, commits cleared

DtsodParser/DtsodV24_deserialize.c

@@ -6,19 +6,36 @@
 #define STRB_BC 64
 #define STRB_BL 1024
 
-Maybe ERROR_WRONGCHAR(char c, char* text){
+// special func for throwing error messages about wrong characters in deserializing text
-    char errBuf[]="unexpected <c> at:\n  \""
+Maybe ERROR_WRONGCHAR(const char c, char* text, char* text_first, const char* srcfile, int line, const char* funcname){
-        "00000000000000000000000000000000\"";
+    char errBuf[33];
-    errBuf[12]=c;
+    errBuf[32]='\0';
-    for(uint8 i=0; i<32; i++)
+    char* errText=text-16;
+    if(errText<text_first) errText=text_first;
+    for(uint8 i=0; i<32; i++){
         // writes 16 chars before and 15 after the wrongchar
-        errBuf[i+22]=*(text - 16 + i);
+        char _c=errText[i];
-    safethrow(cptr_copy(errBuf));
+        errBuf[i]=_c;
+        if(!_c) break;
     }
-#define safethrow_wrongchar(C) return ERROR_WRONGCHAR(C, text)
+    char* errmsg=malloc(256);
+    IFWIN(
+        sprintf_s(errmsg,256, "unexpected <%c> at:\n"
+                        "  \"%s\"\n"
+                        "\\___[%s:%d] %s()", 
+                        c,errBuf, srcfile,line,funcname),
+        sprintf(errmsg, "unexpected <%c> at:\n"
+                        "  \"%s\"\n"
+                        " \\___[%s:%d] %s()", 
+                        c,errBuf, srcfile,line,funcname)
+    );
+    safethrow(cptr_copy(errmsg));
+}
+#define safethrow_wrongchar(C) return ERROR_WRONGCHAR(C, text, shared->sh_text_first, __FILE__,__LINE__,__func__)
 
 
 typedef struct DeserializeSharedData{
+    const char* sh_text_first;
     char* sh_text;
     bool sh_partOfDollarList;
     bool sh_readingList;
@@ -128,34 +145,25 @@ Maybe __ReadList(DeserializeSharedData* shared){
 #define ReadList() __ReadList(shared)
 
 Maybe __ParseValue(DeserializeSharedData* shared, string str){
-    //printf("\e[94m<\e[96m%s\e[94m>\n",string_cpToCptr(str));
-    const string nullStr={"null",4};
     const string trueStr={"true",4};
     const string falseStr={"false",5};
-    switch(*str.ptr){
+    switch(str.ptr[str.length-1]){
-        case 'n':
+        // Bool
-            if(string_compare(str,nullStr))
+        case 'e':
-                return SUCCESS(UniNull);
-            else safethrow_wrongchar(*str.ptr);
-            break;
-        case 't':
             if(string_compare(str,trueStr))
                 return SUCCESS(UniTrue);
-            else safethrow_wrongchar(*str.ptr);
+            else if(string_compare(str,falseStr))
-            break;
-        case 'f':
-            if(string_compare(str,falseStr))
                 return SUCCESS(UniFalse);
             else safethrow_wrongchar(*str.ptr);
             break;
-        default: 
+        // Float64
-            switch(str.ptr[str.length-1]){
         case 'f': {
             char* _c=string_cpToCptr(str);
             Unitype rez=Uni(Float64,strtod(_c,NULL));
             free(_c);
             return SUCCESS(rez);
         }
+        // UInt64
         case 'u': {
             uint64 lu=0;
             char* _c=string_cpToCptr(str);
@@ -163,6 +171,7 @@ Maybe __ParseValue(DeserializeSharedData* shared, string str){
             free(_c);
             return SUCCESS(Uni(UInt64,lu));
         }
+        // Int64
         case '0': case '1': case '2': case '3': case '4':
         case '5': case '6': case '7': case '8': case '9': {
             int64 li=0;
@@ -178,10 +187,10 @@ Maybe __ParseValue(DeserializeSharedData* shared, string str){
             free(_c);
             return SUCCESS(Uni(Int64,li));
         }
+        // wrong type
         default:
             safethrow_wrongchar(str.ptr[str.length-1]);
     }
-    }
     safethrow(ERR_ENDOFSTR);
 };
 #define ParseValue(str) __ParseValue(shared, str)
@@ -244,6 +253,7 @@ Maybe __ReadValue(DeserializeSharedData* shared){
 
 Maybe __deserialize(char** _text, bool _calledRecursively) {
     DeserializeSharedData _shared={
+        .sh_text_first=*_text,
         .sh_text=*_text,
         .sh_partOfDollarList=false,
         .sh_readingList=false,

DtsodParser/DtsodV24_serialize.c

@@ -51,8 +51,7 @@ void __AppendValue(SerializeSharedData* shared, Unitype u){
                 StringBuilder_append_cptr(b, u.Bool ? "true" : "false");
                 break;
             case Null:
-                if(!u.VoidPtr) StringBuilder_append_cptr(b, "null");
+                throw("Null isn't supported in DtsodV24");
-                else throw("Null-type pointer is not 0");
                 break;
             case AutoarrUnitypePtr:
                 addc('[');

Makefile

@@ -3,7 +3,7 @@ TESTS=$(wildcard tests/*c) $(wildcard tests/**/*.c)
 OUTDIR=bin
 CMP=gcc
 
-all: build_test
+all: clear_c build_lib
 
 clear_c:
 	clear

tests/main.c

@@ -13,7 +13,7 @@ void test_all(){
 int main(){
     setlocale(LC_ALL, "en-US.Unicode");
     printf("\e[92mdtsod parser in c language!\e[97m\n");
-    optime("test_all",1,{test_all();});
+    optime("test_all",1,test_all());
     printf("\e[0m\n");
     return 0;
 }