📌 Nodepp | JSON Bug Fixing | V1.2.12 📌

Author: EDBCREPO

include/nodepp/json.h

@@ -29,7 +29,7 @@ namespace nodepp { class json_t {
 
 protected:
 
-    long get_next_sec( ulong _pos, const string_t& str ) const {
+    long get_next_sec( ulong _pos, const string_t& str ) const noexcept {
         uchar k=0; while( _pos < str.size() ){
             switch( str[_pos] ){
                 case ':': k += 6; break; case ',': k -= 6; break;
@@ -42,7 +42,7 @@ namespace nodepp { class json_t {
         }   return _pos >= str.size() ? -1 : _pos;
     }
 
-    long get_next_key( ulong _pos, const string_t& str ) const {
+    long get_next_key( ulong _pos, const string_t& str ) const noexcept {
         bool x=1; uchar k=0; while( _pos < str.size() ){
             switch( str[_pos] ){
                 case '[': k += 1; break; case ']': k -= 1; break;
@@ -51,19 +51,21 @@ namespace nodepp { class json_t {
                     if( x ){ k+=5; x=!x; }
                     else   { k-=5; x=!x; }
                 break;
-            }
-            if( k == 0 ){ break; } ++_pos;
+            } if( k == 0 ){ break; } ++_pos;
         }   return _pos >= str.size() ? -1 : _pos;
     }
 
-    object_t get_data( const string_t& data ) const {
+    object_t get_data( const string_t& data ) const noexcept {
+
         static regex_t reg1 = regex_t( "[a-z]"   );
         static regex_t reg2 = regex_t( "[.]\\d+" );
         static regex_t reg3 = regex_t( "\\d+"    );
 
         ulong x=0; while( x < data.size() && data[x]==' ' ){ ++x; }
-          if( data.empty() || data[x] == ',' ) /*---*/ { return nullptr; }
-        elif( data[x] == '"'     ) /*---------------*/ { return data.slice(1,-1); }
+
+        if  ( data.empty() || data[x] == ',' ) /*---*/ { return nullptr; }
+        elif( data[x] == '"'     ) /*---------------*/ { 
+              return data.slice( x+1, get_next_sec( x, data ) ); }
         elif( data[x] == '{'     ) /*---------------*/ { return parse( data ); }
         elif( data[x] == '['     ) /*---------------*/ { return parse( data ); }
         elif( data.find("false") ) /*---------------*/ { return (bool) 0; }
@@ -75,7 +77,7 @@ namespace nodepp { class json_t {
             else /*---------------------------------*/ { return string::to_float(data);  }
         }   elif( reg3.match(data).size()>9 ) /*----*/ { return string::to_long(data);   }
             else /*---------------------------------*/ { return string::to_int(data);    }
-        
+
     }
 
     object_t get_object( ulong x, ulong y, const string_t& str ) const {
@@ -279,10 +281,10 @@ namespace nodepp { namespace json {
 namespace nodepp { namespace json {
     template< class... T >
     string_t stringify( const T&... args ){ 
-        return format( args... ); 
+      return format( args... ); 
     }
 }}
 
 /*────────────────────────────────────────────────────────────────────────────*/
 
-#endif
+#endif

include/nodepp/posix/mutex.cpp

@@ -16,10 +16,10 @@
 
 namespace nodepp { namespace worker {
 
-    void delay( ulong time ){ process::delay(time); }
-    void yield(){ delay(TIMEOUT); sched_yield(); }
-    int    pid(){ return (int)pthread_self(); }
-    void  exit(){ pthread_exit(NULL); }
+    void    delay( ulong time ){ process::delay(time); }
+    void    yield(){ delay(TIMEOUT); sched_yield(); }
+    pthread_t pid(){ return pthread_self(); }
+    void     exit(){ pthread_exit(NULL); }
 
 }}
 

include/nodepp/posix/worker.cpp

@@ -71,9 +71,12 @@ namespace nodepp { class worker_t {
 
     /*─······································································─*/
 
-    int    pid() const noexcept { return type::cast<int>(obj->id); }
-    void   off() const noexcept { process::clear( obj->out ); }
-    void close() const noexcept { process::clear( obj->out ); }
+    pthread_t pid() const noexcept { return obj->id; }
+
+    /*─······································································─*/
+    
+    void      off() const noexcept { process::clear( obj->out ); }
+    void    close() const noexcept { process::clear( obj->out ); }
 
     /*─······································································─*/
 

include/nodepp/windows/mutex.cpp

@@ -19,7 +19,7 @@ namespace nodepp { namespace worker {
 
     void delay( ulong time ){ process::delay(time); }
     void yield(){ delay(TIMEOUT); SwitchToThread(); }
-    int    pid(){ return GetCurrentThreadId(); }
+    DWORD  pid(){ return GetCurrentThreadId(); }
     void  exit(){ ExitThread(0); }
 
 }}

include/nodepp/windows/worker.cpp

@@ -72,7 +72,10 @@ namespace nodepp { class worker_t {
 
     /*─······································································─*/
 
-    int    pid() const noexcept { return type::cast<int>(obj->id); }
+    DWORD  pid() const noexcept { return obj->id; }
+    
+    /*─······································································─*/
+
     void   off() const noexcept { process::clear( obj->out ); }
     void close() const noexcept { process::clear( obj->out ); }