From acb2e3664c6ff33fb378d6e5ea0accc798de8b09 Mon Sep 17 00:00:00 2001
From: ValKmjolnir <lhk101lhk101@qq.com>
Date: Tue, 31 Jan 2023 19:39:22 +0800
Subject: [PATCH] :bug: fix bugs in stl/json, now it runs correctly

---
 stl/json.nas  | 262 +++++++++++++++++++++++++++-----------------------
 test/json.nas |  51 +++++++++-
 2 files changed, 188 insertions(+), 125 deletions(-)

diff --git a/stl/json.nas b/stl/json.nas
index e490022..2e2ab58 100644
--- a/stl/json.nas
+++ b/stl/json.nas
@@ -1,13 +1,13 @@
 # lib json.nas
 # 2021 ValKmjolnir
-var JSON=func(){
+var JSON=func() {
 
     var (
         j_eof,
         j_lbrace,
         j_rbrace,
-        j_lbracket,
-        j_rbracket,
+        j_lbrkt,
+        j_rbrkt,
         j_comma,
         j_colon,
         j_str,
@@ -32,27 +32,28 @@ var JSON=func(){
     var text_size=0;
     var ptr=0;
     var token={content:'',type:''};
-    var content={};
-    var init=func(){
+
+    var init=func() {
         text='';
         line=1;
         text_size=0;
         ptr=0;
-        content={};
         token={content:'',type:''};
     }
 
-    var isnum=func(c){
+    var isnum=func(c) {
         return '0'<=c and c<='9';
     }
-    var isid=func(c){
+
+    var isid=func(c) {
         var tmp=c[0];
         return ('a'[0]<=tmp and tmp<='z'[0]) or
         ('A'[0]<=tmp and tmp<='Z'[0]) or
         c=='_';
     }
-    var check=func(){
-        var c=text[ptr];
+
+    var check=func() {
+        var c=char(text[ptr]);
         return (
             c=='{' or c=='}' or
             c=='[' or c==']' or
@@ -62,70 +63,76 @@ var JSON=func(){
         );
     }
 
-    var get=func(str){
+    var get=func(str) {
         init();
-        if(!size(str))
+        if(!size(str)) {
             die("empty string");
-        text=split('',str);
+        }
+        text=str;
         text_size=size(text);
         return;
     }
-    var next=func(){
-        while(ptr<text_size and !check()){
-            if(text[ptr]=='\n')
+
+    var next=func() {
+        while(ptr<text_size and !check()) {
+            if(char(text[ptr])=='\n')
                 line+=1;
             ptr+=1;
         }
-        if(ptr>=text_size){
+        if(ptr>=text_size) {
             token.content="eof";
             token.type=j_eof;
             return;
         }
         
-        var c=text[ptr];
-        if(c=='{'){
+        var c=char(text[ptr]);
+        if(c=='{') {
             token.content='{';
             token.type=j_lbrace;
-        }elsif(c=='}'){
+        } elsif(c=='}') {
             token.content='}';
             token.type=j_rbrace;
-        }elsif(c=='['){
+        } elsif(c=='[') {
             token.content='[';
-            token.type=j_lbracket;
-        }elsif(c==']'){
+            token.type=j_lbrkt;
+        } elsif(c==']') {
             token.content=']';
-            token.type=j_rbracket;
-        }elsif(c==','){
+            token.type=j_rbrkt;
+        } elsif(c==',') {
             token.content=',';
             token.type=j_comma;
-        }elsif(c==':'){
+        } elsif(c==':') {
             token.content=':';
             token.type=j_colon;
-        }elsif(c=='\"' or c=='\''){
+        } elsif(c=='\"' or c=='\'') {
             var strbegin=c;
             var s="";
             ptr+=1;
-            while(ptr<text_size and text[ptr]!=strbegin){
-                s~=text[ptr];
+            while(ptr<text_size and char(text[ptr])!=strbegin) {
+                s~=char(text[ptr]);
                 ptr+=1;
+                if(char(text[ptr-1])=="\\" and ptr<text_size) {
+                    s~=char(text[ptr]);
+                    ptr+=1;
+                }
             }
             token.content=s;
             token.type=j_str;
-        }elsif(isnum(c)){
+        } elsif(isnum(c)) {
             var s=c;
             ptr+=1;
-            while(ptr<text_size and ((isnum(text[ptr]) or text[ptr]=='.'))){
-                s~=text[ptr];
+            while(ptr<text_size and ((isnum(char(text[ptr])) or char(text[ptr])=='.'))) {
+                s~=char(text[ptr]);
                 ptr+=1;
             }
             ptr-=1;
             token.content=num(s);
             token.type=j_num;
-        }elsif(isid(c)){
+        } elsif(isid(c)) {
             var s=c;
             ptr+=1;
-            while(ptr<text_size and (isid(text[ptr]) or isnum(text[ptr]))){
-                s~=text[ptr];
+            while(ptr<text_size and (isid(char(text[ptr])) or isnum(char(text[ptr])))) {
+                s~=char(text[ptr]);
                 ptr+=1;
             }
             ptr-=1;
@@ -136,18 +143,40 @@ var JSON=func(){
         return;
     }
 
-    var match=func(type){
+    var match=func(type) {
         if(token.type!=type)
             print("line ",line,": expect ",j_content[type]," but get `",token.content,"`.\n");
         next();
         return;
     }
 
-    var hash_gen=func(){
+    var member=func(hash) {
+        var name=token.content;
+        if(token.type==j_rbrace) {
+            return;
+        }
+        if(token.type==j_str) {
+            match(j_str);
+        } else {
+            match(j_id);
+        }
+        match(j_colon);
+        if(token.type==j_lbrace) {
+            hash[name]=hash_gen();
+        } elsif(token.type==j_lbrkt) {
+            hash[name]=vec_gen();
+        } elsif(token.type==j_str or token.type==j_num) {
+            hash[name]=token.content;
+            next();
+        }
+        return;
+    }
+
+    var hash_gen=func() {
         var hash={};
         match(j_lbrace);
         member(hash);
-        while(token.type==j_comma){
+        while(token.type==j_comma) {
             match(j_comma);
             member(hash);
         }
@@ -155,114 +184,103 @@ var JSON=func(){
         return hash;
     }
 
-    var vec_gen=func(){
+    var vec_gen=func() {
         var vec=[];
-        match(j_lbracket);
-        if(token.type==j_lbrace){
+        match(j_lbrkt);
+        if(token.type==j_lbrace) {
             append(vec,hash_gen());
-        }elsif(token.type==j_lbracket){
+        } elsif(token.type==j_lbrkt) {
             append(vec,vec_gen());
-        }elsif(token.type==j_str or token.type==j_num){
+        } elsif(token.type==j_str or token.type==j_num) {
             append(vec,token.content);
             next();
         }
-        while(token.type==j_comma){
+        while(token.type==j_comma) {
             match(j_comma);
-            if(token.type==j_lbrace){
-                append(vec,me.hash_gen());
-            }elsif(token.type==j_lbracket){
+            if(token.type==j_lbrace) {
+                append(vec,hash_gen());
+            } elsif(token.type==j_lbrkt) {
                 append(vec,vec_gen());
-            }elsif(token.type==j_str or token.type==j_num){
+            } elsif(token.type==j_str or token.type==j_num) {
                 append(vec,token.content);
                 next();
             }
         }
-        match(j_rbracket);
+        match(j_rbrkt);
         return vec;
     }
 
-    var member=func(hash){
-        var name=token.content;
-        if(token.type==j_rbrace){
-            return;
-        }
-        if(token.type==j_str){
-            match(j_str);
-        }else{
-            match(j_id);
-        }
-        match(j_colon);
-        if(token.type==j_lbrace){
-            hash[name]=hash_gen();
-        }elsif(token.type==j_lbracket){
-            hash[name]=vec_gen();
-        }elsif(token.type==j_str or token.type==j_num){
-            hash[name]=token.content;
-            next();
-        }
-        return;
-    }
     return {
-        parse:func(str){
-            if(typeof(str)!="str")
+        parse:func(str) {
+            if(typeof(str)!="str") {
                 die("JSON.parse: must use string");
+            }
             get(str);
             next();
 
-            match(j_lbrace);
-            member(content);
-            while(token.type==j_comma){
-                match(j_comma);
-                member(content);
+            if(token.type==j_lbrkt) {
+                var res=vec_gen();
+            } else {
+                var res=hash_gen();
             }
-            match(j_rbrace);
 
-            var res=content;
             init();
             return res;
-        },
-        stringify:func(hash){
-            if(typeof(hash)!="hash")
-                die("JSON.stringify: must use hashmap");
-            var s="";
-            var gen=func(elem){
-                var t=typeof(elem);
-                if(t=="num"){
-                    s~=elem;
-                }elsif(t=="str"){
-                    s~='"'~elem~'"';
-                }elsif(t=="vec"){
-                    vgen(elem);
-                }elsif(t=="hash"){
-                    hgen(elem);
-                }else{
-                    s~='"undefined"';
-                }
-            }
-            var vgen=func(v){
-                s~="[";
-                var vsize=size(v);
-                for(var i=0;i<vsize;i+=1){
-                    gen(v[i]);
-                    if(i!=vsize-1)
-                        s~=",";
-                }
-                s~="]";
-            }
-            var hgen=func(h){
-                s~="{";
-                var k=keys(h);
-                var vsize=size(k);
-                for(var i=0;i<vsize;i+=1){
-                    s~=k[i]~":";
-                    gen(h[k[i]]);
-                    if(i!=vsize-1)
-                        s~=",";
-                }
-                s~="}";
-            }
-            hgen(hash);
-            return s;
         }
     };
 }();
+
+JSON.stringify=func(object) {
+    if(typeof(object)!="hash" and typeof(object)!="vec") {
+        die("JSON.stringify: must use hashmap or vector");
+    }
+
+    var s="";
+    var gen=func(elem) {
+        var t=typeof(elem);
+        if(t=="num") {
+            s~=str(elem);
+        } elsif(t=="str") {
+            s~='"'~elem~'"';
+        } elsif(t=="vec") {
+            vgen(elem);
+        } elsif(t=="hash") {
+            hgen(elem);
+        } else {
+            s~='"undefined"';
+        }
+    }
+
+    var vgen=func(v) {
+        s~="[";
+        var vsize=size(v);
+        for(var i=0;i<vsize;i+=1) {
+            gen(v[i]);
+            if(i!=vsize-1) {
+                s~=",";
+            }
+        }
+        s~="]";
+    }
+
+    var hgen=func(h) {
+        s~="{";
+        var k=keys(h);
+        var vsize=size(k);
+        for(var i=0;i<vsize;i+=1) {
+            s~=k[i]~":";
+            gen(h[k[i]]);
+            if(i!=vsize-1) {
+                s~=",";
+            }
+        }
+        s~="}";
+    }
+
+    if(typeof(object)=="vec") {
+        vgen(object);
+    } else {
+        hgen(object);
+    }
+    return s;
+}
\ No newline at end of file
diff --git a/test/json.nas b/test/json.nas
index 7772d1c..2b6c971 100644
--- a/test/json.nas
+++ b/test/json.nas
@@ -1,10 +1,11 @@
 import.stl.json;
+import.stl.process_bar;
 
 var ss=JSON.stringify({
     vec:[0,1,2],
     hash:{
         m1:0,
-        m2:"str",
+        m2:"str\\\"test\\\"",
         m3:[114514],
         m4:{year:1919,month:8,date:10}
     },
@@ -14,5 +15,49 @@ var ss=JSON.stringify({
     empty_an:[[[[[[{}]]]]]],
     function:func(){}
 });
-println(ss);
-println(JSON.parse(ss));
\ No newline at end of file
+println(ss,"\n");
+println(JSON.parse(ss),"\n");
+
+var ss=JSON.stringify([{
+    vec:[0,1,2,3],
+    hash:{
+        m1:0,
+        m2:"str\\\"test\\\"",
+        m3:[114514,1919810],
+        m4:{year:1919,month:8,date:10}
+    },
+    emptyhash:{},
+    emptyvec:[],
+    empty_an:[[[[[{}]]]]],
+    function:func(){}
+}]);
+println(ss,"\n");
+println(JSON.parse(ss),"\n");
+
+func {
+    var bar=process_bar.high_resolution_bar(30);
+    var tmp=[
+        {t1:nil},
+        {t2:nil},
+        {t3:nil},
+        {t4:nil},
+        {t5:nil},
+        {t6:nil}
+    ];
+
+    srand();
+    foreach(var h;tmp) {
+        var name=keys(h)[0];
+        h[name]=[];
+        print("\e[1000D",bar.bar(0));
+        for(var i=0;i<1e3;i+=1) {
+            append(h[name],{id:i,content:int(rand()*1e7)});
+            print("\e[1000D",bar.bar((i+1)/1e3));
+        }
+        print("\e[1000D",bar.bar(1)," executing...\n");
+    }
+    print("\e[1000D","\e["~str(size(tmp))~"A");
+    foreach(var h;JSON.parse(JSON.stringify(tmp))) {
+        println("\e[1000D",bar.bar(1)," done ",keys(h)[0]," ",size(h[keys(h)[0]]),"     ");
+    }
+}();
\ No newline at end of file