Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion parser/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
20 changes: 1 addition & 19 deletions parser/src/main/java/dev/cel/parser/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ java_library(
tags = [
],
deps = [
":cel_g4_visitors",
":macro",
":operator",
":parser_builder",
Expand All @@ -54,6 +53,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",
Expand Down Expand Up @@ -103,24 +103,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,
Expand Down
27 changes: 27 additions & 0 deletions parser/src/main/java/dev/cel/parser/gen/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
"""
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")

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",
],
visibility = [
"//parser:__pkg__",
]
)