Commitd237d5c

Stephen Cobbe

authored and

zjiuyang

committed

Support empty struct.

1 parent91b3c39 commitd237d5cCopy full SHA for d237d5c

File tree

2 files changed

+16

-13

lines changed

generator
- java.stoneg.py
stone

2 files changed

+16

-13

lines changed

`‎generator/java.stoneg.py‎`

Lines changed: 15 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,8 @@ def write_imports(self):`
`1029`	`1029`	`defjava_default_value(self,field):`
`1030`	`1030`	`assertisinstance(field,Field),repr(field)`
`1031`	`1031`	`assertfield.has_default,repr(field)`
`1032`		`-returnself.java_value(field.data_type,field.default)`
	`1032`	`+default_value='\"\"'iffield.default==''elsefield.default`
	`1033`	`+returnself.java_value(field.data_type,default_value)`
`1033`	`1034`
`1034`	`1035`	`defjava_value(self,data_type,stone_value):`
`1035`	`1036`	`assertisinstance(data_type,DataType),repr(data_type)`
`@@ -3833,17 +3834,19 @@ def generate_struct_deserialize(self, data_type):`
`3833`	`3834`	`default_value=w.java_default_value(field)iffield.has_defaultelse'null'`
`3834`	`3835`	`w.out('%s f_%s = %s;',`
`3835`	`3836`	`j.java_class(field,boxed=True),j.param_name(field),default_value)`
`3836`		`-withw.block('while (p.getCurrentToken() == JsonToken.FIELD_NAME)'):`
`3837`		`-w.out('String field = p.getCurrentName();')`
`3838`		`-w.out('p.nextToken();')`
`3839`		`-`
`3840`		`-fori,fieldinenumerate(data_type.all_fields):`
`3841`		`-conditional='if'ifi==0else'else if'`
`3842`		`-serializer=w.java_serializer(field.data_type)`
`3843`		`-withw.block('%s ("%s".equals(field))',conditional,field.name):`
`3844`		`-w.out('f_%s = %s.deserialize(p);',j.param_name(field),serializer)`
`3845`		`-withw.block('else'):`
`3846`		`-w.out('skipValue(p);')`
	`3837`	`+`
	`3838`	`+ifdata_type.all_fields:`
	`3839`	`+withw.block('while (p.getCurrentToken() == JsonToken.FIELD_NAME)'):`
	`3840`	`+w.out('String field = p.getCurrentName();')`
	`3841`	`+w.out('p.nextToken();')`
	`3842`	`+`
	`3843`	`+fori,fieldinenumerate(data_type.all_fields):`
	`3844`	`+conditional='if'ifi==0else'else if'`
	`3845`	`+serializer=w.java_serializer(field.data_type)`
	`3846`	`+withw.block('%s ("%s".equals(field))',conditional,field.name):`
	`3847`	`+w.out('f_%s = %s.deserialize(p);',j.param_name(field),serializer)`
	`3848`	`+withw.block('else'):`
	`3849`	`+w.out('skipValue(p);')`
`3847`	`3850`
`3848`	`3851`	`forfieldindata_type.all_fields:`
`3849`	`3852`	`iffieldnotindata_type.all_optional_fields:`

`‎stone‎`

Submodulestone updated21 files

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd237d5c

File tree

2 files changed

2 files changed

`‎generator/java.stoneg.py‎`

`‎stone‎`

0 commit comments