adds jv_unshare(), jv_is_unshared()

src/jq_test.c

@@ -490,4 +490,26 @@ static void jv_test() {
     //jv_dump(jv_copy(o2), 0); printf("\n");
     jv_free(o2);
   }
+
+  {
+	jv input = jv_parse("{\"key\":[{\"this\":{\"some\":\"thing\"}}, 1, [true]]}");
+	jv output = jv_paths(jv_copy(input));
+	jv_dump(input, JV_PRINT_TAB);
+	jv_dump(output, JV_PRINT_TAB);
+  }
+
+  {
+	jv input = jv_parse("{\"key\":{\"some\":{\"test\":\"value\"}, \"other\":\"thing\"}}");
+	jv add = jv_parse("{\"some\":{\"test\":\"other\"}, \"added\":\"thing\"}");
+	jv output = jv_addpath(jv_copy(input), JV_ARRAY(jv_string("key")), jv_copy(add));
+	jv_dump(input, JV_PRINT_TAB);
+	jv_dump(add, JV_PRINT_TAB);
+	jv_dump(output, JV_PRINT_TAB);
+  }
+
+  {
+	jv output = jv_unshare(jv_parse("{\"test\":[{\"some\":\"value\"}, 1, true, false, null]}"));
+
+	jv_free(output);
+  }
 }

src/jv.c

