Merge pull request #28 from jespa007/develop

Develop
jespa007 · Aug 30, 2023 · 4205b1b · 4205b1b
2 parents 0b71cdc + efaba73
commit 4205b1b
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 27 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,23 @@
 
 
+----------------------------
+Date: 02/08/2023
+Version: 2.3.3
+
+- [x] deserialize_exception : Save line and description
+
+----------------------------
+Date: 02/08/2023
+Version: 2.3.2
+
+- [x] Change ArrayJsonVarNumber to ArrayNumberJsonVar
+
+----------------------------
+Date: 6/07/2023
+Version: 2.3.1
+
+- [x] Fix include directory for linux
+
 ----------------------------
 Date: 8/06/2023
 Version: 2.3.0

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -132,7 +132,7 @@ else()
 					message("-- Memmanager: -fsanitize NOT supported")
 				endif()
 			else()
-				message("-- Memmanager: OFF ($ENV{EIPM_DEVELOP_LIBS_CPP}/memmgr not exist)")
+				message("-- Memmanager: OFF (${PROJECT_SOURCE_DIR}/../../memmgr not exist)")
 			endif()
 	   	endif()
 

diff --git a/src/deserialize_exception.h b/src/deserialize_exception.h
@@ -8,27 +8,38 @@ namespace zetjsoncpp {
 
 	class deserialize_exception: public std::exception
 	{
-		std::string	error_description;
-
+		std::string	description;
+		int line;
+		std::string file;
 		char what_msg[4096];
 	public:
 
-		deserialize_exception(const char *  _file, int _line, const std::string & _error_description){
+		deserialize_exception(const char *  _file, int _line, const std::string & _description){
 
 			memset(what_msg,0,sizeof(what_msg));
-			error_description=_error_description;
+			description=_description;
+			line = _line;
 
 			if(_file != NULL  && *_file != 0){
-				sprintf(what_msg,"[file:%s line:%i] %s",_file, _line, (char *)error_description.c_str());
+				file=_file;
+				sprintf(what_msg,"[file:%s line:%i] %s",_file, _line, (char *)description.c_str());
 			}else{
-				sprintf(what_msg,"[line:%i] %s",_line,(char *)error_description.c_str());
+				sprintf(what_msg,"[line:%i] %s",_line,(char *)description.c_str());
 			}
 		}
 
 	    virtual const char* what() const throw()
 		{
 	    	return (const char *)what_msg;
 		}
+
+	    int getLine(){
+	    	return line;
+	    }
+
+	    const std::string & getDescription(){
+	    	return description;
+	    }
 	};
 }
 
diff --git a/src/jsonvar/ArrayNumberJsonVar.h b/src/jsonvar/ArrayNumberJsonVar.h
@@ -2,21 +2,21 @@ namespace zetjsoncpp{
 
 	// ARRAY FLOAT
 	template<char... _T_NAME>
-	class ArrayJsonVarNumber : public NamedJsonVar<_T_NAME...>, public ArrayJsonVar<NumberJsonVar<>> {
+	class ArrayNumberJsonVar : public NamedJsonVar<_T_NAME...>, public ArrayJsonVar<NumberJsonVar<>> {
 
 	public:
 		//_T_NAME name;
-		ArrayJsonVarNumber() {
+		ArrayNumberJsonVar() {
 			init();
 		}
 
-		ArrayJsonVarNumber(const std::vector<float> & _vec_numbers) {
+		ArrayNumberJsonVar(const std::vector<float> & _vec_numbers) {
 			init();
 			copy(_vec_numbers);
 		}
 
 
-		ArrayJsonVarNumber<> & operator=(const std::vector<float> & _vec_numbers){
+		ArrayNumberJsonVar<> & operator=(const std::vector<float> & _vec_numbers){
 			copy(_vec_numbers);
 			return *this;
 		}
@@ -50,7 +50,7 @@ namespace zetjsoncpp{
 			return shortBuf;
 		}
 
-		virtual ~ArrayJsonVarNumber() {
+		virtual ~ArrayNumberJsonVar() {
 		}
 
 	private:
@@ -63,7 +63,7 @@ namespace zetjsoncpp{
 
 		void init(){
 			this->__zj_type__ = JsonVarType::JSON_VAR_TYPE_VECTOR_OF_NUMBERS;
-			this->__zj_size_data__ = sizeof(ArrayJsonVarNumber<_T_NAME...>);
+			this->__zj_size_data__ = sizeof(ArrayNumberJsonVar<_T_NAME...>);
 		}
 	};
 }
diff --git a/src/jsonvar/JsonVar.cpp b/src/jsonvar/JsonVar.cpp
@@ -23,7 +23,7 @@ namespace zetjsoncpp {
 
 		case JSON_VAR_TYPE_VECTOR_OF_BOOLEANS: return "ArrayBooleanJsonVar";
 			//case ARRAY_INT32_TYPE: return "ARRAY INT32 TYPE";
-		case JSON_VAR_TYPE_VECTOR_OF_NUMBERS: return "ArrayJsonVarNumber";
+		case JSON_VAR_TYPE_VECTOR_OF_NUMBERS: return "ArrayNumberJsonVar";
 		case JSON_VAR_TYPE_VECTOR_OF_STRINGS: return "ArrayStringJsonVar";
 		case JSON_VAR_TYPE_VECTOR_OF_OBJECTS: return "ArrayObjectJsonVar";
 

diff --git a/src/jsonvar/JsonVar.h b/src/jsonvar/JsonVar.h
@@ -72,7 +72,7 @@
 #define ZJ_CAST_JSON_VAR_NUMBER 				(zetjsoncpp::NumberJsonVar<> *)
 #define ZJ_CAST_JSON_VAR_OBJECT 				(zetjsoncpp::ObjectJsonVar<> *)
 #define ZJ_CAST_JSON_VAR_VECTOR_OF_BOOLEANS 	(zetjsoncpp::ArrayBooleanJsonVar<> *)
-#define ZJ_CAST_JSON_VAR_VECTOR_OF_NUMBERS 		(zetjsoncpp::ArrayJsonVarNumber<> *)
+#define ZJ_CAST_JSON_VAR_VECTOR_OF_NUMBERS 		(zetjsoncpp::ArrayNumberJsonVar<> *)
 #define ZJ_CAST_JSON_VAR_VECTOR_OF_STRINGS 		(zetjsoncpp::ArrayStringJsonVar<> *)
 #define ZJ_CAST_JSON_VAR_VECTOR_OF_OBJECTS 		(zetjsoncpp::ArrayObjectJsonVar<> *)
 #define ZJ_CAST_JSON_VAR_MAP_OF_BOOLEANS 		(zetjsoncpp::MapBooleanJsonVar<> *)
@@ -86,7 +86,7 @@
 #define ZJ_VAR_OBJECT(type,name) zetjsoncpp::ObjectJsonVar<type,ZJ_CONST_CHAR(#name)>				name
 
 #define ZJ_VAR_VECTOR_BOOLEAN(name) zetjsoncpp::ArrayBooleanJsonVar<ZJ_CONST_CHAR(#name)>			name
-#define ZJ_VAR_VECTOR_NUMBER(name) zetjsoncpp::ArrayJsonVarNumber<ZJ_CONST_CHAR(#name)>			name
+#define ZJ_VAR_VECTOR_NUMBER(name) zetjsoncpp::ArrayNumberJsonVar<ZJ_CONST_CHAR(#name)>			name
 #define ZJ_VAR_VECTOR_STRING(name) zetjsoncpp::ArrayStringJsonVar<ZJ_CONST_CHAR(#name)>			name
 #define ZJ_VAR_VECTOR_OBJECT(type,name) zetjsoncpp::ArrayObjectJsonVar<type,ZJ_CONST_CHAR(#name)>	name
 

diff --git a/src/jsonvar/MapNumberJsonVar.h b/src/jsonvar/MapNumberJsonVar.h
@@ -15,7 +15,7 @@ namespace zetjsoncpp{
 		}
 
 
-		ArrayJsonVarNumber<> & operator=(const  std::map<std::string,float> & _map_numbers){
+		ArrayNumberJsonVar<> & operator=(const  std::map<std::string,float> & _map_numbers){
 			copy(_map_numbers);
 			return *this;
 		}

diff --git a/src/zetjsoncpp.h b/src/zetjsoncpp.h
@@ -27,7 +27,7 @@
 
 #define ZETJSONCPP_VERSION_MAJOR 2
 #define ZETJSONCPP_VERSION_MINOR 3
-#define ZETJSONCPP_VERSION_PATCH 0
+#define ZETJSONCPP_VERSION_PATCH 3
 
 #ifdef __MEMMANAGER__
 #include "memmgr.h"
@@ -36,9 +36,9 @@
 #define ZJ_UNUSUED_PARAM(x)			((void)(x))
 #define ZJ_UNUSUED_2PARAMS(x1,x2)	((void)(x1),(void)(x2))
 
-#include "utils\file_utils.h"
-#include "utils\path_utils.h"
-#include "utils\string_utils.h"
+#include "utils/file_utils.h"
+#include "utils/path_utils.h"
+#include "utils/string_utils.h"
 #include "deserialize_exception.h"
 #include "jsonvar/JsonVar.h"
 

diff --git a/src/zetjsoncpp_serializer.cpp b/src/zetjsoncpp_serializer.cpp
@@ -269,9 +269,9 @@ namespace zetjsoncpp{
 			);
 			break;
 		case JSON_VAR_TYPE_VECTOR_OF_NUMBERS:
-			serialize_json_var_vector<ArrayJsonVarNumber<>>(
+			serialize_json_var_vector<ArrayNumberJsonVar<>>(
 				_str_result
-				,(ArrayJsonVarNumber<> *)_json_var
+				,(ArrayNumberJsonVar<> *)_json_var
 				,_ident
 				,_minimized
 				,_discard_non_serialized

diff --git a/test/test.cpp b/test/test.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]){
 
 		std::cout << std::endl << "3. Testing json vector primitives..."<< std::endl<< std::endl;
 
-		auto v1=zetjsoncpp::deserialize<zetjsoncpp::ArrayJsonVarNumber<>>("[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]");
+		auto v1=zetjsoncpp::deserialize<zetjsoncpp::ArrayNumberJsonVar<>>("[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]");
 		std::cout <<"v1="<< zetjsoncpp::serialize(v1)<< std::endl;
 
 		auto v2=zetjsoncpp::deserialize<zetjsoncpp::ArrayStringJsonVar<>>("[\"string_1\",\"string_2\",\"string_3\",\"string_5\"]");

diff --git a/test/test_file.cpp b/test/test_file.cpp
@@ -31,7 +31,7 @@ typedef struct{
 	channels;
 
 	// Vector of numbers data
-	zetjsoncpp::ArrayJsonVarNumber<ZJ_CONST_CHAR("data")>
+	zetjsoncpp::ArrayNumberJsonVar<ZJ_CONST_CHAR("data")>
 	data;
 }Interpolation;
 

diff --git a/test/test_number.cpp b/test/test_number.cpp
@@ -17,8 +17,8 @@ void test_json_var_number(){
 			,{"id_3",2.5}
 	};
 
-	zetjsoncpp::ArrayJsonVarNumber<> jvn1=v1;
-	zetjsoncpp::ArrayJsonVarNumber<> jvn2=v2;
+	zetjsoncpp::ArrayNumberJsonVar<> jvn1=v1;
+	zetjsoncpp::ArrayNumberJsonVar<> jvn2=v2;
 	zetjsoncpp::MapNumberJsonVar<> 	  jmn1=m1;
 	size_t len=v1.size();