Skip to content

Commit

Permalink
Merge pull request stepancheg#37 from tafia/empty
Browse files Browse the repository at this point in the history 
Fix several bugs
  • Loading branch information
@tafia
tafia authored Feb 13, 2017
2 parents d12c929 + b494e04 commit 6642eeb
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 32 deletions.
67 changes: 41 additions & 26 deletions codegen/src/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ impl Field {
match self.typ {
FieldType::Message(ref s) => {
match self.frequency {
Frequency::Repeated | Frequency::Required => true,
Frequency::Repeated => true,
_ => {
let typ = match s.rfind('.') {
Some(p) => &s[p + 1..],
Expand All @@ -386,7 +386,7 @@ impl Field {
write!(w, " pub {}: ", self.name)?;
let rust_type = self.typ.rust_type(msgs, enums);
match self.frequency {
Frequency::Optional if self.boxed => writeln!(w, "Option<Box<{}>>,", rust_type)?,
_ if self.boxed => writeln!(w, "Option<Box<{}>>,", rust_type)?,
Frequency::Optional if self.default.is_some() => writeln!(w, "{},", rust_type)?,
Frequency::Optional => writeln!(w, "Option<{}>,", rust_type)?,
Frequency::Repeated if self.packed() && self.typ.is_fixed_size() => {
Expand Down Expand Up @@ -416,28 +416,23 @@ impl Field {
let name = &self.name;
write!(w, " Ok({}) => ", self.tag())?;
match self.frequency {
_ if self.boxed => writeln!(w, "msg.{} = Some(Box::new({}?)),", name, val)?,
Frequency::Required => writeln!(w, "msg.{} = {}?,", name, val_cow)?,
Frequency::Optional if self.boxed => writeln!(w, "msg.{} = Some(Box::new({}?)),", name, val)?,
Frequency::Optional if self.default.is_some() => writeln!(w, "msg.{} = {}?,", name, val_cow)?,
Frequency::Optional => writeln!(w, "msg.{} = Some({}?),", name, val_cow)?,
Frequency::Repeated if self.packed() && self.typ.is_fixed_size() => {
writeln!(w, "msg.{} = Cow::Borrowed(r.read_packed_fixed(bytes)?),", name)?;
},
Frequency::Repeated if self.packed() => {
writeln!(w, "msg.{} = r.read_packed(bytes, |r, bytes| {})?,", name, val)?;
writeln!(w, "msg.{} = r.read_packed(bytes, |r, bytes| {})?,", name, val_cow)?;
},
Frequency::Repeated => writeln!(w, "msg.{}.push({}?),", name, val)?,
Frequency::Repeated => writeln!(w, "msg.{}.push({}?),", name, val_cow)?,
}
Ok(())
}

fn write_get_size<W: Write>(&self, w: &mut W, is_first: &mut bool) -> Result<()> {
if *is_first {
write!(w, " ")?;
*is_first = false;
} else {
write!(w, " + ")?;
}
fn write_get_size<W: Write>(&self, w: &mut W) -> Result<()> {
write!(w, " + ")?;
let tag_size = sizeof_varint(self.tag());
match self.frequency {
Frequency::Required if self.typ.is_map() => {
Expand Down Expand Up @@ -618,6 +613,16 @@ impl Message {
}

fn write_impl_message_read<W: Write>(&self, w: &mut W, msgs: &[Message], enums: &[Enumerator]) -> Result<()> {
if self.fields.is_empty() && self.oneofs.is_empty() {
writeln!(w, "impl {} {{", self.name)?;
writeln!(w, " pub fn from_reader(r: &mut BytesReader, _: &[u8]) -> Result<Self> {{")?;
writeln!(w, " r.read_to_end();")?;
writeln!(w, " Ok(Self::default())")?;
writeln!(w, " }}")?;
writeln!(w, "}}")?;
return Ok(());
}

if self.has_lifetime(msgs) {
writeln!(w, "impl<'a> {}<'a> {{", self.name)?;
writeln!(w, " pub fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {{")?;
Expand Down Expand Up @@ -674,19 +679,29 @@ impl Message {
}

fn write_get_size<W: Write>(&self, w: &mut W) -> Result<()> {
if self.fields.is_empty() && self.oneofs.is_empty() {
writeln!(w, " fn get_size(&self) -> usize {{ 0 }}")?;
return Ok(());
}

writeln!(w, " fn get_size(&self) -> usize {{")?;
let mut first = true;
writeln!(w, " 0")?;
for f in self.fields.iter().filter(|f| !f.deprecated) {
f.write_get_size(w, &mut first)?;
f.write_get_size(w)?;
}
for o in self.oneofs.iter() {
o.write_get_size(w, &mut first)?;
o.write_get_size(w)?;
}
writeln!(w, " }}")?;
Ok(())
}

fn write_write_message<W: Write>(&self, w: &mut W) -> Result<()> {
if self.fields.is_empty() && self.oneofs.is_empty() {
writeln!(w, " fn write_message<W: Write>(&self, _: &mut Writer<W>) -> Result<()> {{ Ok(()) }}")?;
return Ok(());
}

writeln!(w, " fn write_message<W: Write>(&self, w: &mut Writer<W>) -> Result<()> {{")?;
for f in self.fields.iter().filter(|f| !f.deprecated) {
f.write_write(w)?;
Expand Down Expand Up @@ -768,13 +783,17 @@ impl Enumerator {
}

fn write<W: Write>(&self, w: &mut W) -> Result<()> {
println!("Writing enum {}", self.name);
writeln!(w, "")?;
self.write_definition(w)?;
writeln!(w, "")?;
println!("Writing enum {}", self.name);
writeln!(w, "")?;
self.write_definition(w)?;
writeln!(w, "")?;
if self.fields.is_empty() {
Ok(())
} else {
self.write_impl_default(w)?;
writeln!(w, "")?;
self.write_from_i32(w)
}
}

fn write_definition<W: Write>(&self, w: &mut W) -> Result<()> {
Expand Down Expand Up @@ -883,13 +902,8 @@ impl OneOf {
Ok(())
}

fn write_get_size<W: Write>(&self, w: &mut W, is_first: &mut bool) -> Result<()> {
if *is_first {
write!(w, " match self.{} {{", self.name)?;
*is_first = false;
} else {
write!(w, " + match self.{} {{", self.name)?;
}
fn write_get_size<W: Write>(&self, w: &mut W) -> Result<()> {
write!(w, " + match self.{} {{", self.name)?;
for f in self.fields.iter().filter(|f| !f.deprecated) {
let tag_size = sizeof_varint(f.tag());
if f.typ.is_fixed_size() {
Expand Down Expand Up @@ -1178,6 +1192,7 @@ fn break_cycles(messages: &mut [Message], leaf_messages: &mut Vec<String>) {
.chain(m.oneofs.iter_mut().flat_map(|o| o.fields.iter_mut()))
{
if !f.is_leaf(&leaf_messages) {
f.frequency = Frequency::Optional;
f.boxed = true;
}
}
Expand Down
15 changes: 10 additions & 5 deletions examples/codegen/data_types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ impl BarMessage {

impl MessageWrite for BarMessage {
fn get_size(&self) -> usize {
1 + sizeof_varint(*(&self.b_required_int32) as u64)
0
+ 1 + sizeof_varint(*(&self.b_required_int32) as u64)
}

fn write_message<W: Write>(&self, w: &mut Writer<W>) -> Result<()> {
Expand Down Expand Up @@ -160,7 +161,8 @@ impl<'a> FooMessage<'a> {

impl<'a> MessageWrite for FooMessage<'a> {
fn get_size(&self) -> usize {
self.f_int32.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
0
+ self.f_int32.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
+ self.f_int64.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
+ self.f_uint32.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
+ self.f_uint64.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
Expand Down Expand Up @@ -245,7 +247,8 @@ impl BazMessage {

impl MessageWrite for BazMessage {
fn get_size(&self) -> usize {
self.nested.as_ref().map_or(0, |m| 1 + sizeof_len((m).get_size()))
0
+ self.nested.as_ref().map_or(0, |m| 1 + sizeof_len((m).get_size()))
}

fn write_message<W: Write>(&self, w: &mut Writer<W>) -> Result<()> {
Expand Down Expand Up @@ -279,7 +282,8 @@ impl Nested {

impl MessageWrite for Nested {
fn get_size(&self) -> usize {
1 + sizeof_len((&self.f_nested).get_size())
0
+ 1 + sizeof_len((&self.f_nested).get_size())
}

fn write_message<W: Write>(&self, w: &mut Writer<W>) -> Result<()> {
Expand Down Expand Up @@ -313,7 +317,8 @@ impl NestedMessage {

impl MessageWrite for NestedMessage {
fn get_size(&self) -> usize {
1 + sizeof_varint(*(&self.f_nested) as u64)
0
+ 1 + sizeof_varint(*(&self.f_nested) as u64)
}

fn write_message<W: Write>(&self, w: &mut Writer<W>) -> Result<()> {
Expand Down
3 changes: 2 additions & 1 deletion examples/codegen/data_types_import.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ impl ImportedMessage {

impl MessageWrite for ImportedMessage {
fn get_size(&self) -> usize {
self.i.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
0
+ self.i.as_ref().map_or(0, |m| 1 + sizeof_varint(*(m) as u64))
}

fn write_message<W: Write>(&self, w: &mut Writer<W>) -> Result<()> {
Expand Down
5 changes: 5 additions & 0 deletions src/reader.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,11 @@ impl BytesReader {
pub fn is_eof(&self) -> bool {
self.start == self.end
}

/// Advance inner cursor to the end
pub fn read_to_end(&mut self) {
self.start = self.end;
}
}

/// A struct to read protobuf data
Expand Down

0 comments on commit 6642eeb

Please sign in to comment.