From cbec4c5f4ecd0e6523a106502e3babb5726a3436 Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Sun, 29 Aug 2021 11:30:55 +0300 Subject: Fix #18 --- nimpb/compiler/generator.nim | 4 ++-- nimpb/compiler/nimpb_build.nim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nimpb/compiler/generator.nim b/nimpb/compiler/generator.nim index f4f70d6..aad52ad 100644 --- a/nimpb/compiler/generator.nim +++ b/nimpb/compiler/generator.nim @@ -582,7 +582,7 @@ iterator sortDependencies(messages: seq[Message]): Message = byname = newTable[string, Message]() for message in messages: - deps[$message.names] = toSet(dependencies(message)) + deps[$message.names] = toHashSet(dependencies(message)) byname[$message.names] = message let order = reversed(toposort(deps)) @@ -627,7 +627,7 @@ proc parseFile(name: string, fdesc: google_protobuf_FileDescriptorProto): ProtoF add(result.enums, newEnum(name, e)) proc addLine(s: var string, line: string) = - if not isNilOrWhitespace(line): + if not isEmptyOrWhitespace(line): s &= line s &= "\n" diff --git a/nimpb/compiler/nimpb_build.nim b/nimpb/compiler/nimpb_build.nim index 96b2313..ade3777 100644 --- a/nimpb/compiler/nimpb_build.nim +++ b/nimpb/compiler/nimpb_build.nim @@ -1,6 +1,6 @@ import os import osproc -import parseopt2 +import parseopt import strformat import strutils -- cgit v1.2.3