aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOskari Timperi <oskari.timperi@iki.fi>2021-08-29 11:30:55 +0300
committerOskari Timperi <oskari.timperi@iki.fi>2021-08-29 11:30:55 +0300
commitcbec4c5f4ecd0e6523a106502e3babb5726a3436 (patch)
tree77c373e1dc5615044e9397aaf652e7e7206e11fe
parent12f0050e46e87deb5c26861633cc9c4e82df1b68 (diff)
downloadnimpb-cbec4c5f4ecd0e6523a106502e3babb5726a3436.tar.gz
nimpb-cbec4c5f4ecd0e6523a106502e3babb5726a3436.zip
Fix #18
-rw-r--r--nimpb/compiler/generator.nim4
-rw-r--r--nimpb/compiler/nimpb_build.nim2
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