Fix BUILD file formatting and action mnemonics (#261)
* Fix BUILD file formatting and action mnemonics
* Fix generated C++ switch statements
diff --git a/BUILD b/BUILD
index 86e80ea..367acd8 100644
--- a/BUILD
+++ b/BUILD
@@ -16,7 +16,6 @@
load("@rules_license//rules:license.bzl", "license")
load("@rules_python//python:py_binary.bzl", "py_binary")
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
-load("@rules_shell//shell:sh_test.bzl", "sh_test")
package(
default_applicable_licenses = ["//:license"],
diff --git a/build_defs.bzl b/build_defs.bzl
index 49224ff..f2d21e8 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -114,6 +114,7 @@
outputs = [out],
arguments = [src.path, "--output-file=" + out.path] + imports + imports_arg,
executable = ctx.executable._emboss_compiler,
+ mnemonic = "Emboss",
)
transitive_sources = depset(
direct = [src],
@@ -193,6 +194,7 @@
arguments = [args],
inputs = emboss_info.direct_ir,
outputs = headers,
+ mnemonic = "EmbossCc",
)
runtime_cc_info = ctx.attr._emboss_cc_runtime[CcInfo]
transitive_headers = depset(
diff --git a/compiler/back_end/cpp/BUILD b/compiler/back_end/cpp/BUILD
index 3646c13..be3300f 100644
--- a/compiler/back_end/cpp/BUILD
+++ b/compiler/back_end/cpp/BUILD
@@ -24,7 +24,6 @@
default_visibility = [
"//visibility:private",
],
- features = ["-layering_check"],
)
py_binary(
diff --git a/compiler/back_end/cpp/generated_code_templates b/compiler/back_end/cpp/generated_code_templates
index a4a1111..ef99561 100644
--- a/compiler/back_end/cpp/generated_code_templates
+++ b/compiler/back_end/cpp/generated_code_templates
@@ -407,6 +407,8 @@
if (!emboss_reserved_switch_discrim.Known()) return false;
switch (emboss_reserved_switch_discrim.ValueOrDefault()) {
${switch_cases}
+
+ default: break;
}
}
diff --git a/integration/googletest/BUILD b/integration/googletest/BUILD
index 0d924f0..cddebb9 100644
--- a/integration/googletest/BUILD
+++ b/integration/googletest/BUILD
@@ -15,6 +15,10 @@
load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_cc//cc:cc_test.bzl", "cc_test")
+package(
+ default_applicable_licenses = ["//:license"],
+)
+
cc_library(
name = "emboss_test_util",
testonly = 1,
@@ -26,9 +30,6 @@
"@com_google_googletest//:gtest",
],
)
-package(
- default_applicable_licenses = ["//:license"],
-)
cc_test(
name = "emboss_test_util_test",
diff --git a/runtime/cpp/BUILD b/runtime/cpp/BUILD
index b195ef8..95ac8fa 100644
--- a/runtime/cpp/BUILD
+++ b/runtime/cpp/BUILD
@@ -16,6 +16,10 @@
load("@rules_cc//cc:cc_library.bzl", "cc_library")
+package(
+ default_applicable_licenses = ["//:license"],
+)
+
filegroup(
name = "raw_headers",
srcs = [
@@ -37,9 +41,6 @@
],
visibility = ["//:__subpackages__"],
)
-package(
- default_applicable_licenses = ["//:license"],
-)
cc_library(
name = "cpp_utils",
diff --git a/runtime/cpp/test/BUILD b/runtime/cpp/test/BUILD
index aa810b2..51719b0 100644
--- a/runtime/cpp/test/BUILD
+++ b/runtime/cpp/test/BUILD
@@ -19,6 +19,7 @@
":build_defs.bzl",
"emboss_cc_util_test",
)
+
package(
default_applicable_licenses = ["//:license"],
)
diff --git a/testdata/golden_cpp/condition.emb.h b/testdata/golden_cpp/condition.emb.h
index 43b6599..d79280b 100644
--- a/testdata/golden_cpp/condition.emb.h
+++ b/testdata/golden_cpp/condition.emb.h
@@ -387,6 +387,8 @@
+
+ default: break;
}
}
@@ -1459,6 +1461,8 @@
+
+ default: break;
}
}
@@ -2047,6 +2051,8 @@
+
+ default: break;
}
}
@@ -2562,6 +2568,8 @@
+
+ default: break;
}
}
@@ -3184,6 +3192,8 @@
+
+ default: break;
}
}
@@ -3729,6 +3739,8 @@
+
+ default: break;
}
}
@@ -3744,6 +3756,8 @@
+
+ default: break;
}
}
@@ -4367,6 +4381,8 @@
+
+ default: break;
}
}
@@ -6857,6 +6873,8 @@
+
+ default: break;
}
}
@@ -7533,6 +7551,8 @@
+
+ default: break;
}
}
@@ -13346,6 +13366,8 @@
+
+ default: break;
}
}
@@ -15019,6 +15041,8 @@
+
+ default: break;
}
}
@@ -16722,6 +16746,8 @@
+
+ default: break;
}
}
@@ -17350,6 +17376,8 @@
+
+ default: break;
}
}
diff --git a/testdata/golden_cpp/many_conditionals.emb.h b/testdata/golden_cpp/many_conditionals.emb.h
index 42f5a60..512cb07 100644
--- a/testdata/golden_cpp/many_conditionals.emb.h
+++ b/testdata/golden_cpp/many_conditionals.emb.h
@@ -812,6 +812,8 @@
+
+ default: break;
}
}
diff --git a/testdata/golden_cpp/parameters.emb.h b/testdata/golden_cpp/parameters.emb.h
index c0f3266..191d94f 100644
--- a/testdata/golden_cpp/parameters.emb.h
+++ b/testdata/golden_cpp/parameters.emb.h
@@ -421,6 +421,8 @@
+
+ default: break;
}
}
@@ -3396,6 +3398,8 @@
+
+ default: break;
}
}
diff --git a/testdata/golden_cpp/virtual_field.emb.h b/testdata/golden_cpp/virtual_field.emb.h
index f33786a..ed3cb43 100644
--- a/testdata/golden_cpp/virtual_field.emb.h
+++ b/testdata/golden_cpp/virtual_field.emb.h
@@ -9611,6 +9611,8 @@
+
+ default: break;
}
}
