cc: Convert base file name to screaming snake case (#272)

* cc: Convert base file name to screaming snake case This patch converts the base file name into screaming snake case instead of upper for cc macro generation. This is motivated by: INFO: From Compiling external/com_github_openzipkin_zipkinapi/zipkin-jsonv2.pb.validate.cc: In file included from bazel-out/k8-opt/bin/external/com_github_openzipkin_zipkinapi/zipkin-jsonv2.pb.validate.cc:5: bazel-out/k8-opt/bin/external/com_github_openzipkin_zipkinapi/zipkin-jsonv2.pb.validate.h:37:31: warning: ISO C99 requires whitespace after the macro name [-Wc99-extensions] ^ 1 warning generated. As reported in envoyproxy/envoy#6985 (comment). Signed-off-by: Dhi Aurrahman <dio@tetrate.io> * Simple basename replacement Signed-off-by: Dhi Aurrahman <dio@tetrate.io> * Remove noise Signed-off-by: Dhi Aurrahman <dio@tetrate.io> * Remove upper, since it is not being used Signed-off-by: Dhi Aurrahman <dio@tetrate.io>
bufbuild · Sep 4, 2019 · fd7de02 · fd7de02
1 parent b2e4ad3
commit fd7de02
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 5 deletions.
diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl
@@ -75,7 +75,7 @@ def _protoc_python_output_files(proto_file_sources):
  for p in proto_file_sources:
  basename = p.basename[:-len(".proto")]
 
- python_srcs.append(basename + "_pb2.py")
+ python_srcs.append(basename.replace("-", "_", maxsplit = None) + "_pb2.py")
  return python_srcs
 
 def _protoc_gen_validate_python_impl(ctx):

diff --git a/templates/cc/BUILD.bazel b/templates/cc/BUILD.bazel
@@ -27,6 +27,7 @@ go_library(
  visibility = ["//visibility:public"],
  deps = [
  "//templates/shared:go_default_library",
+ "//vendor/github.com/iancoleman/strcase:go_default_library",
  "//vendor/github.com/lyft/protoc-gen-star:go_default_library",
  "//vendor/github.com/lyft/protoc-gen-star/lang/go:go_default_library",
  "@com_github_golang_protobuf//ptypes:go_default_library",

diff --git a/templates/cc/file.go b/templates/cc/file.go
@@ -70,7 +70,7 @@ using std::string;
 } // namespace
 {{ end }}
 
-#define X_{{ .Package.ProtoName.ScreamingSnakeCase }}_{{ .File.InputPath.BaseName | upper }}(X) \
+#define X_{{ .Package.ProtoName.ScreamingSnakeCase }}_{{ .File.InputPath.BaseName | screaming_snake_case }}(X) \
 {{ range .AllMessages -}}
  X({{class . }}) \
 {{ end }}

diff --git a/templates/cc/register.go b/templates/cc/register.go
@@ -11,6 +11,7 @@ import (
  "github.com/golang/protobuf/ptypes"
  "github.com/golang/protobuf/ptypes/duration"
  "github.com/golang/protobuf/ptypes/timestamp"
+ "github.com/iancoleman/strcase"
  pgs "github.com/lyft/protoc-gen-star"
  pgsgo "github.com/lyft/protoc-gen-star/lang/go"
 )
@@ -95,9 +96,9 @@ func RegisterHeader(tpl *template.Template, params pgs.Parameters) {
  fns := CCFuncs{pgsgo.InitContext(params)}
 
  tpl.Funcs(map[string]interface{}{
- "class": fns.className,
- "output": fns.output,
- "upper":  strings.ToUpper,
+ "class":  fns.className,
+ "output":  fns.output,
+ "screaming_snake_case": strcase.ToScreamingSnake,
  })
 
  template.Must(tpl.Parse(headerFileTpl))

diff --git a/tests/harness/cases/BUILD b/tests/harness/cases/BUILD
@@ -17,6 +17,7 @@ proto_library(
  "bool.proto",
  "bytes.proto",
  "enums.proto",
+ "filename-with-dash.proto",
  "kitchen_sink.proto",
  "maps.proto",
  "messages.proto",

diff --git a/tests/harness/cases/filename-with-dash.proto b/tests/harness/cases/filename-with-dash.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+package tests.harness.cases;
+option go_package = "cases";
+
+import "validate/validate.proto";
diff --git a/tests/harness/cc/harness.cc b/tests/harness/cc/harness.cc
@@ -15,6 +15,8 @@
 #include "tests/harness/cases/bytes.pb.validate.h"
 #include "tests/harness/cases/enums.pb.h"
 #include "tests/harness/cases/enums.pb.validate.h"
+#include "tests/harness/cases/filename-with-dash.pb.h"
+#include "tests/harness/cases/filename-with-dash.pb.validate.h"
 #include "tests/harness/cases/maps.pb.h"
 #include "tests/harness/cases/maps.pb.validate.h"
 #include "tests/harness/cases/messages.pb.h"

diff --git a/tests/harness/python/harness.py b/tests/harness/python/harness.py
@@ -6,6 +6,8 @@
 from tests.harness.cases.bool_pb2 import *
 from tests.harness.cases.bytes_pb2 import *
 from tests.harness.cases.enums_pb2 import *
+from tests.harness.cases.enums_pb2 import *
+from tests.harness.cases.filename_with_dash_pb2 import *
 from tests.harness.cases.messages_pb2 import *
 from tests.harness.cases.numbers_pb2 import *
 from tests.harness.cases.oneofs_pb2 import *