Skip to content

Commit 80e62bd

Browse files
committed
Simpler equality comparison to null
1 parent 74be575 commit 80e62bd

File tree

1 file changed

+4
-23
lines changed

1 file changed

+4
-23
lines changed

libjsonexpr/src/functions.cpp

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -586,45 +586,26 @@ function_registry make_default_functions() {
586586

587587
register_function(freg, "==", &safe_eq<number_integer_t, number_integer_t>);
588588
register_function(freg, "==", &safe_eq<number_integer_t, number_float_t>);
589-
register_function(freg, "==", &safe_eq<number_integer_t, null_t>);
590589
register_function(freg, "==", &safe_eq<number_float_t, number_integer_t>);
591590
register_function(freg, "==", &safe_eq<number_float_t, number_float_t>);
592-
register_function(freg, "==", &safe_eq<number_float_t, null_t>);
593591
register_function(freg, "==", &safe_eq<boolean_t, boolean_t>);
594-
register_function(freg, "==", &safe_eq<boolean_t, null_t>);
595592
register_function(freg, "==", &safe_eq<string_t, string_t>);
596-
register_function(freg, "==", &safe_eq<string_t, null_t>);
597593
register_function(freg, "==", &safe_eq<array_t, array_t>);
598-
register_function(freg, "==", &safe_eq<array_t, null_t>);
599-
register_function(freg, "==", &safe_eq<null_t, number_integer_t>);
600-
register_function(freg, "==", &safe_eq<null_t, number_float_t>);
601-
register_function(freg, "==", &safe_eq<null_t, boolean_t>);
602-
register_function(freg, "==", &safe_eq<null_t, string_t>);
603-
register_function(freg, "==", &safe_eq<null_t, array_t>);
604594
register_function(freg, "==", &safe_eq<null_t, null_t>);
605-
register_function(freg, "==", &safe_eq<null_t, object_t>);
606-
register_function(freg, "==", &safe_eq<object_t, null_t>);
595+
register_function(freg, "==", &safe_eq<null_t, json>);
596+
register_function(freg, "==", &safe_eq<json, null_t>);
607597
register_function(freg, "==", &safe_eq<object_t, object_t>);
608598

609599
register_function(freg, "!=", &safe_ne<number_integer_t, number_integer_t>);
610600
register_function(freg, "!=", &safe_ne<number_integer_t, number_float_t>);
611-
register_function(freg, "!=", &safe_ne<number_integer_t, null_t>);
612601
register_function(freg, "!=", &safe_ne<number_float_t, number_integer_t>);
613602
register_function(freg, "!=", &safe_ne<number_float_t, number_float_t>);
614-
register_function(freg, "!=", &safe_ne<number_float_t, null_t>);
615603
register_function(freg, "!=", &safe_ne<boolean_t, boolean_t>);
616-
register_function(freg, "!=", &safe_ne<boolean_t, null_t>);
617604
register_function(freg, "!=", &safe_ne<string_t, string_t>);
618-
register_function(freg, "!=", &safe_ne<string_t, null_t>);
619605
register_function(freg, "!=", &safe_ne<array_t, array_t>);
620-
register_function(freg, "!=", &safe_ne<array_t, null_t>);
621-
register_function(freg, "!=", &safe_ne<null_t, number_integer_t>);
622-
register_function(freg, "!=", &safe_ne<null_t, number_float_t>);
623-
register_function(freg, "!=", &safe_ne<null_t, boolean_t>);
624-
register_function(freg, "!=", &safe_ne<null_t, string_t>);
625-
register_function(freg, "!=", &safe_ne<null_t, array_t>);
626606
register_function(freg, "!=", &safe_ne<null_t, null_t>);
627-
register_function(freg, "!=", &safe_ne<null_t, object_t>);
607+
register_function(freg, "!=", &safe_ne<null_t, json>);
608+
register_function(freg, "!=", &safe_ne<json, null_t>);
628609
register_function(freg, "!=", &safe_ne<object_t, null_t>);
629610
register_function(freg, "!=", &safe_ne<object_t, object_t>);
630611

0 commit comments

Comments
 (0)