Move C++ method impls inside struct definitions

This commit is contained in:
Nigel Tao committed 2018-10-06 10:06:07 +10:00
1 parent 5b82dd905a
commit 26a448450e
3 files changed
+133 -264

No files matched your search

+11 -60
View File
@@ -400,11 +400,6 @@ func (g *gen) genHeader(b *buffer) error {
}
}
b.writes("// ---------------- C++ Convenience Methods \n\n")
if err := g.writeCppImpls(b); err != nil {
return err
}
b.writes("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n")
return nil
}
@@ -688,21 +683,25 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
b.writes("} private_impl;\n\n")
if n.AsNode().AsRaw().Flags()&a.FlagsPublic != 0 {
if err := g.writeCppPrototypes(b, n); err != nil {
if err := g.writeCppMethods(b, n); err != nil {
return err
}
}
b.writes("};\n\n")
b.printf("}; // struct %s%s__struct\n\n", g.pkgPrefix, structName)
return nil
}
func (g *gen) writeCppPrototypes(b *buffer, n *a.Struct) error {
b.writes("#ifdef __cplusplus\n")
func (g *gen) writeCppMethods(b *buffer, n *a.Struct) error {
structName := n.QID().Str(g.tm)
b.writes("#ifdef __cplusplus\n\n")
// The empty // comment makes clang-format place the function name
// at the start of a line.
b.writes("inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //\n" +
"check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);\n")
"check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {\n")
b.printf("return %s%s__check_wuffs_version(this, sizeof_star_self, wuffs_version);\n}\n\n",
g.pkgPrefix, structName)
structID := n.QID()[1]
for _, file := range g.files {
@@ -719,58 +718,10 @@ func (g *gen) writeCppPrototypes(b *buffer, n *a.Struct) error {
if err := g.writeFuncSignature(b, f, cppInsideStruct); err != nil {
return err
}
b.writes(";\n")
}
}
b.writes("#endif // __cplusplus\n\n")
return nil
}
func (g *gen) writeCppImpls(b *buffer) error {
b.writes("\n#ifdef __cplusplus\n\n")
publicStructs := map[t.ID]bool{}
for _, file := range g.files {
for _, tld := range file.TopLevelDecls() {
if (tld.Kind() != a.KStruct) || (tld.AsRaw().Flags()&a.FlagsPublic == 0) {
continue
}
n := tld.AsStruct()
structID := n.QID()[1]
structName := structID.Str(g.tm)
// The empty // comment makes clang-format place the function name
// at the start of a line.
b.writes("inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //\n")
b.printf("%s%s::check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {\n",
g.pkgPrefix, structName)
b.printf("return %s%s__check_wuffs_version(this, sizeof_star_self, wuffs_version);\n",
g.pkgPrefix, structName)
b.printf("}\n\n")
publicStructs[structID] = true
}
}
for _, file := range g.files {
for _, tld := range file.TopLevelDecls() {
if (tld.Kind() != a.KFunc) || (tld.AsRaw().Flags()&a.FlagsPublic == 0) {
continue
}
n := tld.AsFunc()
if !publicStructs[n.QQID()[1]] {
continue
}
if err := g.writeFuncSignature(b, n, cppOutsideStruct); err != nil {
return err
}
b.writes("{ return ")
b.writes(g.funcCName(n))
b.writes(g.funcCName(f))
b.writes("(this")
for _, o := range n.In().Fields() {
for _, o := range f.In().Fields() {
b.writeb(',')
b.writes(aPrefix)
b.writes(o.AsField().Name().Str(g.tm))
+3 -5
View File
@@ -95,11 +95,9 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error {
return err
}
if cpp != cppInsideStruct {
// The empty // comment makes clang-format place the function name at
// the start of a line.
b.writes("//\n")
}
// The empty // comment makes clang-format place the function name at the
// start of a line.
b.writes("//\n")
switch cpp {
case cppNone:
+119 -199
View File
@@ -2243,30 +2243,22 @@ struct wuffs_adler32__hasher__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline uint32_t update(wuffs_base__slice_u8 a_x);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_adler32__hasher__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_adler32__hasher::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_adler32__hasher__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline uint32_t //
wuffs_adler32__hasher::update(wuffs_base__slice_u8 a_x) {
return wuffs_adler32__hasher__update(this, a_x);
}
inline uint32_t //
update(wuffs_base__slice_u8 a_x) {
return wuffs_adler32__hasher__update(this, a_x);
}
#endif // __cplusplus
}; // struct wuffs_adler32__hasher__struct
#ifdef __cplusplus
} // extern "C"
#endif
@@ -2326,30 +2318,22 @@ struct wuffs_crc32__ieee_hasher__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline uint32_t update(wuffs_base__slice_u8 a_x);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_crc32__ieee_hasher__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_crc32__ieee_hasher::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_crc32__ieee_hasher__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline uint32_t //
wuffs_crc32__ieee_hasher::update(wuffs_base__slice_u8 a_x) {
return wuffs_crc32__ieee_hasher__update(this, a_x);
}
inline uint32_t //
update(wuffs_base__slice_u8 a_x) {
return wuffs_crc32__ieee_hasher__update(this, a_x);
}
#endif // __cplusplus
}; // struct wuffs_crc32__ieee_hasher__struct
#ifdef __cplusplus
} // extern "C"
#endif
@@ -2483,32 +2467,22 @@ struct wuffs_deflate__decoder__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline wuffs_base__status decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_deflate__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_deflate__decoder::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_deflate__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline wuffs_base__status //
wuffs_deflate__decoder::decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src) {
return wuffs_deflate__decoder__decode(this, a_dst, a_src);
}
inline wuffs_base__status //
decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) {
return wuffs_deflate__decoder__decode(this, a_dst, a_src);
}
#endif // __cplusplus
}; // struct wuffs_deflate__decoder__struct
#ifdef __cplusplus
} // extern "C"
#endif
@@ -2599,38 +2573,27 @@ struct wuffs_lzw__decoder__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline void set_literal_width(uint32_t a_lw);
inline wuffs_base__status decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_lzw__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
inline void //
set_literal_width(uint32_t a_lw) {
return wuffs_lzw__decoder__set_literal_width(this, a_lw);
}
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_lzw__decoder::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_lzw__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline void //
wuffs_lzw__decoder::set_literal_width(uint32_t a_lw) {
return wuffs_lzw__decoder__set_literal_width(this, a_lw);
}
inline wuffs_base__status //
wuffs_lzw__decoder::decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src) {
return wuffs_lzw__decoder__decode(this, a_dst, a_src);
}
inline wuffs_base__status //
decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) {
return wuffs_lzw__decoder__decode(this, a_dst, a_src);
}
#endif // __cplusplus
}; // struct wuffs_lzw__decoder__struct
#ifdef __cplusplus
} // extern "C"
#endif
@@ -2825,79 +2788,58 @@ struct wuffs_gif__decoder__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline wuffs_base__status decode_image_config(wuffs_base__image_config* a_dst,
wuffs_base__io_reader a_src);
inline uint64_t num_decoded_frame_configs();
inline uint64_t num_decoded_frames();
inline wuffs_base__range_ii_u64 workbuf_len();
inline wuffs_base__status restart_frame(uint64_t a_index,
uint64_t a_io_position);
inline wuffs_base__status decode_frame_config(wuffs_base__frame_config* a_dst,
wuffs_base__io_reader a_src);
inline wuffs_base__status decode_frame(
wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_gif__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
inline wuffs_base__status //
decode_image_config(wuffs_base__image_config* a_dst,
wuffs_base__io_reader a_src) {
return wuffs_gif__decoder__decode_image_config(this, a_dst, a_src);
}
#ifdef __cplusplus
inline uint64_t //
num_decoded_frame_configs() {
return wuffs_gif__decoder__num_decoded_frame_configs(this);
}
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_gif__decoder::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_gif__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline uint64_t //
num_decoded_frames() {
return wuffs_gif__decoder__num_decoded_frames(this);
}
inline wuffs_base__status //
wuffs_gif__decoder::decode_image_config(wuffs_base__image_config* a_dst,
wuffs_base__io_reader a_src) {
return wuffs_gif__decoder__decode_image_config(this, a_dst, a_src);
}
inline wuffs_base__range_ii_u64 //
workbuf_len() {
return wuffs_gif__decoder__workbuf_len(this);
}
inline uint64_t //
wuffs_gif__decoder::num_decoded_frame_configs() {
return wuffs_gif__decoder__num_decoded_frame_configs(this);
}
inline wuffs_base__status //
restart_frame(uint64_t a_index, uint64_t a_io_position) {
return wuffs_gif__decoder__restart_frame(this, a_index, a_io_position);
}
inline uint64_t //
wuffs_gif__decoder::num_decoded_frames() {
return wuffs_gif__decoder__num_decoded_frames(this);
}
inline wuffs_base__status //
decode_frame_config(wuffs_base__frame_config* a_dst,
wuffs_base__io_reader a_src) {
return wuffs_gif__decoder__decode_frame_config(this, a_dst, a_src);
}
inline wuffs_base__range_ii_u64 //
wuffs_gif__decoder::workbuf_len() {
return wuffs_gif__decoder__workbuf_len(this);
}
inline wuffs_base__status //
wuffs_gif__decoder::restart_frame(uint64_t a_index, uint64_t a_io_position) {
return wuffs_gif__decoder__restart_frame(this, a_index, a_io_position);
}
inline wuffs_base__status //
wuffs_gif__decoder::decode_frame_config(wuffs_base__frame_config* a_dst,
wuffs_base__io_reader a_src) {
return wuffs_gif__decoder__decode_frame_config(this, a_dst, a_src);
}
inline wuffs_base__status //
wuffs_gif__decoder::decode_frame(wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts) {
return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_workbuf,
a_opts);
}
inline wuffs_base__status //
decode_frame(wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts) {
return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_workbuf,
a_opts);
}
#endif // __cplusplus
}; // struct wuffs_gif__decoder__struct
#ifdef __cplusplus
} // extern "C"
#endif
@@ -2988,38 +2930,27 @@ struct wuffs_gzip__decoder__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline void set_ignore_checksum(bool a_ic);
inline wuffs_base__status decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_gzip__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
inline void //
set_ignore_checksum(bool a_ic) {
return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic);
}
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_gzip__decoder::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_gzip__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline void //
wuffs_gzip__decoder::set_ignore_checksum(bool a_ic) {
return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic);
}
inline wuffs_base__status //
wuffs_gzip__decoder::decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src) {
return wuffs_gzip__decoder__decode(this, a_dst, a_src);
}
inline wuffs_base__status //
decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) {
return wuffs_gzip__decoder__decode(this, a_dst, a_src);
}
#endif // __cplusplus
}; // struct wuffs_gzip__decoder__struct
#ifdef __cplusplus
} // extern "C"
#endif
@@ -3106,38 +3037,27 @@ struct wuffs_zlib__decoder__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version);
inline void set_ignore_checksum(bool a_ic);
inline wuffs_base__status decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src);
#endif // __cplusplus
};
check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {
return wuffs_zlib__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
// ---------------- C++ Convenience Methods
inline void //
set_ignore_checksum(bool a_ic) {
return wuffs_zlib__decoder__set_ignore_checksum(this, a_ic);
}
#ifdef __cplusplus
inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
wuffs_zlib__decoder::check_wuffs_version(size_t sizeof_star_self,
uint64_t wuffs_version) {
return wuffs_zlib__decoder__check_wuffs_version(this, sizeof_star_self,
wuffs_version);
}
inline void //
wuffs_zlib__decoder::set_ignore_checksum(bool a_ic) {
return wuffs_zlib__decoder__set_ignore_checksum(this, a_ic);
}
inline wuffs_base__status //
wuffs_zlib__decoder::decode(wuffs_base__io_writer a_dst,
wuffs_base__io_reader a_src) {
return wuffs_zlib__decoder__decode(this, a_dst, a_src);
}
inline wuffs_base__status //
decode(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) {
return wuffs_zlib__decoder__decode(this, a_dst, a_src);
}
#endif // __cplusplus
}; // struct wuffs_zlib__decoder__struct
#ifdef __cplusplus
} // extern "C"
#endif