Fix some conformance tests

Mostly picking off some easy ones.

Author: stefanvanburen

src/celpy/celtypes.py

@@ -190,7 +190,7 @@
 import logging
 import re
 from functools import reduce, wraps
-from math import fsum
+from math import fsum, trunc
 from typing import (
     Any,
     Callable,
@@ -210,9 +210,8 @@
 )
 
 import pendulum
-from pendulum import timezone
 import pendulum.tz.exceptions
-
+from pendulum import timezone
 
 logger = logging.getLogger(f"celpy.{__name__}")
 
@@ -398,6 +397,12 @@ def __new__(cls: Type["BoolType"], source: Any) -> "BoolType":
             return source
         elif isinstance(source, MessageType):
             return super().__new__(cls, cast(int, source.get(StringType("value"))))
+        elif isinstance(source, (str, StringType)):
+            if source in ("False", "f", "FALSE", "false"):
+                return super().__new__(cls, 0)
+            if source in ("True", "t", "TRUE", "true"):
+                return super().__new__(cls, 1)
+            return super().__new__(cls, source)
         else:
             return super().__new__(cls, source)
 
@@ -495,11 +500,9 @@ def __rtruediv__(self, other: Any) -> "DoubleType":
         else:
             return DoubleType(super().__rtruediv__(other))
 
-    @type_matched
     def __eq__(self, other: Any) -> bool:
         return super().__eq__(other)
 
-    @type_matched
     def __ne__(self, other: Any) -> bool:
         return super().__ne__(other)
 
