upd

Author: adler3d

src/QapGenV2025/QapGen/QapGen.cpp

@@ -5,13 +5,14 @@
 typedef unsigned char uchar;
 size_t g_unique_pool_ptr_counter=0;
 string g_version="{\"version\":\"1.0\"}";
+#define QAP_LOAD_DEV_WITH_STACK
 #define QAP_USE_UNIQUE_POOL_PTR
 #define QAP_STD_DEBUG
 #ifdef QAP_STD_DEBUG
 #define QAP_LOAD_OBJ_DEBUG
 #define QAP_POLY_TOOL_DEBUG
 #else
-//#define QAP_WITHOUT_ALL_DEBUG
+#define QAP_WITHOUT_ALL_DEBUG
 #endif
 #ifdef QAP_WITHOUT_ALL_DEBUG
 #undef QapAssert
@@ -42,7 +43,7 @@ string g_qap_poly_tool_config_path2;
 namespace t_d7{
 //#include "t_d7_module.hpp"
 };
-//#define JSON_TEST
+#define JSON_TEST
 #ifdef JSON_TEST
 #include "t_json.hpp"
 #else
@@ -354,11 +355,24 @@ void ssd_test(){
 }*/
 #ifdef JSON_TEST
 void test20250630_json_test(){
-  for(;;){
-  TAutoPtr<t_json::i_value> v;
-  QapClock clock;
-  auto r=load_obj_full(v,file_get_contents("test2.json"));
-  cerr<<clock.MS()<<endl;
+  string msg;
+  double tms=0;int n=0;double tms2=0;double lms=+1e9;double hms=-1e9;
+  QapClock clock2;
+  auto content=file_get_contents("test.json");
+  auto Lms=clock2.MS();
+  cerr<<"load_time:"<<FToS2(Lms)<<" size:"<<content.size()<<endl;
+  for(int i=1;;i++){
+    TAutoPtr<t_json::i_value> v;
+    if(n==20){tms=0;n=1;}else n++;
+    QapClock clock;
+    auto r=load_obj_full(v,content,true,&msg);
+    auto ms=clock.MS();
+    tms+=ms;tms2+=ms;lms=std::min(lms,ms);hms=std::max(hms,ms);
+    cerr<<"time:"<<FToS2(ms)<<" ms; spd:"<<FToS2(content.size()*1e-6/(tms2/i/1000))<<" MB/s; avg:"<<FToS2(tms2/i)<<"; pavg:"<<FToS2(tms/n)<<"; min:"<<FToS2(lms)<<"; max:"<<FToS2(hms)<<"; status:"<<(r.ok?"ok":"fail")<<"; pos:"<<r.pos<<endl;// 411ms/iter vs 232.69ms/iter - old way
+    if(!r.ok){
+      cerr<<r.msg<<endl;
+      exit(0);
+    }
   }
 }
 #endif
@@ -398,9 +412,9 @@ void printMapsJsonLike(
 #pragma comment(lib,"shell32.lib")
 int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine,int nCmdShow)
 {
-  string msg;
-  TAutoPtr<t_ploy_test20250715> pt;
-  auto res=load_obj_full(pt,"ccXz",true,&msg);
+  //string msg;
+  //TAutoPtr<t_ploy_test20250715> pt;
+  //auto res=load_obj_full(pt,"ccXz",true,&msg);
   //t_meta_lexer::t_ploy_test20250715 pt;
   //t_d7::t_unit u;
   //auto res=load_obj_full(u,file_get_contents("Basa.pas"));
@@ -412,7 +426,7 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine,i
   wcstombs(&path[0],argv[0],wcslen(argv[0])+1);
   g_qap_poly_tool_config_path2=get_path(path);
   #ifdef JSON_TEST
-  test20250630_json_test();  return 0;
+  test20250630_json_test(); return 0;
   #else// 655.864 ms for 2 251 060 áàéò 3.4322 mb/s vs nodejs(10.42mb/sec)
                                        // 536.882 ms - 4.199 mb/sec - new version
                                        // 272.522 ms - 8.260 mb/sec - without debug stuff

src/QapGenV2025/QapGen/QapLexer.inl

@@ -20,11 +20,12 @@ static int&get_qap_fallback_counter(){static int counter=0;return counter;}
 struct t_fallback{
   struct t_rec{bool E;bool ok;bool D;};
   i_dev_base&dev;
-  bool&ok;
+  bool ok;
   size_t pos;
   const char*const ptr;
   const char*const ptr2;
   int err_count;
+  #ifdef QAP_LOAD_DEV_WITH_STACK
   struct t_err{
     int M=-1;
     int maxpos=0;
@@ -34,11 +35,12 @@ struct t_fallback{
   };
   vector<t_err> errs;
   t_err best_err;
-  t_scope_tool mandatory;
-  t_scope_tool optional;
   bool keep_errs=false;
+  #endif
+  //t_scope_tool mandatory;
+  //t_scope_tool optional;
   //int mode=0;
-  t_fallback(i_dev_base&dev,const char*const ptr,const char*const ptr2=nullptr):dev(dev),ok(mandatory.ok),ptr(ptr),ptr2(ptr2),pos(-1),err_count(0){
+  t_fallback(i_dev_base&dev,const char*const ptr,const char*const ptr2=nullptr):dev(dev)/*,ok(mandatory.ok)*/,ptr(ptr),ptr2(ptr2),pos(-1),err_count(0){
     if(ptr)dev.push(this);
   }
  ~t_fallback(){
@@ -51,6 +53,7 @@ struct t_fallback{
   void log_clear(){err_count=0;}
   int getErr()const{return err_count;}
   //void operator()(int M){mode=M;}
+  #ifdef QAP_LOAD_DEV_WITH_STACK
   void operator()(bool ok,const char*perr){
     if(ok){
       //log_clear();
@@ -67,6 +70,9 @@ struct t_fallback{
       errs.push_back(curerr);
     }
   }
+  #else
+  void operator()(...){}
+  #endif
 };
 
 struct t_load_dev;
@@ -199,20 +205,24 @@ public:
   void push(t_fallback*ptr)override{
     QapAssert(ptr);
     //for(int i=0;i<stack.size();i++)QapAssert(stack[i]!=ptr);
+    #ifdef QAP_LOAD_DEV_WITH_STACK
     stack.push_back(ptr);
+    #endif
     ptr->pos=this->pos;
-    ptr->mandatory.ok=true;
-    ptr->mandatory.scope=ptr;
-    ptr->optional.ok=false;
-    ptr->optional.scope=ptr;
+    //ptr->mandatory.ok=true;
+    //ptr->mandatory.scope=ptr;
+    //ptr->optional.ok=false;
+    //ptr->optional.scope=ptr;
     maxpos=std::max(maxpos,pos);
   }
   void pop(t_fallback*ptr)override{
     maxpos_pop=std::max(maxpos_pop,pos);
     QapAssert(ptr);
     QapAssert(!stack.empty());
+    #ifdef QAP_LOAD_DEV_WITH_STACK
     QapAssert(stack.back()==ptr);
     stack.pop_back();
+    #endif
     t_fallback::t_rec status;
     auto&fb=*ptr;
     bool skip=pos==fb.pos;
@@ -222,6 +232,15 @@ public:
     status.E=error;
     status.ok=ok;
     status.D=dep_err;
+    #ifndef QAP_LOAD_DEV_WITH_STACK
+    stack.back()->add_status(status);
+    if(ptr->ok)return;
+    if(this->pos==ptr->pos)return;
+    /*QapAssert(!stack.empty());*/
+    //stack.back()->log.err(SToS(ptr->ptr)+" ["+IToS(this->pos)+"=>"+IToS(ptr->pos)+"]");
+    this->pos=ptr->pos;
+    return;
+    #else
     auto&b=*stack.back();
     b.add_status(status);
     if(fb.ok&&!fb.keep_errs)return;
@@ -240,6 +259,7 @@ public:
     }
     if(all_failed||ok)return;
     pos=fb.pos;
+    #endif
   }
   void setPos(int pos)override{this->pos=pos;}
   void getPos(int&pos)override{pos=this->pos;}
@@ -571,13 +591,13 @@ public:
 public:
   void push(t_fallback*ptr){
     QapAssert(ptr);
-    for(int i=0;i<stack.size();i++)QapAssert(stack[i]!=ptr);
+    //for(int i=0;i<stack.size();i++)QapAssert(stack[i]!=ptr);
     stack.push_back(ptr);
     ptr->pos=this->mem.size();
-    ptr->mandatory.ok=true;
-    ptr->mandatory.scope=ptr;
-    ptr->optional.ok=false;
-    ptr->optional.scope=ptr;
+    //ptr->mandatory.ok=true;
+    //ptr->mandatory.scope=ptr;
+    //ptr->optional.ok=false;
+    //ptr->optional.scope=ptr;
   }
   void pop(t_fallback*ptr){
     QapAssert(ptr);
@@ -1207,7 +1227,9 @@ static bool internal_go_for_vec_lt(i_dev&dev,vector<TYPE>&arr){
     QapAssert(CheckTAutoPtrIsNotEmpty(tmp));
     arr.push_back(std::move(tmp));
   }
+  #ifdef QAP_LOAD_DEV_WITH_STACK
   scope.keep_errs=arr.size();
+  #endif
   ok=!arr.empty();
   return ok;
 }
@@ -1341,7 +1363,7 @@ bool load_obj(/*IEnvRTTI&Env,*/TYPE&out,const string&data,int*pmaxpos=nullptr,st
 {
   out=std::move(TYPE{});
   t_load_dev dev(data);auto&ldev=dev;
-  bool ok=dev.go_auto(out);
+  bool ok=dev.go_auto(out);if(pmaxpos){*pmaxpos=dev.pos;}
   if(ok)
   {
     #ifdef QAP_LOAD_OBJ_DEBUG
@@ -1369,6 +1391,7 @@ bool load_obj(/*IEnvRTTI&Env,*/TYPE&out,const string&data,int*pmaxpos=nullptr,st
   }
   if(!ok&&perrmsg){
     auto&b=*dev.stack.back();
+    #ifdef QAP_LOAD_DEV_WITH_STACK
     QapAssert(b.best_err.M>=0);
     if(pmaxpos)*pmaxpos=b.best_err.maxpos;
     set<string> s;map<string,string> m;vector<string> arr;
@@ -1386,6 +1409,7 @@ bool load_obj(/*IEnvRTTI&Env,*/TYPE&out,const string&data,int*pmaxpos=nullptr,st
     }
     vector<string> arr2;for(auto&ex:m)arr2.push_back(ex.second);
     *perrmsg+=join(arr2,"\n");
+    #endif
   }
   return ok;
 }