@@ -1862,6 +1862,68 @@ jv jv_object_iter_value(jv object, int iter) {
 /*
  * Memory management
  */
+jv jv_unshare(jv input){
+	switch(jv_get_kind(input)){
+		case JV_KIND_INVALID:
+			if(!jv_invalid_has_msg(jv_copy(input))){
+				jv_free(input);
+				return jv_invalid();
+			}
+			return jv_invalid_with_msg(jv_unshare(jv_invalid_get_msg(jv_copy(input))));
+		case JV_KIND_OBJECT:
+		case JV_KIND_ARRAY:
+			{
+				jv keys = jv_keys(jv_copy(input));
+				size_t keys_length = jv_array_length(jv_copy(keys));
+
+				jv output_object;
+				if(jv_get_kind(input) == JV_KIND_OBJECT){
+					output_object = jv_object();
+				}else{
+					output_object = jv_array();
+				}
+
+				for(size_t i = 0; i < keys_length; i++){
+					jv key = JV_ARRAY(jv_unshare(jv_array_get(jv_copy(keys), i)));
+
+					output_object = jv_setpath(
+						output_object,key,
+						jv_unshare(
+							jv_getpath(jv_copy(output_object), jv_copy(key))
+						)
+					);
+				}
+
+				jv_free(keys);
+				jv_free(input);
+				return output_object;
+			}
+		case JV_KIND_STRING:
+			{
+				jv output_string = jv_string(jv_string_value(input));
+				jv_free(input);
+				return output_string;
+			}
+		case JV_KIND_NUMBER:
+			{
+				double val = jv_number_value(input);
+				jv_free(input);
+				return jv_number(val);
+			}
+		case JV_KIND_TRUE:
+			jv_free(input);
+			return jv_true();
+		case JV_KIND_FALSE:
+			jv_free(input);
+			return jv_false();
+		case JV_KIND_NULL:
+			jv_free(input);
+			return jv_null();
+		default:
+			return jv_invalid();
+	}
+}
+
 jv jv_copy(jv j) {
   if (JVP_IS_ALLOCATED(j)) {
     jvp_refcnt_inc(j.u.ptr);

src/jv.h

@@ -51,6 +51,8 @@ jv_kind jv_get_kind(jv);
 const char* jv_kind_name(jv_kind);
 static int jv_is_valid(jv x) { return jv_get_kind(x) != JV_KIND_INVALID; }
 
+//jv_unshare() creates a deep copy of the input aka the content of the output will be identical to the input, but no shared memory exists between them
+jv jv_unshare(jv);
 jv jv_copy(jv);
 void jv_free(jv);
 
@@ -256,8 +258,10 @@ jv jv_get(jv, jv);
 jv jv_set(jv, jv, jv);
 jv jv_has(jv, jv);
 jv jv_setpath(jv, jv, jv);
+jv jv_addpath(jv, jv, jv);
 jv jv_getpath(jv, jv);
 jv jv_delpaths(jv, jv);
+jv jv_paths(jv);
 jv jv_keys(jv /*object or array*/);
 jv jv_keys_unsorted(jv /*object or array*/);
 int jv_cmp(jv, jv);

src/jv_aux.c

@@ -427,6 +427,70 @@ jv jv_setpath(jv root, jv path, jv value) {
   return jv_set(root, pathcurr, jv_setpath(subroot, pathrest, value));
 }
 
+jv jv_addpath(jv root, jv path, jv add){
+	if(jv_get_kind(path) != JV_KIND_ARRAY || !jv_is_valid(add)){
+		jv_free(root);
+		jv_free(path);
+		jv_free(add);
+		return jv_invalid();
+	}
+
+	if(jv_get_kind(root) != JV_KIND_OBJECT && jv_get_kind(root) != JV_KIND_ARRAY){
+		jv_free(root);
+
+		if(!jv_equal(jv_copy(path), jv_array())){
+			jv_free(path);
+			jv_free(add);
+			return jv_invalid();
+		}
+
+		jv_free(path);
+
+		return add;
+	}
+
+	if(!jv_equal(jv_copy(path), jv_array())){
+		return jv_setpath(root, path, jv_addpath(jv_getpath(jv_copy(root), jv_copy(path)), jv_array(), add));
+	}
+
+	jv root_paths = jv_paths(jv_copy(root));
+	jv add_paths = jv_paths(jv_copy(add));
+
+	size_t add_paths_length = jv_array_length(jv_copy(add_paths));
+
+	for(size_t i = 0; i < add_paths_length; i++){
+		jv add_path = jv_array_get(jv_copy(add_paths), i);
+		jv add_path_value = jv_getpath(jv_copy(add), jv_copy(add_path));
+
+		if(!jv_is_valid(add_path_value) || jv_get_kind(add_path_value) == JV_KIND_NULL){
+			jv_free(root);
+			jv_free(path);
+			jv_free(add);
+			jv_free(root_paths);
+			jv_free(add_paths);
+			jv_free(add_path);
+			jv_free(add_path_value);
+			return jv_invalid();
+		}
+
+		if(jv_get_kind(add_path_value) == JV_KIND_OBJECT || jv_get_kind(add_path_value) == JV_KIND_ARRAY){
+			jv_free(add_path);
+			jv_free(add_path_value);
+			continue;
+		}
+
+		root = jv_setpath(root, add_path, add_path_value);
+	}
+
+	jv_free(path);
+	jv_free(add);
+
+	jv_free(root_paths);
+	jv_free(add_paths);
+
+	return root;
+}
+
 jv jv_getpath(jv root, jv path) {
   if (jv_get_kind(path) != JV_KIND_ARRAY) {
     jv_free(root);
@@ -538,6 +602,47 @@ static int string_cmp(const void* pa, const void* pb){
   return r;
 }
 
+jv jv_paths(jv input){
+	if(jv_get_kind(input) != JV_KIND_OBJECT && jv_get_kind(input) != JV_KIND_ARRAY){
+		jv_free(input);
+		return jv_invalid();
+	}
+
+	jv keys = jv_keys(jv_copy(input));
+
+	size_t keys_length = jv_array_length(jv_copy(keys));
+
+	jv output = jv_array();
+
+	for(size_t i = 0; i < keys_length; i++){
+		jv key = jv_array_get(jv_copy(keys), i);
+		jv insert_paths = jv_paths(jv_getpath(jv_copy(input), JV_ARRAY(jv_copy(key))));
+
+		output = jv_array_append(output, JV_ARRAY(jv_copy(key)));
+
+		if(jv_get_kind(insert_paths) == JV_KIND_INVALID){
+			jv_free(insert_paths);
+			jv_free(key);
+
+			continue;
+		}
+
+		size_t paths_length = jv_array_length(jv_copy(insert_paths));
+
+		for(size_t j = 0; j < paths_length; j++){
+			output = jv_array_append(output, jv_array_concat(JV_ARRAY(jv_copy(key)), jv_array_get(jv_copy(insert_paths), j)));
+		}
+
+		jv_free(key);
+		jv_free(insert_paths);
+	}
+
+	jv_free(input);
+	jv_free(keys);
+
+	return output;
+}
+
 jv jv_keys_unsorted(jv x) {
   if (jv_get_kind(x) != JV_KIND_OBJECT)
     return jv_keys(x);