sashakoshka/hopp
sashakoshka/hopp
1
0
Fork 0
Code Issues 6 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

generate: The test now compiles

Browse Source
This commit is contained in:
Sasha Koshka 2025-07-17 10:26:31 -04:00
parent b73f9fa7ce
commit b826cbf83e
1 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
generate/generate.go
View File

@ -44,6 +44,7 @@ type Generator struct {
PackageName string PackageName string
nestingLevel int nestingLevel int
temporaryVar int
protocol *Protocol protocol *Protocol
} }
@ -143,6 +144,8 @@ func (this *Generator) generateTypedef(name string, typ Type) (n int, err error)
name) name)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
this.push() this.push()
nn, err = this.iprintf("var nn int\n")
n += nn; if err != nil { return n, err }
nn, err = this.generateDecodeValue(typ, "this", "tag") nn, err = this.generateDecodeValue(typ, "this", "tag")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf("return n, nil\n") nn, err = this.iprintf("return n, nil\n")
@ -206,7 +209,7 @@ func (this *Generator) generateMessage(method uint16, message Message) (n int, e
nn, err = this.iprintf("\n// Decode decodes this message's tag and value.\n") nn, err = this.iprintf("\n// Decode decodes this message's tag and value.\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf( nn, err = this.iprintf(
"func(this *%s) Decode(encoder *tape.Decoder) (n int, err error) {\n", "func(this *%s) Decode(decoder *tape.Decoder) (n int, err error) {\n",
this.resolveMessageName(message.Name)) this.resolveMessageName(message.Name))
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
this.push() this.push()
@ -412,13 +415,13 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
if typ.Signed { if typ.Signed {
prefix = "ReadInt" prefix = "ReadInt"
} }
nn, err := this.iprintf("*%s, nn, err = encoder.%s%d()\n", valueSource, prefix, typ.Bits) nn, err := this.iprintf("*%s, nn, err = decoder.%s%d()\n", valueSource, prefix, typ.Bits)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
case TypeFloat: case TypeFloat:
// FP: <value: FloatN> // FP: <value: FloatN>
nn, err := this.iprintf("%s, nn, err = encoder.ReadFloat%d(%s)\n", valueSource, typ.Bits) nn, err := this.iprintf("%s, nn, err = decoder.ReadFloat%d(%s)\n", valueSource, typ.Bits)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
@ -434,7 +437,7 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
this.push() this.push()
nn, err = this.iprintf( nn, err = this.iprintf(
"length, nn, err = encoder.ReadUintN(uint64(%s.CN()))\n", "length, nn, err = decoder.ReadUintN(int(%s.CN()))\n",
tagSource) tagSource)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
@ -450,7 +453,7 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf("buffer := make([]byte, int(length))\n") nn, err = this.iprintf("buffer := make([]byte, int(length))\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf("nn, err = encoder.Read(buffer)\n") nn, err = this.iprintf("nn, err = decoder.Read(buffer)\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
@ -472,7 +475,7 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
nn, err = this.iprintf("var length uint64\n") nn, err = this.iprintf("var length uint64\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf( nn, err = this.iprintf(
"length, nn, err = encoder.ReadUintN(uint64(%s.CN()))\n", "length, nn, err = decoder.ReadUintN(int(%s.CN()))\n",
tagSource) tagSource)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
@ -485,7 +488,7 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf("var itemTag tape.Tag\n") nn, err = this.iprintf("var itemTag tape.Tag\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf("itemTag, nn, err = encoder.ReadTag()\n") nn, err = this.iprintf("itemTag, nn, err = decoder.ReadTag()\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
@ -513,18 +516,16 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
case TypeTableDefined: case TypeTableDefined:
// KTV: <length: UN> (<key: U16> <tag: Tag> <value>)* // KTV: <length: UN> (<key: U16> <tag: Tag> <value>)*
nn, err := this.iprintf("{\n") lengthVar := this.newTemporaryVar("length")
n += nn; if err != nil { return n, err } nn, err := this.iprintf("var %s uint64\n", lengthVar)
this.push()
nn, err = this.iprintf("var length uint64\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf( nn, err = this.iprintf(
"length, nn, err = encoder.ReadUintN(uint64(%s.CN()))\n", "%s, nn, err = decoder.ReadUintN(int(%s.CN()))\n",
tagSource) lengthVar, tagSource)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.iprintf("for _ = range length {\n") nn, err = this.iprintf("for _ = range %s {\n", lengthVar)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
this.push() this.push()
nn, err = this.iprintf("var key uint16\n") nn, err = this.iprintf("var key uint16\n")
@ -560,12 +561,9 @@ func (this *Generator) generateDecodeValue(typ Type, valueSource, tagSource stri
this.pop() this.pop()
nn, err = this.iprintf("}\n") nn, err = this.iprintf("}\n")
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
this.pop()
nn, err = this.iprintf("}\n")
n += nn; if err != nil { return n, err }
case TypeNamed: case TypeNamed:
// WHATEVER: [WHATEVER] // WHATEVER: [WHATEVER]
nn, err := this.iprintf("nn, err = %s.DecodeValue(encoder, %s)\n", valueSource, tagSource) nn, err := this.iprintf("nn, err = %s.DecodeValue(decoder, %s)\n", valueSource, tagSource)
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
nn, err = this.generateErrorCheck() nn, err = this.generateErrorCheck()
n += nn; if err != nil { return n, err } n += nn; if err != nil { return n, err }
@ -801,6 +799,11 @@ func (this *Generator) resolveTypeName(name string) (Type, error) {
return nil, fmt.Errorf("no type exists called %s", name) return nil, fmt.Errorf("no type exists called %s", name)
} }
func (this *Generator) newTemporaryVar(base string) string {
this.temporaryVar += 1
return fmt.Sprintf("%s_%d", base, this.temporaryVar)
}
func bitsToBytes(bits int) int { func bitsToBytes(bits int) int {
return int(math.Ceil(float64(bits) / 8.0)) return int(math.Ceil(float64(bits) / 8.0))
} }