From c5b5efd7c82949d8d26859b8d33e622849b9fc54 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 2 Dec 2017 14:17:24 +1100 Subject: [PATCH] Prepare for generating use declarations --- cmd/wuffs-c/internal/cgen/cgen.go | 43 +++++++++++++++++++++++++++++-- gen/c/std/flate.c | 2 ++ gen/c/std/gif.c | 2 ++ gen/c/std/zlib.c | 6 +++++ gen/h/std/flate.h | 2 ++ gen/h/std/gif.h | 2 ++ gen/h/std/zlib.h | 6 +++++ 7 files changed, 61 insertions(+), 2 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index ad293cd8..f97232e0 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -166,6 +166,7 @@ type gen struct { structMap map[t.ID]*a.Struct currFunk funk funks map[t.QID]funk + usesSeen map[string]struct{} } func (g *gen) generate() ([]byte, error) { @@ -216,6 +217,13 @@ func (g *gen) genHeader(b *buffer) error { b.printf("// Code generated by wuffs-c. DO NOT EDIT.\n\n") b.writes(baseHeader) + b.writeb('\n') + + b.writes("// ---------------- Use Declarations\n\n") + if err := g.forEachUse(b, (*gen).writeUse); err != nil { + return err + } + b.writes("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n") b.writes("// ---------------- Status Codes\n\n") @@ -397,6 +405,20 @@ func (g *gen) forEachStatus(b *buffer, v visibility, f func(*gen, *buffer, *a.St return nil } +func (g *gen) forEachUse(b *buffer, f func(*gen, *buffer, *a.Use) error) error { + for _, file := range g.files { + for _, tld := range file.TopLevelDecls() { + if tld.Kind() != a.KUse { + continue + } + if err := f(g, b, tld.Use()); err != nil { + return err + } + } + } + return nil +} + func (g *gen) cName(name string) string { s := []byte(g.pkgPrefix) underscore := true @@ -555,13 +577,30 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error { return nil } +func (g *gen) writeUse(b *buffer, n *a.Use) error { + useDirname := g.tm.ByID(n.Path()) + useDirname, _ = t.Unescape(useDirname) + + // TODO: sanity check useDirname? + + if g.usesSeen == nil { + g.usesSeen = map[string]struct{}{} + } else if _, ok := g.usesSeen[useDirname]; ok { + return nil + } + g.usesSeen[useDirname] = struct{}{} + + b.printf("// ---------------- BEGIN USE %q\n\n", useDirname) + b.printf("// ---------------- END USE %q\n\n", useDirname) + return nil +} + func (g *gen) writeInitializerSignature(b *buffer, n *a.Struct, public bool) error { structName := n.Name().Str(g.tm) if public { b.printf("// %s%s__initialize is an initializer function.\n", g.pkgPrefix, structName) b.printf("//\n") - b.printf("// It should be called before any other %s%s__* function.\n", - g.pkgPrefix, structName) + b.printf("// It should be called before any other %s%s__* function.\n", g.pkgPrefix, structName) b.printf("//\n") b.printf("// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.\n") } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index f9538ebf..a7033256 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -107,6 +107,8 @@ typedef struct { #endif // WUFFS_BASE_HEADER_H +// ---------------- Use Declarations + #ifdef __cplusplus extern "C" { #endif diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 43ca60ec..280888e5 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -107,6 +107,8 @@ typedef struct { #endif // WUFFS_BASE_HEADER_H +// ---------------- Use Declarations + #ifdef __cplusplus extern "C" { #endif diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 78647387..18099c68 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -107,6 +107,12 @@ typedef struct { #endif // WUFFS_BASE_HEADER_H +// ---------------- Use Declarations + +// ---------------- BEGIN USE "std/flate" + +// ---------------- END USE "std/flate" + #ifdef __cplusplus extern "C" { #endif diff --git a/gen/h/std/flate.h b/gen/h/std/flate.h index 9f964ae0..1b4c6946 100644 --- a/gen/h/std/flate.h +++ b/gen/h/std/flate.h @@ -107,6 +107,8 @@ typedef struct { #endif // WUFFS_BASE_HEADER_H +// ---------------- Use Declarations + #ifdef __cplusplus extern "C" { #endif diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 4fb94d83..3977ed9d 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -107,6 +107,8 @@ typedef struct { #endif // WUFFS_BASE_HEADER_H +// ---------------- Use Declarations + #ifdef __cplusplus extern "C" { #endif diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index c5ee8a8b..7ac1d4e6 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -107,6 +107,12 @@ typedef struct { #endif // WUFFS_BASE_HEADER_H +// ---------------- Use Declarations + +// ---------------- BEGIN USE "std/flate" + +// ---------------- END USE "std/flate" + #ifdef __cplusplus extern "C" { #endif