Merge pull request #194 from mikedanese:fix

PiperOrigin-RevId: 592078971

Author: copybara-github

parser/BUILD.bazel

@@ -26,7 +26,7 @@ java_library(
 java_library(
     name = "cel_g4_visitors",
     visibility = ["//visibility:public"],
-    exports = ["//parser/src/main/java/dev/cel/parser:cel_g4_visitors"],
+    exports = ["//parser/src/main/java/dev/cel/parser/gen:cel_g4_visitors"],
 )
 
 java_library(

parser/src/main/java/dev/cel/parser/BUILD.bazel

@@ -1,5 +1,3 @@
-load("//:antlr.bzl", "antlr4_java_combined")
-
 package(
     default_applicable_licenses = ["//:license"],
     default_visibility = [
@@ -44,7 +42,6 @@ java_library(
     tags = [
     ],
     deps = [
-        ":cel_g4_visitors",
         ":macro",
         ":operator",
         ":parser_builder",
@@ -54,6 +51,7 @@ java_library(
         "//common/annotations",
         "//common/ast",
         "//common/internal",
+        "//parser:cel_g4_visitors",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:org_antlr_antlr4_runtime",
@@ -103,24 +101,6 @@ java_library(
     ],
 )
 
-antlr4_java_combined(
-    name = "cel_g4",
-    src = "CEL.g4",
-    listener = False,
-    package = "cel.parser.internal",
-    visitor = True,
-)
-
-java_library(
-    name = "cel_g4_visitors",
-    srcs = [":cel_g4"],
-    tags = [
-    ],
-    deps = [
-        "@maven//:org_antlr_antlr4_runtime",
-    ],
-)
-
 java_library(
     name = "unparser",
     srcs = UNPARSER_SOURCES,

parser/src/main/java/dev/cel/parser/gen/BUILD.bazel

@@ -0,0 +1,32 @@
+"""
+The generated parser is kept seperate from //parser/src/main/java/dev/cel/parser
+to avoid a path conflict with parser/src/main/java/dev/cel/parser/CelParser.java
+that causes build failures on filesystems with case-insensitive paths (e.g. macOS).
+"""
+
+load("//:antlr.bzl", "antlr4_java_combined")
+
+package(
+    default_applicable_licenses = ["//:license"],
+)
+
+antlr4_java_combined(
+    name = "cel_g4",
+    src = "CEL.g4",
+    listener = False,
+    package = "cel.parser.internal",
+    visitor = True,
+)
+
+java_library(
+    name = "cel_g4_visitors",
+    srcs = [":cel_g4"],
+    tags = [
+    ],
+    visibility = [
+        "//parser:__pkg__",
+    ],
+    deps = [
+        "@maven//:org_antlr_antlr4_runtime",
+    ],
+)