From 6826f2f748b4d823981bef3f39f1e0ac18e3c063 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 9 Mar 2019 13:28:59 +1100 Subject: [PATCH] Move internal/cgen up a couple of directories --- README.md | 2 ++ cmd/wuffs-c/main.go | 2 +- {cmd/wuffs-c/internal => internal}/cgen/base/all-impl.c | 0 {cmd/wuffs-c/internal => internal}/cgen/base/core-private.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/core-public.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/image-impl.c | 0 {cmd/wuffs-c/internal => internal}/cgen/base/image-private.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/image-public.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/io-private.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/io-public.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/memory-private.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/memory-public.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/range-private.h | 0 {cmd/wuffs-c/internal => internal}/cgen/base/range-public.h | 0 {cmd/wuffs-c/internal => internal}/cgen/builtin.go | 0 {cmd/wuffs-c/internal => internal}/cgen/cgen.go | 0 {cmd/wuffs-c/internal => internal}/cgen/data.go | 0 {cmd/wuffs-c/internal => internal}/cgen/expr.go | 0 {cmd/wuffs-c/internal => internal}/cgen/func.go | 0 {cmd/wuffs-c/internal => internal}/cgen/gen.go | 0 {cmd/wuffs-c/internal => internal}/cgen/resume.go | 0 {cmd/wuffs-c/internal => internal}/cgen/statement.go | 0 {cmd/wuffs-c/internal => internal}/cgen/var.go | 0 23 files changed, 3 insertions(+), 1 deletion(-) rename {cmd/wuffs-c/internal => internal}/cgen/base/all-impl.c (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/core-private.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/core-public.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/image-impl.c (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/image-private.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/image-public.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/io-private.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/io-public.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/memory-private.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/memory-public.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/range-private.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/base/range-public.h (100%) rename {cmd/wuffs-c/internal => internal}/cgen/builtin.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/cgen.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/data.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/expr.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/func.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/gen.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/resume.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/statement.go (100%) rename {cmd/wuffs-c/internal => internal}/cgen/var.go (100%) diff --git a/README.md b/README.md index dbbc98bf..5dd3443c 100644 --- a/README.md +++ b/README.md @@ -285,6 +285,8 @@ background. mentioned above, Wuffs transpiles to C code, and Go is not necessarily involved if all you want is to use the C edition of Wuffs. - `lib` holds other Go libraries, not specific to the Wuffs language per se. +- `internal` holds internal implementation details, as per Go's [internal + packages](https://golang.org/s/go14internal) convention. - `cmd` holds Wuffs' command line tools, also written in Go. - `std` holds the Wuffs standard library's code. The initial focus is on popular image codecs: BMP, GIF, JPEG, PNG, TIFF and WEBP. diff --git a/cmd/wuffs-c/main.go b/cmd/wuffs-c/main.go index 14946741..0fd731a4 100644 --- a/cmd/wuffs-c/main.go +++ b/cmd/wuffs-c/main.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/google/wuffs/cmd/wuffs-c/internal/cgen" + "github.com/google/wuffs/internal/cgen" ) func main() { diff --git a/cmd/wuffs-c/internal/cgen/base/all-impl.c b/internal/cgen/base/all-impl.c similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/all-impl.c rename to internal/cgen/base/all-impl.c diff --git a/cmd/wuffs-c/internal/cgen/base/core-private.h b/internal/cgen/base/core-private.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/core-private.h rename to internal/cgen/base/core-private.h diff --git a/cmd/wuffs-c/internal/cgen/base/core-public.h b/internal/cgen/base/core-public.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/core-public.h rename to internal/cgen/base/core-public.h diff --git a/cmd/wuffs-c/internal/cgen/base/image-impl.c b/internal/cgen/base/image-impl.c similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/image-impl.c rename to internal/cgen/base/image-impl.c diff --git a/cmd/wuffs-c/internal/cgen/base/image-private.h b/internal/cgen/base/image-private.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/image-private.h rename to internal/cgen/base/image-private.h diff --git a/cmd/wuffs-c/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/image-public.h rename to internal/cgen/base/image-public.h diff --git a/cmd/wuffs-c/internal/cgen/base/io-private.h b/internal/cgen/base/io-private.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/io-private.h rename to internal/cgen/base/io-private.h diff --git a/cmd/wuffs-c/internal/cgen/base/io-public.h b/internal/cgen/base/io-public.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/io-public.h rename to internal/cgen/base/io-public.h diff --git a/cmd/wuffs-c/internal/cgen/base/memory-private.h b/internal/cgen/base/memory-private.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/memory-private.h rename to internal/cgen/base/memory-private.h diff --git a/cmd/wuffs-c/internal/cgen/base/memory-public.h b/internal/cgen/base/memory-public.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/memory-public.h rename to internal/cgen/base/memory-public.h diff --git a/cmd/wuffs-c/internal/cgen/base/range-private.h b/internal/cgen/base/range-private.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/range-private.h rename to internal/cgen/base/range-private.h diff --git a/cmd/wuffs-c/internal/cgen/base/range-public.h b/internal/cgen/base/range-public.h similarity index 100% rename from cmd/wuffs-c/internal/cgen/base/range-public.h rename to internal/cgen/base/range-public.h diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/internal/cgen/builtin.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/builtin.go rename to internal/cgen/builtin.go diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/internal/cgen/cgen.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/cgen.go rename to internal/cgen/cgen.go diff --git a/cmd/wuffs-c/internal/cgen/data.go b/internal/cgen/data.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/data.go rename to internal/cgen/data.go diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/internal/cgen/expr.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/expr.go rename to internal/cgen/expr.go diff --git a/cmd/wuffs-c/internal/cgen/func.go b/internal/cgen/func.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/func.go rename to internal/cgen/func.go diff --git a/cmd/wuffs-c/internal/cgen/gen.go b/internal/cgen/gen.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/gen.go rename to internal/cgen/gen.go diff --git a/cmd/wuffs-c/internal/cgen/resume.go b/internal/cgen/resume.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/resume.go rename to internal/cgen/resume.go diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/internal/cgen/statement.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/statement.go rename to internal/cgen/statement.go diff --git a/cmd/wuffs-c/internal/cgen/var.go b/internal/cgen/var.go similarity index 100% rename from cmd/wuffs-c/internal/cgen/var.go rename to internal/cgen/var.go