Skip to content

Commit 784a981

Browse files
committed
move antlr generated CEL parser to it's own package
This fixes a build failure on MacOS due to path conflict with CelParser.java.
1 parent cf3d719 commit 784a981

4 files changed

Lines changed: 29 additions & 20 deletions

File tree

parser/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java_library(
2626
java_library(
2727
name = "cel_g4_visitors",
2828
visibility = ["//visibility:public"],
29-
exports = ["//parser/src/main/java/dev/cel/parser:cel_g4_visitors"],
29+
exports = ["//parser/src/main/java/dev/cel/parser/gen:cel_g4_visitors"],
3030
)
3131

3232
java_library(

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ java_library(
4444
tags = [
4545
],
4646
deps = [
47-
":cel_g4_visitors",
4847
":macro",
4948
":operator",
5049
":parser_builder",
@@ -54,6 +53,7 @@ java_library(
5453
"//common/annotations",
5554
"//common/ast",
5655
"//common/internal",
56+
"//parser:cel_g4_visitors",
5757
"@maven//:com_google_errorprone_error_prone_annotations",
5858
"@maven//:com_google_guava_guava",
5959
"@maven//:org_antlr_antlr4_runtime",
@@ -103,24 +103,6 @@ java_library(
103103
],
104104
)
105105

106-
antlr4_java_combined(
107-
name = "cel_g4",
108-
src = "CEL.g4",
109-
listener = False,
110-
package = "cel.parser.internal",
111-
visitor = True,
112-
)
113-
114-
java_library(
115-
name = "cel_g4_visitors",
116-
srcs = [":cel_g4"],
117-
tags = [
118-
],
119-
deps = [
120-
"@maven//:org_antlr_antlr4_runtime",
121-
],
122-
)
123-
124106
java_library(
125107
name = "unparser",
126108
srcs = UNPARSER_SOURCES,
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
"""
2+
The generated parser is kept seperate from //parser/src/main/java/dev/cel/parser
3+
to avoid a path conflict with parser/src/main/java/dev/cel/parser/CelParser.java
4+
that causes build failures on filesystems with case-insensitive paths (e.g. macOS).
5+
"""
6+
load("//:antlr.bzl", "antlr4_java_combined")
7+
8+
antlr4_java_combined(
9+
name = "cel_g4",
10+
src = "CEL.g4",
11+
listener = False,
12+
package = "cel.parser.internal",
13+
visitor = True,
14+
)
15+
16+
java_library(
17+
name = "cel_g4_visitors",
18+
srcs = [":cel_g4"],
19+
tags = [
20+
],
21+
deps = [
22+
"@maven//:org_antlr_antlr4_runtime",
23+
],
24+
visibility = [
25+
"//parser:__pkg__",
26+
]
27+
)
File renamed without changes.

0 commit comments

Comments
 (0)