From cd266213ce71d37b543cf05dff7f24c54dc8b5c6 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Sat, 11 May 2024 05:27:38 +0800 Subject: [PATCH] mv x/ => xtool/ --- chore/ardump/ardump.go | 2 +- chore/clangast/clangast.go | 2 +- chore/clangpp/clangpp.go | 2 +- chore/nmdump/nmdump.go | 2 +- chore/nmindex/nmindex.go | 4 ++-- internal/ar/ar.go | 2 +- internal/build/build.go | 2 +- {x => xtool}/ar/common.go | 0 {x => xtool}/ar/reader.go | 0 {x => xtool}/ar/writer.go | 0 {x => xtool}/clang/ast/ast.go | 0 {x => xtool}/clang/clang.go | 0 {x => xtool}/clang/parser/pages.go | 0 {x => xtool}/clang/parser/parse.go | 2 +- {x => xtool}/clang/pathutil/pathutil.go | 0 {x => xtool}/clang/preprocessor/preprocessor.go | 2 +- {x => xtool}/clang/types/parser/_parser_test.go | 0 {x => xtool}/clang/types/parser/parser.go | 4 ++-- {x => xtool}/clang/types/scanner/scanner.go | 0 {x => xtool}/clang/types/types.go | 0 {x => xtool}/env/llvm/llvm.go | 2 +- {x => xtool}/llvm/llvmlink/link.go | 0 {x => xtool}/nm/index.go | 0 {x => xtool}/nm/nm.go | 0 {x => xtool}/nm/query.go | 0 25 files changed, 13 insertions(+), 13 deletions(-) rename {x => xtool}/ar/common.go (100%) rename {x => xtool}/ar/reader.go (100%) rename {x => xtool}/ar/writer.go (100%) rename {x => xtool}/clang/ast/ast.go (100%) rename {x => xtool}/clang/clang.go (100%) rename {x => xtool}/clang/parser/pages.go (100%) rename {x => xtool}/clang/parser/parse.go (98%) rename {x => xtool}/clang/pathutil/pathutil.go (100%) rename {x => xtool}/clang/preprocessor/preprocessor.go (98%) rename {x => xtool}/clang/types/parser/_parser_test.go (100%) rename {x => xtool}/clang/types/parser/parser.go (99%) rename {x => xtool}/clang/types/scanner/scanner.go (100%) rename {x => xtool}/clang/types/types.go (100%) rename {x => xtool}/env/llvm/llvm.go (96%) rename {x => xtool}/llvm/llvmlink/link.go (100%) rename {x => xtool}/nm/index.go (100%) rename {x => xtool}/nm/nm.go (100%) rename {x => xtool}/nm/query.go (100%) diff --git a/chore/ardump/ardump.go b/chore/ardump/ardump.go index 41b9f9a9..1e7a23db 100644 --- a/chore/ardump/ardump.go +++ b/chore/ardump/ardump.go @@ -22,7 +22,7 @@ import ( "log" "os" - "github.com/goplus/llgo/x/ar" + "github.com/goplus/llgo/xtool/ar" ) func main() { diff --git a/chore/clangast/clangast.go b/chore/clangast/clangast.go index 7d26a186..4dce02a8 100644 --- a/chore/clangast/clangast.go +++ b/chore/clangast/clangast.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/goplus/llgo/x/clang/parser" + "github.com/goplus/llgo/xtool/clang/parser" ) var ( diff --git a/chore/clangpp/clangpp.go b/chore/clangpp/clangpp.go index 2213e143..a40cb6b9 100644 --- a/chore/clangpp/clangpp.go +++ b/chore/clangpp/clangpp.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/goplus/llgo/x/clang/preprocessor" + "github.com/goplus/llgo/xtool/clang/preprocessor" ) func usage() { diff --git a/chore/nmdump/nmdump.go b/chore/nmdump/nmdump.go index d14a6b5e..f9b46d58 100644 --- a/chore/nmdump/nmdump.go +++ b/chore/nmdump/nmdump.go @@ -21,7 +21,7 @@ import ( "log" "os" - "github.com/goplus/llgo/x/env/llvm" + "github.com/goplus/llgo/xtool/env/llvm" ) func main() { diff --git a/chore/nmindex/nmindex.go b/chore/nmindex/nmindex.go index 29e7304d..acd16c0e 100644 --- a/chore/nmindex/nmindex.go +++ b/chore/nmindex/nmindex.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/goplus/llgo/x/env/llvm" - "github.com/goplus/llgo/x/nm" + "github.com/goplus/llgo/xtool/env/llvm" + "github.com/goplus/llgo/xtool/nm" ) func main() { diff --git a/internal/ar/ar.go b/internal/ar/ar.go index 255a7fab..5ff6e1f4 100644 --- a/internal/ar/ar.go +++ b/internal/ar/ar.go @@ -29,7 +29,7 @@ import ( "time" wasm "github.com/aykevl/go-wasm" - "github.com/goplus/llgo/x/ar" + "github.com/goplus/llgo/xtool/ar" ) // Create creates an arcive for static linking from a list of object files diff --git a/internal/build/build.go b/internal/build/build.go index 034e58c4..2f80c9f8 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -33,7 +33,7 @@ import ( "golang.org/x/tools/go/ssa" "github.com/goplus/llgo/cl" - "github.com/goplus/llgo/x/clang" + "github.com/goplus/llgo/xtool/clang" llssa "github.com/goplus/llgo/ssa" ) diff --git a/x/ar/common.go b/xtool/ar/common.go similarity index 100% rename from x/ar/common.go rename to xtool/ar/common.go diff --git a/x/ar/reader.go b/xtool/ar/reader.go similarity index 100% rename from x/ar/reader.go rename to xtool/ar/reader.go diff --git a/x/ar/writer.go b/xtool/ar/writer.go similarity index 100% rename from x/ar/writer.go rename to xtool/ar/writer.go diff --git a/x/clang/ast/ast.go b/xtool/clang/ast/ast.go similarity index 100% rename from x/clang/ast/ast.go rename to xtool/clang/ast/ast.go diff --git a/x/clang/clang.go b/xtool/clang/clang.go similarity index 100% rename from x/clang/clang.go rename to xtool/clang/clang.go diff --git a/x/clang/parser/pages.go b/xtool/clang/parser/pages.go similarity index 100% rename from x/clang/parser/pages.go rename to xtool/clang/parser/pages.go diff --git a/x/clang/parser/parse.go b/xtool/clang/parser/parse.go similarity index 98% rename from x/clang/parser/parse.go rename to xtool/clang/parser/parse.go index 1969fed2..0c7ec6e5 100644 --- a/x/clang/parser/parse.go +++ b/xtool/clang/parser/parse.go @@ -22,7 +22,7 @@ import ( "os/exec" "strings" - "github.com/goplus/llgo/x/clang/ast" + "github.com/goplus/llgo/xtool/clang/ast" jsoniter "github.com/json-iterator/go" ) diff --git a/x/clang/pathutil/pathutil.go b/xtool/clang/pathutil/pathutil.go similarity index 100% rename from x/clang/pathutil/pathutil.go rename to xtool/clang/pathutil/pathutil.go diff --git a/x/clang/preprocessor/preprocessor.go b/xtool/clang/preprocessor/preprocessor.go similarity index 98% rename from x/clang/preprocessor/preprocessor.go rename to xtool/clang/preprocessor/preprocessor.go index 748b9733..6bf72a42 100644 --- a/x/clang/preprocessor/preprocessor.go +++ b/xtool/clang/preprocessor/preprocessor.go @@ -22,7 +22,7 @@ import ( "os/exec" "path/filepath" - "github.com/goplus/llgo/x/clang/pathutil" + "github.com/goplus/llgo/xtool/clang/pathutil" ) const ( diff --git a/x/clang/types/parser/_parser_test.go b/xtool/clang/types/parser/_parser_test.go similarity index 100% rename from x/clang/types/parser/_parser_test.go rename to xtool/clang/types/parser/_parser_test.go diff --git a/x/clang/types/parser/parser.go b/xtool/clang/types/parser/parser.go similarity index 99% rename from x/clang/types/parser/parser.go rename to xtool/clang/types/parser/parser.go index 56250cac..3826ccda 100644 --- a/x/clang/types/parser/parser.go +++ b/xtool/clang/types/parser/parser.go @@ -26,9 +26,9 @@ import ( "strconv" "github.com/goplus/gogen" - "github.com/goplus/llgo/x/clang/types/scanner" + "github.com/goplus/llgo/xtool/clang/types/scanner" - ctypes "github.com/goplus/llgo/x/clang/types" + ctypes "github.com/goplus/llgo/xtool/clang/types" ) const ( diff --git a/x/clang/types/scanner/scanner.go b/xtool/clang/types/scanner/scanner.go similarity index 100% rename from x/clang/types/scanner/scanner.go rename to xtool/clang/types/scanner/scanner.go diff --git a/x/clang/types/types.go b/xtool/clang/types/types.go similarity index 100% rename from x/clang/types/types.go rename to xtool/clang/types/types.go diff --git a/x/env/llvm/llvm.go b/xtool/env/llvm/llvm.go similarity index 96% rename from x/env/llvm/llvm.go rename to xtool/env/llvm/llvm.go index 0013fb3e..cb5343ca 100644 --- a/x/env/llvm/llvm.go +++ b/xtool/env/llvm/llvm.go @@ -19,7 +19,7 @@ package llvm import ( "os" - "github.com/goplus/llgo/x/nm" + "github.com/goplus/llgo/xtool/nm" ) type Env struct { diff --git a/x/llvm/llvmlink/link.go b/xtool/llvm/llvmlink/link.go similarity index 100% rename from x/llvm/llvmlink/link.go rename to xtool/llvm/llvmlink/link.go diff --git a/x/nm/index.go b/xtool/nm/index.go similarity index 100% rename from x/nm/index.go rename to xtool/nm/index.go diff --git a/x/nm/nm.go b/xtool/nm/nm.go similarity index 100% rename from x/nm/nm.go rename to xtool/nm/nm.go diff --git a/x/nm/query.go b/xtool/nm/query.go similarity index 100% rename from x/nm/query.go rename to xtool/nm/query.go