@@ -562,7 +565,7 @@ def __new__(
             # Used by protobuf.
             return super().__new__(cls, cast(int, source.get(StringType("value"))))
         elif isinstance(source, (float, DoubleType)):
-            convert = int64(round)
+            convert = int64(trunc)
         elif isinstance(source, TimestampType):
             convert = int64(lambda src: src.timestamp())
         elif isinstance(source, (str, StringType)) and source[:2] in {"0x", "0X"}:
@@ -642,27 +645,21 @@ def __rmod__(self, other: Any) -> "IntType":
         go_mod = left_sign * (abs(other) % abs(self))
         return IntType(go_mod)
 
-    @type_matched
     def __eq__(self, other: Any) -> bool:
         return super().__eq__(other)
 
-    @type_matched
     def __ne__(self, other: Any) -> bool:
         return super().__ne__(other)
 
-    @type_matched
     def __lt__(self, other: Any) -> bool:
         return super().__lt__(other)
 
-    @type_matched
     def __le__(self, other: Any) -> bool:
         return super().__le__(other)
 
-    @type_matched
     def __gt__(self, other: Any) -> bool:
         return super().__gt__(other)
 
-    @type_matched
     def __ge__(self, other: Any) -> bool:
         return super().__ge__(other)
 
@@ -729,7 +726,7 @@ def __new__(
         if isinstance(source, UintType):
             return source
         elif isinstance(source, (float, DoubleType)):
-            convert = uint64(round)
+            convert = uint64(trunc)
         elif isinstance(source, TimestampType):
             convert = uint64(lambda src: src.timestamp())
         elif isinstance(source, (str, StringType)) and source[:2] in {"0x", "0X"}:
@@ -799,11 +796,9 @@ def __rtruediv__(self, other: Any) -> "UintType":
     def __rmod__(self, other: Any) -> "UintType":
         return UintType(super().__rmod__(cast(IntType, other)))
 
-    @type_matched
     def __eq__(self, other: Any) -> bool:
         return super().__eq__(other)
 
-    @type_matched
     def __ne__(self, other: Any) -> bool:
         return super().__ne__(other)
 
@@ -841,6 +836,8 @@ def __ge__(self, other: Any) -> NoReturn:
         raise TypeError("no such overload")
 
     def __eq__(self, other: Any) -> bool:
+        if other is None:
+            return False
         if not isinstance(other, (list, ListType)):
             raise TypeError(f"no such overload: ListType == {type(other)}")
 
@@ -928,6 +925,8 @@ def __getitem__(self, key: Any) -> Any:
         return super().__getitem__(key)
 
     def __eq__(self, other: Any) -> bool:
+        if other is None:
+            return False
         if not isinstance(other, (Mapping, MapType)):
             raise TypeError(f"no such overload: MapType == {type(other)}")
 
@@ -990,7 +989,9 @@ def get(self, key: Any, default: Optional[Any] = None) -> Value:
     @staticmethod
     def valid_key_type(key: Any) -> bool:
         """Valid CEL key types. Plus native str for tokens in the source when evaluating ``e.f``"""
-        return isinstance(key, (IntType, UintType, BoolType, StringType, str))
+        return isinstance(
+            key, (IntType, UintType, BoolType, StringType, str, DoubleType)
+        )
 
     def contains(self, item: Value) -> BoolType:
         return BoolType(item in self)

tools/wip.toml

@@ -49,47 +49,8 @@ ternary = "@wip"
 timestamp = "@wip"
 
 [comparisons.eq_literal]
-eq_double_int = "@wip"
-eq_double_uint = "@wip"
-eq_dyn_double_int = "@wip"
-eq_dyn_double_uint = "@wip"
-eq_dyn_int_double = "@wip"
-eq_dyn_int_uint = "@wip"
 eq_dyn_json_null = "@wip"
-eq_dyn_uint_double = "@wip"
-eq_dyn_uint_int = "@wip"
-eq_int_double = "@wip"
-eq_int_uint = "@wip"
-eq_list_elem_mixed_types = "@wip"
-eq_list_mixed_type_numbers = "@wip"
-eq_map_mixed_type_numbers = "@wip"
-eq_map_value_mixed_types = "@wip"
-eq_mixed_types = "@wip"
-eq_uint_double = "@wip"
-eq_uint_int = "@wip"
-not_eq_double_int = "@wip"
 not_eq_double_nan = "@wip"
-not_eq_double_uint = "@wip"
-not_eq_dyn_double_int = "@wip"
-not_eq_dyn_double_null = "@wip"
-not_eq_dyn_double_uint = "@wip"
-not_eq_dyn_int_double = "@wip"
-not_eq_dyn_int_null = "@wip"
-not_eq_dyn_int_uint = "@wip"
-not_eq_dyn_list_null = "@wip"
-not_eq_dyn_map_null = "@wip"
-not_eq_dyn_timestamp_null = "@wip"
-not_eq_dyn_uint_double = "@wip"
-not_eq_dyn_uint_int = "@wip"
-not_eq_int_double = "@wip"
-not_eq_int_double_nan = "@wip"
-not_eq_int_uint = "@wip"
-not_eq_list_elem_null = "@wip"
-not_eq_list_mixed_type_numbers = "@wip"
-not_eq_map_null = "@wip"
-not_eq_uint_double = "@wip"
-not_eq_uint_double_nan = "@wip"
-not_eq_uint_int = "@wip"
 
 [comparisons.eq_wrapper]
 eq_bool = "@wip"
@@ -146,125 +107,51 @@ eq_uint64_proto2_null = "@wip"
 eq_uint64_proto3_null = "@wip"
 
 [comparisons.gt_literal]
-gt_dyn_int_double = "@wip"
 gt_dyn_int_small_lossy_double_greater = "@wip"
-gt_dyn_int_uint = "@wip"
 not_gt_dyn_big_double_int = "@wip"
 not_gt_dyn_int_big_double = "@wip"
 not_gt_dyn_int_big_uint = "@wip"
-not_gt_dyn_int_double = "@wip"
 not_gt_dyn_int_small_lossy_double = "@wip"
-not_gt_dyn_int_uint = "@wip"
 not_gt_dyn_small_double_int = "@wip"
-not_gt_dyn_small_int_uint = "@wip"
 
 [comparisons.gte_literal]
 gte_dyn_int_big_lossy_double = "@wip"
-gte_dyn_int_double = "@wip"
 gte_dyn_int_small_lossy_double_equal = "@wip"
 gte_dyn_int_small_lossy_double_greater = "@wip"
-gte_dyn_int_uint = "@wip"
 gte_dyn_small_double_int = "@wip"
 not_gte_dyn_int_big_double = "@wip"
 not_gte_dyn_int_big_uint = "@wip"
-not_gte_dyn_int_double = "@wip"
-not_gte_dyn_int_uint = "@wip"
-not_gte_dyn_small_int_uint = "@wip"
-
-[comparisons.in_list_literal]
-elem_in_mixed_type_list_cross_type = "@wip"
-
-[comparisons.in_map_literal]
-key_in_mixed_key_type_map_cross_type = "@wip"
 
 [comparisons.lt_literal]
-lt_dyn_int_big_lossy_double = "@wip"
-lt_dyn_int_big_uint = "@wip"
-lt_dyn_int_double = "@wip"
-lt_dyn_int_uint = "@wip"
-lt_dyn_small_int_uint = "@wip"
 not_lt_dyn_int_big_lossy_double = "@wip"
-not_lt_dyn_int_double = "@wip"
-not_lt_dyn_int_small_double = "@wip"
 not_lt_dyn_int_small_lossy_double = "@wip"
-not_lt_dyn_int_uint = "@wip"
 not_lt_dyn_small_double_int = "@wip"
 
 [comparisons.lte_literal]
 lte_dyn_big_double_int = "@wip"
-lte_dyn_int_big_double = "@wip"
-lte_dyn_int_big_uint = "@wip"
-lte_dyn_int_double = "@wip"
 lte_dyn_int_small_lossy_double = "@wip"
-lte_dyn_int_uint = "@wip"
 lte_dyn_small_double_int = "@wip"
-lte_dyn_small_int_uint = "@wip"
-not_lte_dyn_int_double = "@wip"
 not_lte_dyn_int_small_lossy_double_less = "@wip"
-not_lte_dyn_int_uint = "@wip"
 
 [comparisons.ne_literal]
-ne_double_int = "@wip"
 ne_double_nan = "@wip"
-ne_double_uint = "@wip"
-ne_int_double = "@wip"
-ne_int_uint = "@wip"
-ne_mixed_types = "@wip"
-ne_proto2_any_unpack = "@wip"
 ne_proto2_any_unpack_bytewise_fallback = "@wip"
-ne_proto3_any_unpack = "@wip"
 ne_proto3_any_unpack_bytewise_fallback = "@wip"
 ne_proto_different_types = "@wip"
-ne_uint_double = "@wip"
-not_ne_double_int = "@wip"
 not_ne_double_nan = "@wip"
-not_ne_double_uint = "@wip"
-not_ne_int_double = "@wip"
-not_ne_int_double_nan = "@wip"
-not_ne_int_uint = "@wip"
-not_ne_uint_double = "@wip"
-not_ne_uint_double_nan = "@wip"
-
-[conversions.bool]
-string_f = "@wip"
-string_false_lowercase = "@wip"
-string_false_pascalcase = "@wip"
-string_false_uppercase = "@wip"
-string_t = "@wip"
-string_true_lowercase = "@wip"
-string_true_pascalcase = "@wip"
-string_true_uppercase = "@wip"
 
 [conversions.identity]
 timestamp = "@wip"
 
 [conversions.int]
-double_half_neg = "@wip"
-double_half_pos = "@wip"
 double_int_min_range = "@wip"
-double_truncate = "@wip"
-double_truncate_neg = "@wip"
-
-[conversions.uint]
-double_half = "@wip"
-double_truncate = "@wip"
 
 [dynamic.any]
 literal = "@wip"
 
-[dynamic.bool]
-literal = "@wip"
-literal_empty = "@wip"
-
-[dynamic.bytes]
-literal = "@wip"
-literal_unicode = "@wip"
-
 [dynamic.double]
 field_read_proto2_unset = "@wip"
 field_read_proto3_unset = "@wip"
-literal = "@wip"
-literal_zero = "@wip"
 
 [dynamic.float]
 field_assign_proto2_range = "@wip"
@@ -406,15 +293,6 @@ comparison_false = "@wip"
 comparison_true = "@wip"
 convert_symbol_to_int = "@wip"
 
-[fields.in]
-mixed_numbers_and_keys_absent = "@wip"
-mixed_numbers_and_keys_present = "@wip"
-
-[fields.map_fields]
-map_key_mixed_numbers_double_key = "@wip"
-map_key_mixed_numbers_int_key = "@wip"
-map_key_mixed_numbers_uint_key = "@wip"
-
 [fields.quoted_map_fields]
 field_access_dash = "@wip"
 field_access_dot = "@wip"
@@ -423,14 +301,6 @@ has_field_dash = "@wip"
 has_field_dot = "@wip"
 has_field_slash = "@wip"
 
-[lists.in]
-double_in_ints = "@wip"
-double_in_uints = "@wip"
-int_in_doubles = "@wip"
-int_in_uints = "@wip"
-uint_in_doubles = "@wip"
-uint_in_ints = "@wip"
-
 [lists.index]
 zero_based_double = "@wip"