[fidl][llcpp] rename some templates
Change-Id: I28d73a5b5a3fcf5cfb58b3ec5d9903ac411b888b
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/405053
Reviewed-by: Yifei Teng <yifeit@google.com>
Testability-Review: Yifei Teng <yifeit@google.com>
Commit-Queue: Vincent Belliard <vbelliard@google.com>
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/client_async_methods.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/client_async_methods.tmpl.go
index c8f8184..5d8a40b 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/client_async_methods.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/client_async_methods.tmpl.go
@@ -46,11 +46,11 @@
::fidl::internal::ClientBase::PrepareAsyncTxn(_context);
{{- if .LLProps.LinearizeRequest }}
{{ .Name }}Request _request(_context->Txid()
- {{- template "PassthroughRequestParams" .Request -}}
+ {{- template "CommaPassthroughMessageParams" .Request -}}
);
{{- else }}
new (_request_buffer.data()) {{ .Name }}Request(_context->Txid()
- {{- template "PassthroughRequestParams" .Request -}}
+ {{- template "CommaPassthroughMessageParams" .Request -}}
);
{{- end }}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/protocol.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/protocol.tmpl.go
index bfcf2d6..8e252c6 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/protocol.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/protocol.tmpl.go
@@ -5,35 +5,29 @@
package fragments
const Protocol = `
+{{- define "ArgumentDeclaration" -}}
+ {{- if eq .Type.LLFamily TrivialCopy }}
+ {{ .Type.LLDecl }} {{ .Name }}
+ {{- else if eq .Type.LLFamily Reference }}
+ {{ .Type.LLDecl }}& {{ .Name }}
+ {{- else if eq .Type.LLFamily String }}
+ const {{ .Type.LLDecl }}& {{ .Name }}
+ {{- else if eq .Type.LLFamily Vector }}
+ {{ .Type.LLDecl }}& {{ .Name }}
+ {{- end }}
+{{- end }}
+
{{- /* Defines the arguments for a response method/constructor. */}}
-{{- define "ResponsePrototype" -}}
+{{- define "MessagePrototype" -}}
{{- range $index, $param := . -}}
- {{- if $index }}, {{- end}}
- {{- if eq $param.Type.LLFamily TrivialCopy }}
- {{ $param.Type.LLDecl }} {{ $param.Name }}
- {{- else if eq $param.Type.LLFamily Reference }}
- {{ $param.Type.LLDecl }}& {{ $param.Name }}
- {{- else if eq $param.Type.LLFamily String }}
- const {{ $param.Type.LLDecl }}& {{ $param.Name }}
- {{- else if eq $param.Type.LLFamily Vector }}
- {{ $param.Type.LLDecl }}& {{ $param.Name }}
- {{- end }}
+ {{- if $index }}, {{ end}}{{ template "ArgumentDeclaration" $param }}
{{- end -}}
{{- end }}
{{- /* Defines the arguments for a request method/constructor. */}}
-{{- define "RequestPrototype" -}}
- zx_txid_t _txid
- {{- range $index, $param := . -}}
- {{- if eq $param.Type.LLFamily TrivialCopy }}
- , {{ $param.Type.LLDecl }} {{ $param.Name }}
- {{- else if eq $param.Type.LLFamily Reference }}
- , {{ $param.Type.LLDecl }}& {{ $param.Name }}
- {{- else if eq $param.Type.LLFamily String }}
- , const {{ $param.Type.LLDecl }}& {{ $param.Name }}
- {{- else if eq $param.Type.LLFamily Vector }}
- , {{ $param.Type.LLDecl }}& {{ $param.Name }}
- {{- end }}
+{{- define "CommaMessagePrototype" -}}
+ {{- range $param := . -}}
+ , {{ template "ArgumentDeclaration" $param }}
{{- end -}}
{{- end }}
@@ -74,7 +68,7 @@
{{- /* All the parameters for a response method/constructor which uses values with references */}}
{{- /* or trivial copy. */}}
-{{- define "PassthroughResponseParams" -}}
+{{- define "PassthroughMessageParams" -}}
{{- range $index, $param := . }}
{{- if $index }}, {{- end }} {{ $param.Name }}
{{- end }}
@@ -82,7 +76,7 @@
{{- /* All the parameters for a request method/constructor which uses values with references */}}
{{- /* or trivial copy. */}}
-{{- define "PassthroughRequestParams" -}}
+{{- define "CommaPassthroughMessageParams" -}}
{{- range $index, $param := . }}
, {{ $param.Name }}
{{- end }}
@@ -137,7 +131,7 @@
{{- end }}
{{- if .Response }}
- explicit {{ .Name }}Response({{ template "ResponsePrototype" .Response }})
+ explicit {{ .Name }}Response({{ template "MessagePrototype" .Response }})
{{ template "InitMessage" .Response }} {
_InitHeader();
}
@@ -176,7 +170,7 @@
{{- end }}
{{- if .Request }}
- explicit {{ .Name }}Request({{ template "RequestPrototype" .Request }})
+ explicit {{ .Name }}Request(zx_txid_t _txid {{- template "CommaMessagePrototype" .Request }})
{{ template "InitMessage" .Request }} {
_InitHeader(_txid);
}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/reply_c_flavor.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/reply_c_flavor.tmpl.go
index 4ddfd10..ee2da68 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/reply_c_flavor.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/reply_c_flavor.tmpl.go
@@ -14,7 +14,7 @@
{{- if .LLProps.LinearizeResponse }}
{{/* tracking_ptr destructors will be called when _response goes out of scope */}}
{{ .Name }}Response _response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- else }}
{{/* tracking_ptrs won't free allocated memory because destructors aren't called.
@@ -24,7 +24,7 @@
// (here and in fidl::Encode).
FIDL_ALIGNDECL uint8_t _response_buffer[sizeof({{ .Name }}Response)];
auto& _response = *new (_response_buffer) {{ .Name }}Response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- end }}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/reply_caller_allocate.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/reply_caller_allocate.tmpl.go
index 0f49083..aff9f9e 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/reply_caller_allocate.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/reply_caller_allocate.tmpl.go
@@ -18,11 +18,11 @@
{{- if .LLProps.LinearizeResponse }}
{{ .Name }}Response _response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- else }}
new (_buffer.data()) {{ .Name }}Response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- end }}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_c_flavor.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_c_flavor.tmpl.go
index d925858..68fc211 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_c_flavor.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_c_flavor.tmpl.go
@@ -14,7 +14,7 @@
{{- if .LLProps.LinearizeResponse }}
{{/* tracking_ptr destructors will be called when _response goes out of scope */}}
{{ .Name }}Response _response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- else }}
{{/* tracking_ptrs won't free allocated memory because destructors aren't called.
@@ -24,7 +24,7 @@
// (here and in fidl::Encode).
FIDL_ALIGNDECL uint8_t _response_buffer[sizeof({{ .Name }}Response)];
auto& _response = *new (_response_buffer) {{ .Name }}Response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- end }}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_caller_allocate.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_caller_allocate.tmpl.go
index ff4bd8f..1bb4cb4 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_caller_allocate.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/send_event_caller_allocate.tmpl.go
@@ -17,11 +17,11 @@
{{- if .LLProps.LinearizeResponse }}
{{ .Name }}Response _response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- else }}
new (_buffer.data()) {{ .Name }}Response{
- {{- template "PassthroughResponseParams" .Response -}}
+ {{- template "PassthroughMessageParams" .Response -}}
};
{{- end }}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go
index d9c18d5..e16dc5f 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_caller_allocate.tmpl.go
@@ -41,11 +41,11 @@
{{- end }}
{{- if .LLProps.LinearizeRequest }}
{{ .Name }}Request _request(0
- {{- template "PassthroughRequestParams" .Request -}}
+ {{- template "CommaPassthroughMessageParams" .Request -}}
);
{{- else }}
new (_request_buffer.data()) {{ .Name }}Request(0
- {{- template "PassthroughRequestParams" .Request -}}
+ {{- template "CommaPassthroughMessageParams" .Request -}}
);
{{- end }}
diff --git a/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_managed.tmpl.go b/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_managed.tmpl.go
index 44823a5..35ad66e 100644
--- a/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_managed.tmpl.go
+++ b/tools/fidl/fidlgen_llcpp/templates/fragments/sync_request_managed.tmpl.go
@@ -33,7 +33,7 @@
{{- if .LLProps.LinearizeRequest }}
{{/* tracking_ptr destructors will be called when _response goes out of scope */}}
{{ .Name }}Request _request(0
- {{- template "PassthroughRequestParams" .Request -}}
+ {{- template "CommaPassthroughMessageParams" .Request -}}
);
{{- else }}
{{/* tracking_ptrs won't free allocated memory because destructors aren't called.
@@ -43,7 +43,7 @@
// (here and in fidl::Encode).
FIDL_ALIGNDECL uint8_t _request_buffer[sizeof({{ .Name }}Request)];
auto& _request = *new (_request_buffer) {{ .Name }}Request(0
- {{- template "PassthroughRequestParams" .Request -}}
+ {{- template "CommaPassthroughMessageParams" .Request -}}
);
{{- end }}
