diff --git a/.github/workflows/test_llgo.sh b/.github/workflows/test_llgo.sh index e1838fa5..0ecff3a1 100644 --- a/.github/workflows/test_llgo.sh +++ b/.github/workflows/test_llgo.sh @@ -4,7 +4,7 @@ set -e export LLGOROOT=$PWD testcmd=/tmp/test -llgo build -o $testcmd ./_test +llgo build -o $testcmd ./c/bdwgc/_test cases=$($testcmd) total=$(echo "$cases" | wc -l | tr -d ' ') failed=0 diff --git a/_test/bdwgc.go b/c/bdwgc/_test/bdwgc.go similarity index 97% rename from _test/bdwgc.go rename to c/bdwgc/_test/bdwgc.go index 17d2759f..f4d900d4 100644 --- a/_test/bdwgc.go +++ b/c/bdwgc/_test/bdwgc.go @@ -3,9 +3,9 @@ package main import ( "unsafe" - "github.com/goplus/llgo/_test/testing" "github.com/goplus/llgo/c" "github.com/goplus/llgo/c/bdwgc" + "github.com/goplus/llgo/c/bdwgc/_test/testing" ) // ------ Test malloc ------ diff --git a/_test/main.go b/c/bdwgc/_test/main.go similarity index 92% rename from _test/main.go rename to c/bdwgc/_test/main.go index 59869456..1be2b40e 100644 --- a/_test/main.go +++ b/c/bdwgc/_test/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/goplus/llgo/_test/testing" "github.com/goplus/llgo/c" + "github.com/goplus/llgo/c/bdwgc/_test/testing" ) type TestCase struct { diff --git a/_test/testing/testing.go b/c/bdwgc/_test/testing/testing.go similarity index 100% rename from _test/testing/testing.go rename to c/bdwgc/_test/testing/testing.go diff --git a/internal/ar/ar.go b/chore/_deprecated/ar/ar.go similarity index 100% rename from internal/ar/ar.go rename to chore/_deprecated/ar/ar.go diff --git a/xtool/clang/parser/pages.go b/chore/_deprecated/clang/parser/pages.go similarity index 100% rename from xtool/clang/parser/pages.go rename to chore/_deprecated/clang/parser/pages.go diff --git a/xtool/clang/parser/parse.go b/chore/_deprecated/clang/parser/parse.go similarity index 100% rename from xtool/clang/parser/parse.go rename to chore/_deprecated/clang/parser/parse.go diff --git a/chore/clangast/clangast.go b/chore/_deprecated/clangast/clangast.go similarity index 96% rename from chore/clangast/clangast.go rename to chore/_deprecated/clangast/clangast.go index 4dce02a8..d8af6a80 100644 --- a/chore/clangast/clangast.go +++ b/chore/_deprecated/clangast/clangast.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/goplus/llgo/xtool/clang/parser" + "github.com/goplus/llgo/_xtool/clang/parser" ) var ( diff --git a/chore/_deprecated/go.mod b/chore/_deprecated/go.mod new file mode 100644 index 00000000..e336e40b --- /dev/null +++ b/chore/_deprecated/go.mod @@ -0,0 +1,14 @@ +module github.com/goplus/llgo/_xtool + +go 1.20 + +require ( + github.com/aykevl/go-wasm v0.0.1 + github.com/goplus/llgo v0.9.0 + github.com/json-iterator/go v1.1.12 +) + +require ( + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect +) diff --git a/chore/_deprecated/go.sum b/chore/_deprecated/go.sum new file mode 100644 index 00000000..f95eb514 --- /dev/null +++ b/chore/_deprecated/go.sum @@ -0,0 +1,19 @@ +github.com/aykevl/go-wasm v0.0.1 h1:lPxy8l48P39W7I0tLrtCrLfZBOUq9IWZ7odGdyJP2AM= +github.com/aykevl/go-wasm v0.0.1/go.mod h1:b4nggwg3lEkNKOU4wzhtLKz2q2sLxSHFnc98aGt6z/Y= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/goplus/llgo v0.9.0 h1:yaJzQperGUafEaHc9VlVQVskIngacoTNweEXY0GRi0Q= +github.com/goplus/llgo v0.9.0/go.mod h1:M3UwiYdPZFyx7m2J0+6Ti1dYVA3uOO1WvSBocuE8N7M= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= diff --git a/go.mod b/go.mod index c5bd3af6..d002be02 100644 --- a/go.mod +++ b/go.mod @@ -3,18 +3,14 @@ module github.com/goplus/llgo go 1.20 require ( - github.com/aykevl/go-wasm v0.0.1 github.com/goplus/gogen v1.16.0 github.com/goplus/llvm v0.8.0 github.com/goplus/mod v0.13.12 - github.com/json-iterator/go v1.1.12 github.com/qiniu/x v1.13.10 golang.org/x/tools v0.22.0 ) require ( - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/sync v0.7.0 // indirect ) diff --git a/go.sum b/go.sum index bb720bd1..4d3a6189 100644 --- a/go.sum +++ b/go.sum @@ -1,28 +1,11 @@ -github.com/aykevl/go-wasm v0.0.1 h1:lPxy8l48P39W7I0tLrtCrLfZBOUq9IWZ7odGdyJP2AM= -github.com/aykevl/go-wasm v0.0.1/go.mod h1:b4nggwg3lEkNKOU4wzhtLKz2q2sLxSHFnc98aGt6z/Y= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/goplus/gogen v1.16.0 h1:hAK2ZX8vCjH+Y2QoJl9viSZ8Gw9pzE0vCz5voYBYnv4= github.com/goplus/gogen v1.16.0/go.mod h1:92qEzVgv7y8JEFICWG9GvYI5IzfEkxYdsA1DbmnTkqk= github.com/goplus/llvm v0.8.0 h1:9eFutGm3d0G7bAd8/e+Tuyva0tu1IPNPm0kVG4AgHwY= github.com/goplus/llvm v0.8.0/go.mod h1:PeVK8GgzxwAYCiMiUAJb5wJR6xbhj989tu9oulKLLT4= github.com/goplus/mod v0.13.12 h1:Trwk6j3i9VvBuW6/9ZxmkoFlEL2v3HKQu0Na1c6DAdw= github.com/goplus/mod v0.13.12/go.mod h1:fyCcoiL02uUQK9CWxGK9pQzuJT+rZIvRKaaG+hSa2bk= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/qiniu/x v1.13.10 h1:J4Z3XugYzAq85SlyAfqlKVrbf05glMbAOh+QncsDQpE= github.com/qiniu/x v1.13.10/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=