Fix settings_size vs byte_size confusion in gen_settings.py.

This commit is contained in:
Jakob Stoklund Olesen
2016-08-30 15:27:35 -07:00
parent 74e731ed25
commit f18041b56c

View File

@@ -231,7 +231,7 @@ def gen_constructor(sgrp, settings_size, byte_size, parent, fmt):
'pub fn new({}) -> Flags {{'.format(args), '}'): 'pub fn new({}) -> Flags {{'.format(args), '}'):
fmt.line('let bvec = builder.finish("{}");'.format(sgrp.name)) fmt.line('let bvec = builder.finish("{}");'.format(sgrp.name))
fmt.line('let mut bytes = [0; {}];'.format(byte_size)) fmt.line('let mut bytes = [0; {}];'.format(byte_size))
fmt.line('assert_eq!(bytes.len(), {});'.format(settings_size)) fmt.line('assert_eq!(bvec.len(), {});'.format(settings_size))
with fmt.indented( with fmt.indented(
'for (i, b) in bvec.into_iter().enumerate() {', '}'): 'for (i, b) in bvec.into_iter().enumerate() {', '}'):
fmt.line('bytes[i] = b;') fmt.line('bytes[i] = b;')
@@ -268,7 +268,7 @@ def gen_group(sgrp, fmt):
fmt.line('#[derive(Clone)]') fmt.line('#[derive(Clone)]')
fmt.doc_comment('Flags group `{}`.'.format(sgrp.name)) fmt.doc_comment('Flags group `{}`.'.format(sgrp.name))
with fmt.indented('pub struct Flags {', '}'): with fmt.indented('pub struct Flags {', '}'):
fmt.line('bytes: [u8; {}],'.format(settings_size)) fmt.line('bytes: [u8; {}],'.format(byte_size))
gen_constructor(sgrp, settings_size, byte_size, None, fmt) gen_constructor(sgrp, settings_size, byte_size, None, fmt)
gen_enum_types(sgrp, fmt) gen_enum_types(sgrp, fmt)