Merge pull request #595 from tdakkota/refactor/gen-separate-flag-sett…

…ing-function feat(gen): separate automatic flags setting to special method
gotd · Dec 1, 2021 · 81863a2 · 81863a2
2 parents 3131337 + cb76f47
commit 81863a2
Show file tree

Hide file tree

Showing 220 changed files with 3,857 additions and 2,331 deletions.
diff --git a/internal/gen/_template/encode.tmpl b/internal/gen/_template/encode.tmpl
@@ -16,12 +16,8 @@ func ({{ $s.Receiver }} *{{ $s.Name }}) EncodeBare({{ $s.BufArg }} *bin.Buffer)
     if {{ $s.Receiver }} == nil {
         return fmt.Errorf("can't encode {{ $s.RawType }} as nil")
     }
-{{- range $f := $s.Fields }}
-    {{- if $f.Conditional }}
-    if !({{ $s.Receiver }}.{{template "compare_zero" $f}}) {
-        {{ $s.Receiver }}.{{ $f.ConditionalField }}.Set({{ $f.ConditionalIndex }})
-    }
-    {{- end }}
+{{- if hasFlags $s }}
+    {{ $s.Receiver }}.SetFlags()
 {{- end }}
 {{- range $f := $s.Fields }}
     {{- if not $f.ConditionalBool }}

diff --git a/internal/gen/_template/encode_tdlib.tmpl b/internal/gen/_template/encode_tdlib.tmpl
@@ -7,12 +7,8 @@ func ({{ $s.Receiver }} *{{ $s.Name }}) EncodeTDLibJSON({{ $s.BufArg }} tdjson.E
     }
     {{ $s.BufArg }}.ObjStart()
     {{ $s.BufArg }}.PutID("{{ $s.RawName }}")
-{{- range $f := $s.Fields }}
-    {{- if $f.Conditional }}
-    if !({{ $s.Receiver }}.{{template "compare_zero" $f}}) {
-        {{ $s.Receiver }}.{{ $f.ConditionalField }}.Set({{ $f.ConditionalIndex }})
-    }
-    {{- end }}
+{{- if hasFlags $s }}
+    {{ $s.Receiver }}.SetFlags()
 {{- end }}
 {{- range $f := $s.Fields }}
     {{- if not $f.ConditionalBool }}

diff --git a/internal/gen/_template/main.tmpl b/internal/gen/_template/main.tmpl
@@ -10,6 +10,7 @@
 {{ template "string_derive" $s }}
 {{ if $.Flags.Mapping }}{{ template "fill_from" $s }}{{ end }}
 {{ template "type_info" $s }}
+{{ template "set_flags" $s }}
 {{ template "encode" $s }}
 {{ template "decode" $s }}
 {{- if $.Flags.TDLibJSON }}

diff --git a/internal/gen/_template/set_flags.tmpl b/internal/gen/_template/set_flags.tmpl
@@ -0,0 +1,15 @@
+{{- /*gotype: github.com/gotd/td/internal/gen.structDef*/ -}}
+{{ define "set_flags" }}{{ $s := . }}
+{{- if hasFlags $s }}
+// SetFlags sets flags for non-zero fields.
+func ({{ $s.Receiver }} *{{ $s.Name }}) SetFlags() {
+{{- range $f := $s.Fields }}
+    {{- if $f.Conditional }}
+        if !({{ $s.Receiver }}.{{template "compare_zero" $f}}) {
+        {{ $s.Receiver }}.{{ $f.ConditionalField }}.Set({{ $f.ConditionalIndex }})
+        }
+    {{- end }}
+{{- end }}
+}
+{{- end }}
+{{ end }}
diff --git a/internal/gen/example/tl_abstract_message_gen.go b/internal/gen/example/tl_abstract_message_gen.go
diff --git a/internal/gen/example/tl_config_gen.go b/internal/gen/example/tl_config_gen.go
diff --git a/internal/gen/example/tl_dc_option_gen.go b/internal/gen/example/tl_dc_option_gen.go
diff --git a/internal/gen/templates.go b/internal/gen/templates.go
@@ -82,6 +82,14 @@ func Funcs() template.FuncMap {
 			}
 			return lower
 		},
+		"hasFlags": func(def structDef) bool {
+			for _, field := range def.Fields {
+				if field.Type == flagsType {
+					return true
+				}
+			}
+			return false
+		},
 
 		// Argument constructors
 		"newStructConfig":    newStructConfig,

diff --git a/tdp/internal/schema/tl_config_gen.go b/tdp/internal/schema/tl_config_gen.go
diff --git a/tdp/internal/schema/tl_dc_option_gen.go b/tdp/internal/schema/tl_dc_option_gen.go
diff --git a/tg/e2e/tl_decrypted_message_gen.go b/tg/e2e/tl_decrypted_message_gen.go