@@ -9,7 +9,7 @@ use wit_bindgen_core::wit_parser::{
99 Variant , World , WorldItem , WorldKey ,
1010} ;
1111use wit_bindgen_core:: { uwrite, uwriteln, Source , TypeInfo } ;
12- use wrpc_introspect:: { async_paths_ty, flag_repr , is_list_of, is_ty, rpc_func_name} ;
12+ use wrpc_introspect:: { async_paths_ty, is_list_of, is_ty, rpc_func_name} ;
1313
1414use crate :: {
1515 to_go_ident, to_package_ident, to_upper_camel_case, Deps , GoWrpc , Identifier , InterfaceName ,
@@ -737,37 +737,20 @@ impl InterfaceGenerator<'_> {
737737 self . src . push_str ( ")" ) ;
738738 }
739739
740- fn print_read_flags ( & mut self , ty : & Flags , reader : & str , name : & str ) {
741- let fmt = self . deps . fmt ( ) ;
742- let io = self . deps . io ( ) ;
743-
744- let repr = flag_repr ( ty) ;
740+ fn print_read_flags ( & mut self , reader : & str , name : & str ) {
741+ let wrpc = self . deps . wrpc ( ) ;
745742
746743 uwrite ! (
747744 self . src,
748- r#"func(r {io}.ByteReader) (*{name}, error) {{
749- v := &{name}{{}}
750- n, err := "#
745+ r#"func(r {wrpc}.IndexReader) (*{name}, error) {{
746+ v := {name}{{}}
747+ if err := v.ReadFromIndex(r); err != nil {{
748+ return nil, err
749+ }}
750+ return &v, nil
751+ }}({reader})
752+ "#
751753 ) ;
752- self . print_read_discriminant ( repr, "r" ) ;
753- self . push_str ( "\n " ) ;
754- self . push_str ( "if err != nil {\n " ) ;
755- self . push_str ( "return nil, " ) ;
756- self . push_str ( fmt) ;
757- self . push_str ( ".Errorf(\" failed to read flag: %w\" , err)\n " ) ;
758- self . push_str ( "}\n " ) ;
759- for ( i, Flag { name, .. } ) in ty. flags . iter ( ) . enumerate ( ) {
760- if i > 64 {
761- break ;
762- }
763- uwriteln ! ( self . src, "if n & (1 << {i}) > 0 {{" ) ;
764- self . push_str ( "v." ) ;
765- self . push_str ( & name. to_upper_camel_case ( ) ) ;
766- self . push_str ( " = true\n " ) ;
767- self . push_str ( "}\n " ) ;
768- }
769- self . push_str ( "return v, nil\n " ) ;
770- uwrite ! ( self . src, "}}({reader})" ) ;
771754 }
772755
773756 fn print_read_enum ( & mut self , ty : & Enum , reader : & str , name : & str ) {
@@ -1328,8 +1311,8 @@ impl InterfaceGenerator<'_> {
13281311 TypeDefKind :: Resource => self . print_read_string ( reader) ,
13291312 TypeDefKind :: Handle ( Handle :: Own ( id) ) => self . print_read_own ( reader, * id) ,
13301313 TypeDefKind :: Handle ( Handle :: Borrow ( id) ) => self . print_read_borrow ( reader, * id) ,
1331- TypeDefKind :: Flags ( ty ) => {
1332- self . print_read_flags ( ty , reader, & name. expect ( "flag missing a name" ) ) ;
1314+ TypeDefKind :: Flags ( _ty ) => {
1315+ self . print_read_flags ( reader, & name. expect ( "flag missing a name" ) ) ;
13331316 }
13341317 TypeDefKind :: Tuple ( ty) => self . print_read_tuple ( ty, reader, path) ,
13351318 TypeDefKind :: Variant ( ty) => {
@@ -3743,13 +3726,13 @@ func (v *{name}) WriteToIndex(w {wrpc}.ByteWriter) (func({wrpc}.IndexWriter) err
37433726 }
37443727
37453728 fn type_flags ( & mut self , id : TypeId , _name : & str , ty : & Flags , docs : & Docs ) {
3746- let repr = flag_repr ( ty) ;
3747-
37483729 let info = self . info ( id) ;
37493730 if let Some ( name) = self . name_of ( id) {
37503731 let strings = self . deps . strings ( ) ;
37513732 let wrpc = self . deps . wrpc ( ) ;
3733+ let errors = self . deps . errors ( ) ;
37523734
3735+ // Struct
37533736 self . godoc ( docs) ;
37543737 uwriteln ! ( self . src, "type {name} struct {{" ) ;
37553738 for Flag { name, docs } in & ty. flags {
@@ -3759,6 +3742,7 @@ func (v *{name}) WriteToIndex(w {wrpc}.ByteWriter) (func({wrpc}.IndexWriter) err
37593742 }
37603743 self . push_str ( "}\n " ) ;
37613744
3745+ // String()
37623746 uwriteln ! ( self . src, "func (v *{name}) String() string {{" ) ;
37633747 uwriteln ! ( self . src, "flags := make([]string, 0, {})" , ty. flags. len( ) ) ;
37643748 for Flag { name, .. } in & ty. flags {
@@ -3769,34 +3753,76 @@ func (v *{name}) WriteToIndex(w {wrpc}.ByteWriter) (func({wrpc}.IndexWriter) err
37693753 self . push_str ( "}\n " ) ;
37703754 }
37713755 uwriteln ! ( self . src, r#"return {strings}.Join(flags, " | ")"# ) ;
3772- self . push_str ( "}\n " ) ;
3756+ self . push_str ( "}\n \n " ) ;
3757+
3758+ // WriteToIndex()
3759+ let mut buf_len = ty. flags . len ( ) / 8 ;
3760+ if ty. flags . len ( ) % 8 > 0 {
3761+ buf_len += 1 ;
3762+ }
3763+
37733764 uwriteln ! (
37743765 self . src,
3775- "func (v *{name}) WriteToIndex(w {wrpc}.ByteWriter) (func({wrpc}.IndexWriter) error, error) {{"
3766+ r#"func (v *{name}) WriteToIndex(w {wrpc}.ByteWriter) (func({wrpc}.IndexWriter) error, error) {{
3767+ var p [{buf_len}]byte
3768+ "#
37763769 ) ;
3777- self . push_str ( "var n " ) ;
3778- self . int_repr ( repr) ;
3779- self . push_str ( "\n " ) ;
3770+
37803771 for ( i, Flag { name, .. } ) in ty. flags . iter ( ) . enumerate ( ) {
37813772 self . push_str ( "if v." ) ;
37823773 self . push_str ( & name. to_upper_camel_case ( ) ) ;
3783- self . push_str ( " {\n " ) ;
3784- if i <= 64 {
3785- uwriteln ! ( self . src, "n |= 1 << {i}" ) ;
3786- } else {
3787- let errors = self . deps . errors ( ) ;
3788- uwriteln ! (
3789- self . src,
3790- r#"return nil, {errors}.New("encoding `{name}` flag value would overflow 64-bit integer, flags containing more than 64 members are not supported yet")"#
3791- ) ;
3792- }
3793- self . push_str ( "}\n " ) ;
3774+ uwriteln ! (
3775+ self . src,
3776+ r#"{{
3777+ p[{}] |= 1 << {}
3778+ }}"# ,
3779+ i / 8 ,
3780+ i % 8
3781+ ) ;
37943782 }
3795- self . push_str ( "return nil, " ) ;
3796- self . print_write_discriminant ( repr, "n" , "w" ) ;
3797- self . push_str ( "\n " ) ;
3798- self . push_str ( "}\n " ) ;
3783+ uwriteln ! (
3784+ self . src,
3785+ r#"
3786+ _, err := w.Write(p[:])
3787+ return nil, err
3788+ }}
3789+ "# ,
3790+ ) ;
3791+
3792+ // ReadFromIndex()
3793+ uwrite ! (
3794+ self . src,
3795+ r#"func (v *{name}) ReadFromIndex(r {wrpc}.IndexReader) error {{
3796+ var p [{buf_len}]byte
3797+ if _, err := r.Read(p[:]); err != nil {{
3798+ return err
3799+ }}
3800+
3801+ "#
3802+ ) ;
3803+
3804+ for ( i, Flag { name, .. } ) in ty. flags . iter ( ) . enumerate ( ) {
3805+ uwriteln ! (
3806+ self . src,
3807+ "v.{} = p[{}] & (1 << {}) > 0" ,
3808+ name. to_upper_camel_case( ) ,
3809+ i / 8 ,
3810+ i % 8
3811+ ) ;
3812+ }
3813+
3814+ uwriteln ! (
3815+ self . src,
3816+ r#"
3817+ if (p[{}] >> {}) > 0 {{
3818+ return {errors}.New("bit not associated with any flag is set")
3819+ }}"# ,
3820+ buf_len - 1 ,
3821+ ty. flags. len( ) % 8 ,
3822+ ) ;
3823+ self . push_str ( "return nil\n }\n " ) ;
37993824
3825+ // Error()
38003826 if info. error {
38013827 uwriteln ! (
38023828 self . src,
0 commit comments