Skip to content

Commit 1655d1e

Browse files
Brat-vseznamushrissan
authored andcommitted
forgot calculate
1 parent 594af58 commit 1655d1e

File tree

10 files changed

+92
-56
lines changed

10 files changed

+92
-56
lines changed

internal/tlcodegen/qt_brackets.qtpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ func {%s= goName %}CalculateLayout(sizes []int, optimizeEmpty bool, vec *{%s= ty
742742
var sz int
743743

744744
currentSize += basictl.TL2CalculateSize(len(*vec))
745-
{%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}
745+
{%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}
746746
// special case for bool
747747
currentSize += (len(*vec) + 7) / 8
748748
{%- else -%}
@@ -806,7 +806,7 @@ func {%s= goName %}InternalReadTL2(r []byte, vec *{%s= typeString %}) (_ []byte,
806806
if currentSize != 0 {
807807
if currentR, elementCount, err = basictl.TL2ParseSize(currentR); err != nil { return r, err }
808808
{%- code /* this check is slightly relaxed, because we cannot +7 without overflow check */ -%}
809-
if elementCount {%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}/8{%- endif -%} > len(currentR) {
809+
if elementCount {%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}/8{%- endif -%} > len(currentR) {
810810
return r, basictl.TL2ElementCountError(elementCount, currentR)
811811
}
812812
}
@@ -815,7 +815,7 @@ func {%s= goName %}InternalReadTL2(r []byte, vec *{%s= typeString %}) (_ []byte,
815815
*vec = make([]{%s= elementTypeString %}, elementCount)
816816
}
817817
*vec = (*vec)[:elementCount]
818-
{%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}
818+
{%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}
819819
if currentR, err = basictl.VectorBitContentReadTL2(currentR, *vec); err != nil { return currentR, err }
820820
{%- else -%}
821821
for i := 0; i < elementCount; i++ {
@@ -955,7 +955,7 @@ func {%s= goName %}CalculateLayout(sizes []int, optimizeEmpty bool, vec *{%s= ty
955955
var sz int
956956

957957
currentSize += basictl.TL2CalculateSize(len(*vec))
958-
{%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}
958+
{%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}
959959
// special case for bool
960960
currentSize += (len(*vec) + 7) / 8
961961
{%- else -%}
@@ -1019,7 +1019,7 @@ func {%s= goName %}InternalReadTL2(r []byte, vec *{%s= typeString %}) (_ []byte,
10191019
if currentSize != 0 {
10201020
if currentR, elementCount, err = basictl.TL2ParseSize(currentR); err != nil { return r, err }
10211021
{%- code /* this check is slightly relaxed, because we cannot +7 without overflow check */ -%}
1022-
if elementCount {%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}/8{%- endif -%} > len(currentR) {
1022+
if elementCount {%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}/8{%- endif -%} > len(currentR) {
10231023
return r, basictl.TL2ElementCountError(elementCount, currentR)
10241024
}
10251025
}
@@ -1028,7 +1028,7 @@ func {%s= goName %}InternalReadTL2(r []byte, vec *{%s= typeString %}) (_ []byte,
10281028
*vec = make([]{%s= elementTypeString %}, elementCount)
10291029
}
10301030
*vec = (*vec)[:elementCount]
1031-
{%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}
1031+
{%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}
10321032
if currentR, err = basictl.VectorBitContentReadTL2(currentR, *vec); err != nil { return currentR, err }
10331033
{%- else -%}
10341034
for i := 0; i < elementCount; i++ {
@@ -1185,7 +1185,7 @@ func {%s= goName %}CalculateLayout(sizes []int, optimizeEmpty bool, vec *{%s= ty
11851185

11861186
currentSize += basictl.TL2CalculateSize(len(*vec))
11871187

1188-
{%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}
1188+
{%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}
11891189
// special case for bool
11901190
currentSize += ({%v= tuple.size %} + 7) / 8
11911191
{%- else -%}
@@ -1252,7 +1252,7 @@ func {%s= goName %}InternalReadTL2(r []byte, vec *{%s= typeString %}) (_ []byte,
12521252
}
12531253

12541254
lastIndex := min(elementCount, {%v= tuple.size %})
1255-
{%- if _, ok := tuple.element.t.trw.(*TypeRWBool); ok -%}
1255+
{%- if bb, ok := tuple.element.t.trw.(*TypeRWBool); ok && bb.isBit -%}
12561256
if currentR, err = basictl.VectorBitContentReadTL2(currentR, (*vec)[:lastIndex]); err != nil { return currentR, err }
12571257
{%- code /* reset elements if received less elements */ -%}
12581258
clear((*vec)[lastIndex:])

internal/tlcodegen/qt_brackets.qtpl.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTuple0Bool/bool.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTuple11Bool/bool.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTuple16Bool/bool.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTuple1Bool/bool.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTuple7Bool/bool.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTuple8Bool/bool.go

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinTupleBool/bool.go

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tlcodegen/test/gen/cases/internal/tl/tlBuiltinVectorBool/bool.go

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)