From 98b2aa98371cb6a1d359d43dec59d470fcefbc0a Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 4 Aug 2018 09:17:08 +1000 Subject: [PATCH] Move some Go packages from lang/foo to lib/foo --- README.md | 1 + cmd/wuffs-c/internal/cgen/cgen.go | 2 +- doc/changelog.md | 3 ++- lang/check/check.go | 2 +- lang/parse/parse.go | 2 +- {lang => lib}/base38/base38.go | 0 {lang => lib}/base38/base38_test.go | 0 {lang => lib}/interval/interval.go | 0 {lang => lib}/interval/interval_test.go | 0 {lang => lib}/interval/radial_test.go | 0 10 files changed, 6 insertions(+), 4 deletions(-) rename {lang => lib}/base38/base38.go (100%) rename {lang => lib}/base38/base38_test.go (100%) rename {lang => lib}/interval/interval.go (100%) rename {lang => lib}/interval/interval_test.go (100%) rename {lang => lib}/interval/radial_test.go (100%) diff --git a/README.md b/README.md index 49128669..dbbc98bf 100644 --- a/README.md +++ b/README.md @@ -284,6 +284,7 @@ background. AST, parser, renderer, etc. The Wuffs tools are written in Go, but as 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. - `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/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index d174a1de..bc51c4a4 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -30,10 +30,10 @@ import ( "sort" "strings" - "github.com/google/wuffs/lang/base38" "github.com/google/wuffs/lang/builtin" "github.com/google/wuffs/lang/check" "github.com/google/wuffs/lang/generate" + "github.com/google/wuffs/lib/base38" cf "github.com/google/wuffs/cmd/commonflags" diff --git a/doc/changelog.md b/doc/changelog.md index 979043d5..9ca1b3a4 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -36,7 +36,8 @@ - Made a packageid declaration mandatory. - Disallowed certain packageid's like `base` or `config`. - Disallowed `__double_underscore` prefixed names. -- Added a stand-alone lang/interval package. +- Moved the base38 package from `lang/base38` to `lib/base38`. +- Added a stand-alone `lib/interval` package. - Added fuzz tests. - Added `WUFFS_CONFIG__MODULES`. - Added `WUFFS_CONFIG__STATIC_FUNCTIONS`. diff --git a/lang/check/check.go b/lang/check/check.go index 760bc990..a2bb1544 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -21,9 +21,9 @@ import ( "fmt" "path" - "github.com/google/wuffs/lang/base38" "github.com/google/wuffs/lang/builtin" "github.com/google/wuffs/lang/parse" + "github.com/google/wuffs/lib/base38" a "github.com/google/wuffs/lang/ast" t "github.com/google/wuffs/lang/token" diff --git a/lang/parse/parse.go b/lang/parse/parse.go index d538a728..e4fed23d 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -19,7 +19,7 @@ package parse import ( "fmt" - "github.com/google/wuffs/lang/base38" + "github.com/google/wuffs/lib/base38" a "github.com/google/wuffs/lang/ast" t "github.com/google/wuffs/lang/token" diff --git a/lang/base38/base38.go b/lib/base38/base38.go similarity index 100% rename from lang/base38/base38.go rename to lib/base38/base38.go diff --git a/lang/base38/base38_test.go b/lib/base38/base38_test.go similarity index 100% rename from lang/base38/base38_test.go rename to lib/base38/base38_test.go diff --git a/lang/interval/interval.go b/lib/interval/interval.go similarity index 100% rename from lang/interval/interval.go rename to lib/interval/interval.go diff --git a/lang/interval/interval_test.go b/lib/interval/interval_test.go similarity index 100% rename from lang/interval/interval_test.go rename to lib/interval/interval_test.go diff --git a/lang/interval/radial_test.go b/lib/interval/radial_test.go similarity index 100% rename from lang/interval/radial_test.go rename to lib/interval/radial_test.go