Fix compilation and test issues on Windows

PiperOrigin-RevId: 908247644

Author: dmitriplotnikov

.bazelrc

@@ -1,4 +1,15 @@
+# Enable platform-specific configuration.
+# This allows Bazel to automatically pick up the `windows` config on Windows.
+common --enable_platform_specific_config
+
 # Disable automatic creation of `__init__.py` files, which prevent multiple
 # workspaces from providing files with the same package prefix (e.g., "cel").
 # See https://github.com/bazelbuild/rules_python/issues/330.
-build --incompatible_default_to_explicit_init_py
+build --incompatible_default_to_explicit_init_py
+
+# MSVC: Use the C++20 standard in order to support C++20 features that were introduced in clang and gcc
+build:windows --copt="/std:c++20" --cxxopt="/std:c++20"
+# MSVC: Enable modern standards-compatible preprocessor
+build:windows --cxxopt="/Zc:preprocessor" --host_cxxopt="/Zc:preprocessor"
+# MSVC: Link ANTLR statically to avoid Windows DLL linking errors
+build:windows --cxxopt="-DANTLR4CPP_STATIC" --host_cxxopt="-DANTLR4CPP_STATIC"

MODULE.bazel

@@ -21,6 +21,10 @@ _CEL_CPP_SHA256 = "d1b9b2c2e9745826c1c8540a49f972ea4b93dffd5878c6a67756a2627b011
 
 archive_override(
     module_name = "cel-cpp",
+    patch_cmds = [
+        # ABSL_CONST_INIT is incompatible with MSVC-CL with the /std:c++20 option
+        "sed -i 's/ABSL_CONST_INIT //g' common/values/optional_value.cc",
+    ],
     sha256 = _CEL_CPP_SHA256,
     strip_prefix = "cel-cpp-" + _CEL_CPP_COMMIT,
     url = "https://github.com/google/cel-cpp/archive/" + _CEL_CPP_COMMIT + ".tar.gz",
@@ -53,6 +57,15 @@ bazel_dep(name = "rules_proto", version = "7.1.0")
 # https://registry.bazel.build/modules/rules_python
 bazel_dep(name = "rules_python", version = "1.7.0")
 
+# On Windows the file system is case-insensitive, which creates a collision between
+# antlr4-cpp-runtime/VERSION and the system `#include <version>`
+single_version_override(
+    module_name = "antlr4-cpp-runtime",
+    patch_cmds = [
+        "mv VERSION VERSION.txt",
+    ],
+)
+
 python_rules = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python_rules.toolchain(
     is_default = True,

cel_expr_python/BUILD

@@ -142,6 +142,9 @@ cc_library(
 py_test(
     name = "cel_test",
     srcs = ["cel_test.py"],
+    data = [
+        ":cel",
+    ],
     deps = [
         ":cel",
         "//testing:proto2_test_all_types_py_pb2",
@@ -153,6 +156,13 @@ py_test(
 py_test(
     name = "cel_env_test",
     srcs = ["cel_env_test.py"],
+    data = [
+        ":cel",
+        "//cel_expr_python/ext:ext_bindings",
+        "//cel_expr_python/ext:ext_math",
+        "//cel_expr_python/ext:ext_optional",
+        "//cel_expr_python/ext:ext_strings",
+    ],
     deps = [
         ":cel",
         "//cel_expr_python/ext:ext_bindings",

cel_expr_python/cel_test.py

@@ -160,7 +160,10 @@ def testEvalInt64(self):
     self.assertEqual(res.value(), 42)
     res = self._eval("var_int", {"var_int": 1000000000000000000000000})
     self.assertEqual(res.type(), cel.Type.ERROR)
-    self.assertIn("int too large", res.value())
+    self.assertTrue(
+        "int too large" in res.value() or "int too big" in res.value(),
+        msg=f"Unexpected error message: {res.value()}",
+    )
     res = self._eval("var_int - 2", {"var_int": 3.14})
     self.assertEqual(res.type(), cel.Type.ERROR)
     self.assertIn(
@@ -197,7 +200,11 @@ def testEvalUint64(self):
     self.assertEqual(res.value(), 43)
     res = self._eval("var_uint + 1u", {"var_uint": -42})
     self.assertEqual(res.type(), cel.Type.ERROR)
-    self.assertIn("can't convert negative value to unsigned int", res.value())
+    self.assertTrue(
+        "can't convert negative value to unsigned int" in res.value()
+        or "can't convert negative int to unsigned" in res.value(),
+        msg=f"Unexpected error message: {res.value()}",
+    )
 
   def testEvalDouble(self):
     res: cel.Value = self._eval("3.14", expected_return_type=cel.Type.DOUBLE)

cel_expr_python/py_cel_type.cc

@@ -404,15 +404,15 @@ absl::StatusOr<PyCelType> PyCelType::ForPyObject(
 
   if (PyNumber_Check(py_object)) {
     // Attempt to convert to a signed 64-bit integer.
-    PyLong_AsLong(py_object);
+    PyLong_AsLongLong(py_object);
     if (!PyErr_Occurred()) {
       return PyCelType::Int();
     }
     PyErr_Clear();
 
     // If the value is too large for a signed 64-bit integer, try converting
     // to an unsigned 64-bit integer. If successful, return a UINT type.
-    PyLong_AsUnsignedLong(py_object);
+    PyLong_AsUnsignedLongLong(py_object);
     if (!PyErr_Occurred()) {
       return PyCelType::Uint();
     }

cel_expr_python/py_cel_value.cc

@@ -483,7 +483,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
     }
     case cel::Kind::kInt: {
       if (bypass_type_check || PyNumber_Check(py_object)) {
-        int64_t value = PyLong_AsLong(py_object);
+        int64_t value = PyLong_AsLongLong(py_object);
         if (PyErr_Occurred()) {
           return cel::ErrorValue(PyErr_toStatus());
         }
@@ -494,7 +494,7 @@ absl::StatusOr<cel::Value> PyObjectToCelValue(
     }
     case cel::Kind::kUint: {
       if (bypass_type_check || PyNumber_Check(py_object)) {
-        uint64_t value = PyLong_AsUnsignedLong(py_object);
+        uint64_t value = PyLong_AsUnsignedLongLong(py_object);
         if (PyErr_Occurred()) {
           return cel::ErrorValue(PyErr_toStatus());
         }

cel_expr_python/py_error_status.cc

@@ -42,7 +42,8 @@ static absl::Status PyErrorToStatus(PyObject* py_type, PyObject* py_error) {
            {PyExc_SyntaxError, absl::StatusCode::kInternal},
            {PyExc_TypeError, absl::StatusCode::kInvalidArgument},
            {PyExc_ValueError, absl::StatusCode::kOutOfRange},
-           {PyExc_LookupError, absl::StatusCode::kNotFound}});
+           {PyExc_LookupError, absl::StatusCode::kNotFound},
+           {PyExc_OverflowError, absl::StatusCode::kOutOfRange}});
   PyObject* pystr = PyObject_Str(py_error);
   const char* message = pystr ? PyUnicode_AsUTF8(pystr) : "Unknown error";
   Py_XDECREF(pystr);

conformance/BUILD

@@ -35,18 +35,29 @@ _ALL_TESTS = [
 py_test(
     name = "conformance_test",
     srcs = ["conformance_test.py"],
-    data = _ALL_TESTS,
+    data = _ALL_TESTS + [
+        "//cel_expr_python:cel",
+        "//cel_expr_python/ext:ext_bindings",
+        "//cel_expr_python/ext:ext_encoders",
+        "//cel_expr_python/ext:ext_math",
+        "//cel_expr_python/ext:ext_optional",
+        "//cel_expr_python/ext:ext_proto",
+        "//cel_expr_python/ext:ext_strings",
+    ],
+    env = {
+        "TEST_FILES": ",".join(["$(rlocationpath %s)" % t for t in _ALL_TESTS]),
+    },
     deps = [
         "@com_google_cel_spec//proto/cel/expr:checked_py_pb2",
         "@com_google_cel_spec//proto/cel/expr:value_py_pb2",
-        "//cel_expr_python:cel",
+        "@com_google_absl_py//absl/testing:absltest",
         "//cel_expr_python/ext:ext_bindings",
         "//cel_expr_python/ext:ext_encoders",
         "//cel_expr_python/ext:ext_math",
         "//cel_expr_python/ext:ext_optional",
         "//cel_expr_python/ext:ext_proto",
         "//cel_expr_python/ext:ext_strings",
-        "@com_google_absl_py//absl/testing:absltest",
+        "//cel_expr_python:cel",
         "//testing:proto2_test_all_types_py_pb2",
         "//testing:proto3_test_all_types_py_pb2",
         "//testing:simple_py_pb2",

conformance/conformance_test.py

@@ -73,6 +73,8 @@ class ConformanceTestSuite(unittest.TestSuite):
       "optionals/optionals/optional_struct_optindex_index_value",
       "optionals/optionals/optional_struct_optindex_value",
       "optionals/optionals/struct_optindex_value",
+      # TODO(b/507568865): Timezone support on Windows.
+      "timestamps/timestamp_selectors_tz/.*",
   ]
 
   def __init__(self):
@@ -96,9 +98,7 @@ def _load_tests(self):
     This function names tests as "file_name/section_name/test_name", and adds
     them to the test suite.
     """
-    testfiles = self._all_test_files(
-        "cel-spec+/tests/simple/testdata"
-    )
+    testfiles = self._all_test_files()
 
     for testfile in testfiles:
       with open(testfile, "rb", encoding=None, errors=None) as data_file:
@@ -117,17 +117,18 @@ def _load_tests(self):
           if not should_skip:
             self.addTest(ConformanceTest(test_name, test))
 
-  def _all_test_files(self, path: str) -> list[str]:
+  def _all_test_files(self) -> list[str]:
     r = runfiles.Create()
-    location = r.Rlocation(path)
-    if not location:
-      raise ValueError("Could not resolve path: " + path)
-
     test_files = []
-    for root, _, files in os.walk(location):
-      for f in files:
-        if f.endswith(".textproto"):
-          test_files.append(os.path.join(root, f))
+    env_test_files = os.environ.get("TEST_FILES")
+    if env_test_files:
+      for f in env_test_files.split(","):
+        location = r.Rlocation(f)
+        if location:
+          test_files.append(location)
+        else:
+          raise ValueError(f"Could not resolve path: {f}")
+
     return sorted(test_files)
 
 

custom_ext/BUILD

@@ -33,14 +33,19 @@ pybind_extension(
 py_library(
     name = "sample_cel_ext_py",
     srcs = ["sample_cel_ext.py"],
-    deps = [
+    data = [
         "//cel_expr_python:cel",
     ],
+    deps = ["//cel_expr_python:cel"],
 )
 
 py_test(
     name = "custom_ext_test",
     srcs = ["custom_ext_test.py"],
+    data = [
+        ":sample_cel_ext_cc",
+        "//cel_expr_python:cel",
+    ],
     deps = [
         ":sample_cel_ext_cc",
         ":sample_cel_ext_py",