aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOskari Timperi <oskari.timperi@iki.fi>2018-04-25 18:23:56 +0300
committerOskari Timperi <oskari.timperi@iki.fi>2018-04-25 18:23:56 +0300
commitda73ed316082e2d8e9f255443fb5e75e169f6cb4 (patch)
tree1080a74fc5f8bb4def704b57b64074f758984487
parent450f7e474fd1db1421a5d9903dfdf59bd3fbc76a (diff)
downloadnimpb-da73ed316082e2d8e9f255443fb5e75e169f6cb4.tar.gz
nimpb-da73ed316082e2d8e9f255443fb5e75e169f6cb4.zip
Update examples
-rw-r--r--examples/addressbook/Makefile2
-rw-r--r--examples/addressbook/addressbook_pb.nim12
-rw-r--r--examples/addressbook/phonenumber_pb.nim6
-rw-r--r--examples/simple/Makefile2
-rw-r--r--examples/simple/nim.cfg2
-rw-r--r--examples/simple/simple_pb.nim6
6 files changed, 27 insertions, 3 deletions
diff --git a/examples/addressbook/Makefile b/examples/addressbook/Makefile
index ee2f023..5580c29 100644
--- a/examples/addressbook/Makefile
+++ b/examples/addressbook/Makefile
@@ -7,4 +7,4 @@ reader: reader.nim addressbook_pb.nim phonenumber_pb.nim
nim c $<
%_pb.nim: %.proto
- nimpb_build -I=. --out=. $<
+ ../../nimpb/compiler/nimpb_build -I=. --out=. $<
diff --git a/examples/addressbook/addressbook_pb.nim b/examples/addressbook/addressbook_pb.nim
index 9e863a0..9d23afa 100644
--- a/examples/addressbook/addressbook_pb.nim
+++ b/examples/addressbook/addressbook_pb.nim
@@ -22,6 +22,7 @@ type
proc newPerson*(): Person
proc newPerson*(data: string): Person
+proc newPerson*(data: seq[byte]): Person
proc writePerson*(stream: Stream, message: Person)
proc readPerson*(stream: Stream): Person
proc sizeOfPerson*(message: Person): uint64
@@ -29,6 +30,7 @@ proc toJson*(message: Person): JsonNode
proc newAddressBook*(): AddressBook
proc newAddressBook*(data: string): AddressBook
+proc newAddressBook*(data: seq[byte]): AddressBook
proc writeAddressBook*(stream: Stream, message: AddressBook)
proc readAddressBook*(stream: Stream): AddressBook
proc sizeOfAddressBook*(message: AddressBook): uint64
@@ -189,6 +191,11 @@ proc newPerson*(data: string): Person =
ss = newStringStream(data)
result = readPerson(ss)
+proc newPerson*(data: seq[byte]): Person =
+ let
+ ss = newStringStream(cast[string](data))
+ result = readPerson(ss)
+
proc newAddressBook*(): AddressBook =
new(result)
@@ -261,4 +268,9 @@ proc newAddressBook*(data: string): AddressBook =
ss = newStringStream(data)
result = readAddressBook(ss)
+proc newAddressBook*(data: seq[byte]): AddressBook =
+ let
+ ss = newStringStream(cast[string](data))
+ result = readAddressBook(ss)
+
diff --git a/examples/addressbook/phonenumber_pb.nim b/examples/addressbook/phonenumber_pb.nim
index 8b03f00..6a072c2 100644
--- a/examples/addressbook/phonenumber_pb.nim
+++ b/examples/addressbook/phonenumber_pb.nim
@@ -19,6 +19,7 @@ type
proc newPhoneNumber*(): PhoneNumber
proc newPhoneNumber*(data: string): PhoneNumber
+proc newPhoneNumber*(data: seq[byte]): PhoneNumber
proc writePhoneNumber*(stream: Stream, message: PhoneNumber)
proc readPhoneNumber*(stream: Stream): PhoneNumber
proc sizeOfPhoneNumber*(message: PhoneNumber): uint64
@@ -115,4 +116,9 @@ proc newPhoneNumber*(data: string): PhoneNumber =
ss = newStringStream(data)
result = readPhoneNumber(ss)
+proc newPhoneNumber*(data: seq[byte]): PhoneNumber =
+ let
+ ss = newStringStream(cast[string](data))
+ result = readPhoneNumber(ss)
+
diff --git a/examples/simple/Makefile b/examples/simple/Makefile
index 1da2b45..4e03fe4 100644
--- a/examples/simple/Makefile
+++ b/examples/simple/Makefile
@@ -4,4 +4,4 @@ simple: simple.nim simple_pb.nim
nim c $<
%_pb.nim: %.proto
- nimpb_build -I=. --out=. $<
+ ../../nimpb/compiler/nimpb_build -I=. --out=. $<
diff --git a/examples/simple/nim.cfg b/examples/simple/nim.cfg
index 11736fc..1c2f0c1 100644
--- a/examples/simple/nim.cfg
+++ b/examples/simple/nim.cfg
@@ -1 +1 @@
---path:"../../src"
+--path:"../.."
diff --git a/examples/simple/simple_pb.nim b/examples/simple/simple_pb.nim
index 56d4afb..a594803 100644
--- a/examples/simple/simple_pb.nim
+++ b/examples/simple/simple_pb.nim
@@ -18,6 +18,7 @@ type
proc newTest1*(): Test1
proc newTest1*(data: string): Test1
+proc newTest1*(data: seq[byte]): Test1
proc writeTest1*(stream: Stream, message: Test1)
proc readTest1*(stream: Stream): Test1
proc sizeOfTest1*(message: Test1): uint64
@@ -114,4 +115,9 @@ proc newTest1*(data: string): Test1 =
ss = newStringStream(data)
result = readTest1(ss)
+proc newTest1*(data: seq[byte]): Test1 =
+ let
+ ss = newStringStream(cast[string](data))
+ result = readTest1(ss)
+