From 0cea46531ba418b18e0899e1188214876e366cb9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 30 Nov 2017 16:23:16 +1100 Subject: [PATCH] Rename PUFFS to WUFFS, part 2 of N --- README.md | 18 +++++++++--------- cmd/puffs-c/genlib.go | 2 +- cmd/puffs-c/internal/cgen/cgen.go | 12 ++++++------ cmd/puffs-c/internal/cgen/expr.go | 6 +++--- cmd/puffs-c/internal/cgen/func.go | 4 ++-- cmd/puffs-c/internal/cgen/statement.go | 4 ++-- cmd/puffs-c/internal/cgen/var.go | 4 ++-- cmd/puffs-c/main.go | 2 +- cmd/puffs-c/test.go | 2 +- cmd/puffs/test.go | 2 +- cmd/puffsfmt/main.go | 6 +++--- doc/benchmarks.md | 4 ++-- lang/ast/ast.go | 2 +- lang/ast/eq.go | 2 +- lang/ast/sort.go | 2 +- lang/ast/string.go | 2 +- lang/ast/string_test.go | 4 ++-- lang/builtin/builtin.go | 2 +- lang/check/assert.go | 4 ++-- lang/check/bounds.go | 4 ++-- lang/check/check.go | 8 ++++---- lang/check/check_test.go | 8 ++++---- lang/check/data.go | 4 ++-- lang/check/gen.go | 4 ++-- lang/check/optimize.go | 4 ++-- lang/check/type.go | 6 +++--- lang/generate/generate.go | 8 ++++---- lang/parse/parse.go | 6 +++--- lang/render/render.go | 2 +- 29 files changed, 69 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index 54a973ce..d6cdc66e 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ index f878c5e..f10dcee 100644 ```bash $ puffs gen std/gif check: expression "(c + 1) as u8" bounds [1..256] is not within bounds [0..255] at -/home/n/go/src/github.com/google/puffs/std/gif/decode_lzw.puffs:101. Facts: +/home/n/go/src/github.com/google/wuffs/std/gif/decode_lzw.puffs:101. Facts: n_bits < 8 c < 256 this.stack[s] == (c as u8) @@ -93,12 +93,12 @@ index f878c5e..b43443d 100644 ```bash $ puffs gen std/gif -gen wrote: /home/n/go/src/github.com/google/puffs/gen/c/gif.c -gen unchanged: /home/n/go/src/github.com/google/puffs/gen/h/gif.h +gen wrote: /home/n/go/src/github.com/google/wuffs/gen/c/gif.c +gen unchanged: /home/n/go/src/github.com/google/wuffs/gen/h/gif.h $ puffs test std/gif -gen unchanged: /home/n/go/src/github.com/google/puffs/gen/c/gif.c -gen unchanged: /home/n/go/src/github.com/google/puffs/gen/h/gif.h -test: /home/n/go/src/github.com/google/puffs/test/c/gif +gen unchanged: /home/n/go/src/github.com/google/wuffs/gen/c/gif.c +gen unchanged: /home/n/go/src/github.com/google/wuffs/gen/h/gif.h +test: /home/n/go/src/github.com/google/wuffs/test/c/gif gif/basic.c clang PASS (8 tests run) gif/basic.c gcc PASS (8 tests run) gif/gif.c clang FAIL test_lzw_decode: bufs1_equal: wi: got 19311, want 19200. @@ -220,7 +220,7 @@ might also have to install C compilers like clang and gcc, as well as C libraries (and their .h files) like libjpeg and libpng, as some tests compare that Puffs produces exactly the same output as these other libraries. -Running `go get -v github.com/google/puffs/cmd/...` will download and install +Running `go get -v github.com/google/wuffs/cmd/...` will download and install the Puffs tools. Change `get` to `install` to re-install those programs without downloading, e.g. after you've modified their source code, or after a manually issued `git pull`. The Puffs tools that you'll most often use are `puffsfmt` @@ -262,8 +262,8 @@ you think it should be able to. ## Running the Tests If you've changed any of the tools (i.e. changed any `.go` code), re-run `go -install -v github.com/google/puffs/cmd/...` and `go test -github.com/google/puffs/lang/...`. +install -v github.com/google/wuffs/cmd/...` and `go test +github.com/google/wuffs/lang/...`. If you've changed any of the libraries (i.e. changed any `.puffs` code), run `puffs test` or, ideally, `puffs test -mimic` to also check that Puffs' output diff --git a/cmd/puffs-c/genlib.go b/cmd/puffs-c/genlib.go index de37688e..f14a0131 100644 --- a/cmd/puffs-c/genlib.go +++ b/cmd/puffs-c/genlib.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - cf "github.com/google/puffs/cmd/commonflags" + cf "github.com/google/wuffs/cmd/commonflags" ) func doGenlib(args []string) error { diff --git a/cmd/puffs-c/internal/cgen/cgen.go b/cmd/puffs-c/internal/cgen/cgen.go index ace7b829..dcc46795 100644 --- a/cmd/puffs-c/internal/cgen/cgen.go +++ b/cmd/puffs-c/internal/cgen/cgen.go @@ -24,13 +24,13 @@ import ( "os/exec" "strings" - "github.com/google/puffs/lang/base38" - "github.com/google/puffs/lang/builtin" - "github.com/google/puffs/lang/check" - "github.com/google/puffs/lang/generate" + "github.com/google/wuffs/lang/base38" + "github.com/google/wuffs/lang/builtin" + "github.com/google/wuffs/lang/check" + "github.com/google/wuffs/lang/generate" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) var ( diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index 9528c816..34ada3df 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -18,10 +18,10 @@ import ( "fmt" "strings" - "github.com/google/puffs/lang/builtin" + "github.com/google/wuffs/lang/builtin" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) func (g *gen) writeExpr(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error { diff --git a/cmd/puffs-c/internal/cgen/func.go b/cmd/puffs-c/internal/cgen/func.go index 213f0928..ce5dee0b 100644 --- a/cmd/puffs-c/internal/cgen/func.go +++ b/cmd/puffs-c/internal/cgen/func.go @@ -18,8 +18,8 @@ import ( "fmt" "math/big" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) type funk struct { diff --git a/cmd/puffs-c/internal/cgen/statement.go b/cmd/puffs-c/internal/cgen/statement.go index 225bcb74..91f56588 100644 --- a/cmd/puffs-c/internal/cgen/statement.go +++ b/cmd/puffs-c/internal/cgen/statement.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) // genFilenameLineComments is whether to print "// foo.puffs:123\n" comments in diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index 50549228..38a3b2da 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -18,8 +18,8 @@ import ( "errors" "fmt" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) var errNeedDerivedVar = errors.New("internal: need derived var") diff --git a/cmd/puffs-c/main.go b/cmd/puffs-c/main.go index c00b6764..444d0d0b 100644 --- a/cmd/puffs-c/main.go +++ b/cmd/puffs-c/main.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/google/puffs/cmd/puffs-c/internal/cgen" + "github.com/google/wuffs/cmd/puffs-c/internal/cgen" ) func main() { diff --git a/cmd/puffs-c/test.go b/cmd/puffs-c/test.go index ff61ad2a..1aa3124d 100644 --- a/cmd/puffs-c/test.go +++ b/cmd/puffs-c/test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strings" - cf "github.com/google/puffs/cmd/commonflags" + cf "github.com/google/wuffs/cmd/commonflags" ) func doBench(args []string) error { return doBenchTest(args, true) } diff --git a/cmd/puffs/test.go b/cmd/puffs/test.go index 4316a658..6199cd44 100644 --- a/cmd/puffs/test.go +++ b/cmd/puffs/test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - cf "github.com/google/puffs/cmd/commonflags" + cf "github.com/google/wuffs/cmd/commonflags" ) func doBench(puffsRoot string, args []string) error { return doBenchTest(puffsRoot, args, true) } diff --git a/cmd/puffsfmt/main.go b/cmd/puffsfmt/main.go index a07d69c1..e29eb5f0 100644 --- a/cmd/puffsfmt/main.go +++ b/cmd/puffsfmt/main.go @@ -33,9 +33,9 @@ import ( "runtime" "strings" - "github.com/google/puffs/lang/parse" - "github.com/google/puffs/lang/render" - "github.com/google/puffs/lang/token" + "github.com/google/wuffs/lang/parse" + "github.com/google/wuffs/lang/render" + "github.com/google/wuffs/lang/token" ) var ( diff --git a/doc/benchmarks.md b/doc/benchmarks.md index 100f1737..64f0ae05 100644 --- a/doc/benchmarks.md +++ b/doc/benchmarks.md @@ -26,7 +26,7 @@ bcheckOptimizeXxx methods." The benchmark programs aim to be runnable "out of the box" without any configuration or installation. For example, to run the `std/flate` benchmarks: - git clone https://github.com/google/puffs.git + git clone https://github.com/google/wuffs.git cd puffs/test/c/std gcc -O3 flate.c ./a.out -bench @@ -48,7 +48,7 @@ As mentioned above, individual benchmark programs can be run manually. However, the canonical way to run the benchmarks (across multiple compilers and multiple packages like GIF and PNG) is to use the `puffs` command line tool, as it will also re-generate (transpile) the C code whenever you edit the \*.puffs code. -Running `go install -v github.com/google/puffs/cmd/...` will install the Puffs +Running `go install -v github.com/google/wuffs/cmd/...` will install the Puffs tools. After that, you can say puffs bench diff --git a/lang/ast/ast.go b/lang/ast/ast.go index bec05d7b..15f4e33a 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -17,7 +17,7 @@ package ast import ( "math/big" - t "github.com/google/puffs/lang/token" + t "github.com/google/wuffs/lang/token" ) // Kind is what kind of node it is. For example, a top-level func or a numeric diff --git a/lang/ast/eq.go b/lang/ast/eq.go index e6b97745..164033d3 100644 --- a/lang/ast/eq.go +++ b/lang/ast/eq.go @@ -15,7 +15,7 @@ package ast import ( - t "github.com/google/puffs/lang/token" + t "github.com/google/wuffs/lang/token" ) // Eq returns whether n and o are equal. diff --git a/lang/ast/sort.go b/lang/ast/sort.go index f756854c..7fb849e9 100644 --- a/lang/ast/sort.go +++ b/lang/ast/sort.go @@ -15,7 +15,7 @@ package ast import ( - t "github.com/google/puffs/lang/token" + t "github.com/google/wuffs/lang/token" ) func TopologicalSortStructs(ns []*Struct) (sorted []*Struct, ok bool) { diff --git a/lang/ast/string.go b/lang/ast/string.go index ce1605f4..1897fb4d 100644 --- a/lang/ast/string.go +++ b/lang/ast/string.go @@ -15,7 +15,7 @@ package ast import ( - t "github.com/google/puffs/lang/token" + t "github.com/google/wuffs/lang/token" ) // String returns a string form of n. diff --git a/lang/ast/string_test.go b/lang/ast/string_test.go index 9e08c295..7cdb15b9 100644 --- a/lang/ast/string_test.go +++ b/lang/ast/string_test.go @@ -17,8 +17,8 @@ package ast_test import ( "testing" - "github.com/google/puffs/lang/parse" - "github.com/google/puffs/lang/token" + "github.com/google/wuffs/lang/parse" + "github.com/google/wuffs/lang/token" ) func TestString(t *testing.T) { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index ebbeef02..ad7ea084 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -16,7 +16,7 @@ package builtin import ( - t "github.com/google/puffs/lang/token" + t "github.com/google/wuffs/lang/token" ) type Status struct { diff --git a/lang/check/assert.go b/lang/check/assert.go index a2d61280..f8f361f0 100644 --- a/lang/check/assert.go +++ b/lang/check/assert.go @@ -19,8 +19,8 @@ import ( "fmt" "math/big" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) // otherHandSide returns the operator and other hand side when n is an diff --git a/lang/check/bounds.go b/lang/check/bounds.go index e4c2c361..be03c335 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -18,8 +18,8 @@ import ( "fmt" "math/big" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) var numTypeBounds = [256][2]*big.Int{ diff --git a/lang/check/check.go b/lang/check/check.go index acbf8dac..521ce5dd 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/google/puffs/lang/base38" - "github.com/google/puffs/lang/builtin" + "github.com/google/wuffs/lang/base38" + "github.com/google/wuffs/lang/builtin" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) type Error struct { diff --git a/lang/check/check_test.go b/lang/check/check_test.go index 90b1006d..6b0363b8 100644 --- a/lang/check/check_test.go +++ b/lang/check/check_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" - "github.com/google/puffs/lang/ast" - "github.com/google/puffs/lang/parse" - "github.com/google/puffs/lang/render" - "github.com/google/puffs/lang/token" + "github.com/google/wuffs/lang/ast" + "github.com/google/wuffs/lang/parse" + "github.com/google/wuffs/lang/render" + "github.com/google/wuffs/lang/token" ) func compareToPuffsfmt(tm *token.Map, tokens []token.Token, comments []string, src string) error { diff --git a/lang/check/data.go b/lang/check/data.go index 013c8027..751ab780 100644 --- a/lang/check/data.go +++ b/lang/check/data.go @@ -17,8 +17,8 @@ package check import ( - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) var reasons = [...]struct { diff --git a/lang/check/gen.go b/lang/check/gen.go index a67f44ae..8179eb83 100644 --- a/lang/check/gen.go +++ b/lang/check/gen.go @@ -326,8 +326,8 @@ const header = `// Code generated by running "go generate". DO NOT EDIT. package check import ( - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) var reasons = [...]struct { diff --git a/lang/check/optimize.go b/lang/check/optimize.go index 4b8026da..1aabd735 100644 --- a/lang/check/optimize.go +++ b/lang/check/optimize.go @@ -27,8 +27,8 @@ import ( "fmt" "math/big" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) // splitReceiverMethodArgs returns the "receiver", "method" and "args" in the diff --git a/lang/check/type.go b/lang/check/type.go index e7726446..c47dfa7d 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -18,10 +18,10 @@ import ( "fmt" "math/big" - "github.com/google/puffs/lang/builtin" + "github.com/google/wuffs/lang/builtin" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) func (q *checker) tcheckVars(block []*a.Node) error { diff --git a/lang/generate/generate.go b/lang/generate/generate.go index d159070d..6a16c4b5 100644 --- a/lang/generate/generate.go +++ b/lang/generate/generate.go @@ -21,10 +21,10 @@ import ( "os" "strings" - "github.com/google/puffs/lang/ast" - "github.com/google/puffs/lang/check" - "github.com/google/puffs/lang/parse" - "github.com/google/puffs/lang/token" + "github.com/google/wuffs/lang/ast" + "github.com/google/wuffs/lang/check" + "github.com/google/wuffs/lang/parse" + "github.com/google/wuffs/lang/token" ) type Generator func(packageName string, tm *token.Map, c *check.Checker, files []*ast.File) ([]byte, error) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index fa8b09a2..ac5a9d5b 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -19,10 +19,10 @@ package parse import ( "fmt" - "github.com/google/puffs/lang/base38" + "github.com/google/wuffs/lang/base38" - a "github.com/google/puffs/lang/ast" - t "github.com/google/puffs/lang/token" + a "github.com/google/wuffs/lang/ast" + t "github.com/google/wuffs/lang/token" ) func Parse(tm *t.Map, filename string, src []t.Token) (*a.File, error) { diff --git a/lang/render/render.go b/lang/render/render.go index bc9a3e3f..ca24c2b8 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -22,7 +22,7 @@ import ( "errors" "io" - "github.com/google/puffs/lang/token" + "github.com/google/wuffs/lang/token" ) var newLine = []byte{'\n'}