Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Golang gen: add setters for fieldmasks #61

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ goldmaster_nocompile: build
--generateByteVersions=cases_bytes. \
--generateRandomCode \
--generateLegacyJsonRead=false \
--checkLengthSanity=false \
./$(TLS_PATH)/cases.tl
@./target/bin/tlgen --language=go --split-internal -v \
--copyrightPath=./COPYRIGHT \
Expand Down
2 changes: 2 additions & 0 deletions cmd/tlgen/main2.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ func parseFlags(opt *tlcodegen.Gen2Options) {
"timestamp of schema (for documentation, TLO version)")
flag.StringVar(&opt.SchemaCommit, "schemaCommit", "",
"commit of schema (for documentation)")
flag.BoolVar(&opt.UseCheckLengthSanity, "checkLengthSanity", true,
"enable feature to generate code to check length sanity of arrays (default:true)")

// C++
flag.StringVar(&opt.RootCPPNamespace, "cpp-namespace", "",
Expand Down
8 changes: 8 additions & 0 deletions internal/tlcodegen/qt_brackets.qtpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ func {%s= goName %}Read(w []byte, vec *{%s= typeString %} {%s= natDecl %}) (_ []
if w, err = basictl.NatRead(w, &l); err != nil {
return w, err
}
{%- if tuple.wr.gen.options.UseCheckLengthSanity -%}
if err = basictl.CheckLengthSanity(w, l, 4); err != nil {
return w, err
}
{%- endif -%}
if uint32(cap(*vec)) < l {
*vec = make([]{%s= elementTypeString %}, l)
} else {
Expand Down Expand Up @@ -240,9 +242,11 @@ func {%s= goName %}Read(w []byte, m *map[{%s= keyTypeString %}]{%s= valueTypeStr
if w, err = basictl.NatRead(w, &l); err != nil {
return w, err
}
{%- if tuple.wr.gen.options.UseCheckLengthSanity -%}
if err = basictl.CheckLengthSanity(w, l, 4); err != nil {
return w, err
}
{%- endif -%}
var data map[{%s= keyTypeString %}]{%s= valueTypeString %}
if *m == nil {
if l == 0 {
Expand Down Expand Up @@ -460,9 +464,11 @@ func {%s= goName %}Read(w []byte, vec *{%s= typeString %} {%s= natDecl %}) (_ []
if w, err = basictl.NatRead(w, &l); err != nil {
return w, err
}
{%- if tuple.wr.gen.options.UseCheckLengthSanity -%}
if err = basictl.CheckLengthSanity(w, l, 4); err != nil {
return w, err
}
{%- endif -%}
if uint32(cap(*vec)) < l {
*vec = make([]{%s= elementTypeString %}, l)
} else {
Expand Down Expand Up @@ -559,9 +565,11 @@ func {%s= goName %}FillRandom(rg *basictl.RandGenerator, vec *{%s= typeString %}
{%- endif -%}

func {%s= goName %}Read(w []byte, vec *{%s= typeString %} {%s= natDecl %}) (_ []byte, err error) {
{%- if tuple.wr.gen.options.UseCheckLengthSanity -%}
if err = basictl.CheckLengthSanity(w, nat_n, 4); err != nil {
return w, err
}
{%- endif -%}
if uint32(cap(*vec)) < nat_n {
*vec = make([]{%s= elementTypeString %}, nat_n)
} else {
Expand Down
32 changes: 24 additions & 8 deletions internal/tlcodegen/qt_brackets.qtpl.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions internal/tlcodegen/qt_struct.qtpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{% package tlcodegen %}

{% import "fmt" %}
{% import "github.com/vkcom/tl/internal/utils" %}
{% import "strings" %}
{% import "sort" %}

{%- func (struct_ *TypeRWStruct)GenerateCode(bytesVersion bool, directImports *DirectImports) -%}
{%- code
Expand Down Expand Up @@ -794,6 +797,63 @@ func (item *{%s= goName %}) ReadResultJSONWriteResult(r []byte, w []byte) ([]byt
w, err = item.WriteResult(w, ret)
return r, w, err
}
{%- for fieldId, field := range struct_.Fields -%}
{%- if _, affectedBits := struct_.GetFieldNatPropertiesAsUsageMap(fieldId, false, true); len(affectedBits) != 0 -%}
{%- code
bits := make([]uint32, 0)
for i := range affectedBits {
bits = append(bits, i)
}
sort.Slice(bits, func(i, j int) bool {
return bits[i] < bits[j]
})
-%}
{%- for _, bit := range bits -%}
{%- code
bitUsage := affectedBits[bit]
affectedTypes := make([]*TypeRWStruct, 0)
for i := range bitUsage.AffectedFields {
affectedTypes = append(affectedTypes, i)
}
sort.Slice(affectedTypes, func(i, j int) bool {
return TypeRWWrapperLessGlobal(affectedTypes[i].wr, affectedTypes[j].wr) > 0
})
-%}
{%- for _, affectedType := range affectedTypes -%}
{%- code
affectedFieldsByBit := bitUsage.AffectedFields[affectedType]
affectedFieldsByBit = utils.SetToSlice(utils.SliceToSet(affectedFieldsByBit))
sort.Slice(affectedFieldsByBit, func(i, j int) bool {
return affectedFieldsByBit[i] < affectedFieldsByBit[j]
})
fieldNames := make([]string, len(affectedFieldsByBit))
fieldNamesForComment := make([]string, len(affectedFieldsByBit))

for i := range fieldNames {
fieldNames[i] = affectedType.Fields[affectedFieldsByBit[i]].goName
fieldNamesForComment[i] = "\"" + affectedType.Fields[affectedFieldsByBit[i]].originalName + "\""
}

mergedFields := strings.Join(fieldNames, "And")
mergedFieldsForComment := strings.Join(fieldNamesForComment, ", ")
maybeS := ""
if len(affectedFieldsByBit) > 1 {
maybeS = "s"
}
-%}
// Set field{%s= maybeS %} {%s= mergedFieldsForComment %} in "{%s= affectedType.wr.tlName.String() %}" by changing fieldMask "{%s= field.originalName %}"
func (item *{%s= goName %}) Set{%s= affectedType.wr.goGlobalName %}{%s= mergedFields %}(value bool) {
if value {
item.{%s= field.goName %} |= 1 << {%d= int(bit) %}
} else {
item.{%s= field.goName %} &^= 1 << {%d= int(bit) %}
}
}

{%- endfor -%}
{%- endfor -%}
{%- endif -%}
{%- endfor -%}

{%- endfunc -%}

Expand Down Expand Up @@ -854,6 +914,8 @@ if mask{%s= field.goName %} & (1<<{%v= index %}) != 0 {
{%- elseif (fieldProps & FieldUsedAsSize) != 0 -%}
{%s= field.t.TypeRandomCode(bytesVersion, directImports, struct_.wr.ins, "item."+field.goName, formatNatArgs(struct_.Fields, field.natArgs), field.recursive) %}
item.{%s= field.goName %} = rg.LimitValue(item.{%s= field.goName %})
{%- elseif fieldProps == FieldIsNat -%}
{%s= field.t.TypeRandomCode(bytesVersion, directImports, struct_.wr.ins, "item."+field.goName, formatNatArgs(struct_.Fields, field.natArgs), field.recursive) %}
{%- endif -%}
{%- else -%}
{%s= field.t.TypeRandomCode(bytesVersion, directImports, struct_.wr.ins, "item."+field.goName, formatNatArgs(struct_.Fields, field.natArgs), field.recursive) %}
Expand Down
87 changes: 87 additions & 0 deletions internal/tlcodegen/qt_struct.qtpl.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading