diff options
| author | Oskari Timperi <oskari.timperi@iki.fi> | 2018-04-03 22:36:00 +0300 |
|---|---|---|
| committer | Oskari Timperi <oskari.timperi@iki.fi> | 2018-04-03 22:36:00 +0300 |
| commit | 6deec4e7566250d949e2a19c03b347804ae7151a (patch) | |
| tree | 23603a998964845c2d6b0dd5e2e7853861c502d3 | |
| parent | 7d7838614d58378003b645c0222bd8effcecc5cd (diff) | |
| download | nimpb-6deec4e7566250d949e2a19c03b347804ae7151a.tar.gz nimpb-6deec4e7566250d949e2a19c03b347804ae7151a.zip | |
Remove getTag prefix from getTagWireType() and getTagFieldNumber()
| -rw-r--r-- | generator/gen.nim | 4 | ||||
| -rw-r--r-- | generator/protoc_gen_nim.nim | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/generator/gen.nim b/generator/gen.nim index c270918..e954d03 100644 --- a/generator/gen.nim +++ b/generator/gen.nim @@ -428,8 +428,8 @@ proc generateReadMessageProc(desc: NimNode): NimNode = while not atEnd(stream): let `tagId` = readTag(`streamId`) - `wiretypeId` = getTagWireType(`tagId`) - case getTagFieldNumber(`tagId`) + `wiretypeId` = wireType(`tagId`) + case fieldNumber(`tagId`) else: skipField(`streamId`, `wiretypeId`) diff --git a/generator/protoc_gen_nim.nim b/generator/protoc_gen_nim.nim index 60a8f34..53cba86 100644 --- a/generator/protoc_gen_nim.nim +++ b/generator/protoc_gen_nim.nim @@ -645,8 +645,8 @@ iterator genReadMapKVProc(msg: Message): string = yield indent("while not atEnd(stream):", 4) yield indent("let", 8) yield indent("tag = readTag(stream)", 12) - yield indent("wireType = getTagWireType(tag)", 12) - yield indent("case getTagFieldNumber(tag)", 8) + yield indent("wireType = wireType(tag)", 12) + yield indent("case fieldNumber(tag)", 8) yield indent(&"of {key.number}:", 8) yield indent(&"key = {key.readProc}(stream)", 12) yield indent("gotKey = true", 12) @@ -675,8 +675,8 @@ iterator genReadMessageProc(msg: Message): string = yield indent("while not atEnd(stream):", 4) yield indent("let", 8) yield indent("tag = readTag(stream)", 12) - yield indent("wireType = getTagWireType(tag)", 12) - yield indent("case getTagFieldNumber(tag)", 8) + yield indent("wireType = wireType(tag)", 12) + yield indent("case fieldNumber(tag)", 8) yield indent("of 0:", 8) yield indent("raise newException(InvalidFieldNumberError, \"Invalid field number: 0\")", 12) for field in msg.fields: |