Merge pull request #456 from MonkeybreadSoftware/patch-9

Update basic_json.hpp
danielaparker · Sep 25, 2023 · aca1d81 · aca1d81
2 parents 8e77f7c + 54bff68
commit aca1d81
Showing 1 changed file with 36 additions and 11 deletions.
diff --git a/include/jsoncons/basic_json.hpp b/include/jsoncons/basic_json.hpp
@@ -3088,17 +3088,42 @@ namespace jsoncons {
                     break;
                 case json_storage_kind::short_string_value:
                 case json_storage_kind::long_string_value:
-                    switch (rhs.storage_kind())
-                    {
-                        case json_storage_kind::short_string_value:
-                            return as_string_view().compare(rhs.as_string_view());
-                        case json_storage_kind::long_string_value:
-                            return as_string_view().compare(rhs.as_string_view());
-                        case json_storage_kind::json_const_pointer:
-                            return compare(*(rhs.cast<json_const_pointer_storage>().value()));
-                        default:
-                            return static_cast<int>(storage_kind()) - static_cast<int>((int)rhs.storage_kind());
-                    }
+					switch (tag())
+					{
+						case semantic_tag::bigint:
+						case semantic_tag::bigdec:
+						case semantic_tag::bigfloat:
+						{
+							// same text -> equal
+							if (rhs.storage_kind() == json_storage_kind::short_string_value || rhs.storage_kind() == json_storage_kind::long_string_value)
+							{
+								int compareString = as_string_view().compare(rhs.as_string_view());
+								if (compareString == 0)
+								{
+									return 0;
+								}
+							}
+
+							// compare big numbers as double
+							auto r = as<double>() - rhs.as<double>();
+							return r == 0 ? 0 : (r < 0.0 ? -1 : 1);
+						}
+						default:
+						{
+							// compare regular text
+							switch (rhs.storage_kind())
+							{
+								case json_storage_kind::short_string_value:
+									return as_string_view().compare(rhs.as_string_view());
+								case json_storage_kind::long_string_value:
+									return as_string_view().compare(rhs.as_string_view());
+								case json_storage_kind::json_const_pointer:
+									return compare(*(rhs.cast<json_const_pointer_storage>().value()));
+								default:
+									return static_cast<int>(storage_kind()) - static_cast<int>((int)rhs.storage_kind());
+							}
+						}
+					}
                     break;
                 case json_storage_kind::byte_string_value:
                     switch (rhs.storage_kind())