diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index dc2922c9..8cc41c38 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,14 +25,14 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.23' + go-version: '1.24' - name: Install dependencies if: startsWith(matrix.os, 'macos') run: | brew update - brew install llvm@${{matrix.llvm}} bdw-gc openssl libffi libuv - brew link --force libffi + brew install llvm@${{matrix.llvm}} lld bdw-gc openssl libffi libuv pkg-config + brew link --overwrite lld libffi echo "$(brew --prefix llvm@${{matrix.llvm}})/bin" >> $GITHUB_PATH # llcppg dependencies @@ -50,10 +50,10 @@ jobs: - name: Install LLGO run: | git clone --branch v0.10.0 https://github.com/goplus/llgo.git + cd llgo + bash ./install.sh echo $PWD - cd llgo/compiler - go install -v ./cmd/... - export LLGO_ROOT=$GITHUB_WORKSPACE/llgo + export LLGO_ROOT=$PWD echo "LLGO_ROOT=$LLGO_ROOT" >> $GITHUB_ENV - name: Build @@ -62,11 +62,17 @@ jobs: - name: Set up Go for testing uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.24' - name: Install llcppg modules run: | echo "Using LLGO_ROOT: $LLGO_ROOT" + echo $PWD + cd $PWD + go get github.com/goplus/lib/c + go get github.com/goplus/llpkg/cjson + go get github.com/goplus/llcppg/_xtool/llcppsymg/config + go mod tidy -e bash ./install.sh - name: Test llcppsymg & llcppsigfetch diff --git a/README.md b/README.md index 2168fbdd..0855bc49 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ package main import ( "github.com/author/cjson" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { @@ -328,9 +328,9 @@ When a header file in the current project references types from third-party pack In llcppg, there is a consistent pattern for naming aliases related to the standard library. Any alias that starts with `c/` corresponds to a remote repository in the github.com/goplus/llgo. For example: -* The alias `c` → `github.com/goplus/llgo/c` -* The alias `c/os` → `github.com/goplus/llgo/c/os` -* The alias `c/time` → `github.com/goplus/llgo/c/time` +* The alias `c` → `github.com/goplus/lib/c` +* The alias `c/os` → `github.com/goplus/lib/c/os` +* The alias `c/time` → `github.com/goplus/lib/c/time` > Note: Standard library type conversion in llgo is not comprehensive. For standard library types that cannot be found in llgo, you will need to supplement these types in the corresponding package at https://github.com/goplus/llgo. @@ -367,7 +367,7 @@ You can see this in the generated code, where libxslt correctly references libxm package libxslt import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "github.com/goplus/llpkg/libxml2" "unsafe" ) diff --git a/_demo/cjsondemo/demo.go b/_demo/cjsondemo/demo.go deleted file mode 100644 index 0fdfa4fa..00000000 --- a/_demo/cjsondemo/demo.go +++ /dev/null @@ -1,17 +0,0 @@ -package main - -import ( - "github.com/goplus/llgo/c" - cjson "github.com/goplus/llpkg/cjson" -) - -func main() { - mod := cjson.CreateObject() - mod.AddItemToObject(c.Str("hello"), cjson.CreateString(c.Str("llgo"))) - mod.AddItemToObject(c.Str("hello"), cjson.CreateString(c.Str("llcppg"))) - var b cjson.Bool = 1 - mod.AddItemToObject(c.Str("woman"), b.CreateBool()) - cstr := mod.PrintUnformatted() - - c.Printf(c.Str("%s\n"), cstr) -} diff --git a/_demo/cjsondemo/go.mod b/_demo/cjsondemo/go.mod deleted file mode 100644 index d67b4be2..00000000 --- a/_demo/cjsondemo/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/goplus/llcppg/_demo/cjsondemo - -go 1.20 - -require ( - github.com/goplus/llgo v0.10.0 - github.com/goplus/llpkg/cjson v0.0.0-20241208025249-9c7f3355a1b7 -) diff --git a/_demo/cjsondemo/go.sum b/_demo/cjsondemo/go.sum deleted file mode 100644 index b05cabe9..00000000 --- a/_demo/cjsondemo/go.sum +++ /dev/null @@ -1,8 +0,0 @@ -github.com/goplus/llgo v0.9.9-0.20241217064315-b4af70ada9f0 h1:+W0c6OtIrheLj+Y5vd3oYL4NzKUzuijHJ4MZ2jhgQiQ= -github.com/goplus/llgo v0.9.9-0.20241217064315-b4af70ada9f0/go.mod h1:1phqPJEgr/uw59PRz/NB7s54OoP+NGjC6pz0HovT5JY= -github.com/goplus/llgo v0.9.9-0.20241220231339-070d64f365ef h1:uav5CZ5IGj9+xYXV4UsxyPuFgndlthvTyltitTKliew= -github.com/goplus/llgo v0.9.9-0.20241220231339-070d64f365ef/go.mod h1:1phqPJEgr/uw59PRz/NB7s54OoP+NGjC6pz0HovT5JY= -github.com/goplus/llgo v0.10.0 h1:s3U3cnO3cploF1xCCJleAb16NQFAmHxdUmdrNhRH3hY= -github.com/goplus/llgo v0.10.0/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE= -github.com/goplus/llpkg/cjson v0.0.0-20241208025249-9c7f3355a1b7 h1:lpslXHSAG/HPhC6smliGhnP2Ecnl3oJojXrQROzgsyc= -github.com/goplus/llpkg/cjson v0.0.0-20241208025249-9c7f3355a1b7/go.mod h1:13ZCMXl/GwlkercQTNN0FSjsnuZfMoGfe5DVWQqJCEM= diff --git a/_llcppgtest/cjson/demo/hello/hello.go b/_llcppgtest/cjson/demo/hello/hello.go index e9e7bbe3..34ef9dfa 100644 --- a/_llcppgtest/cjson/demo/hello/hello.go +++ b/_llcppgtest/cjson/demo/hello/hello.go @@ -4,7 +4,7 @@ import ( "cjson" "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/cjson/demo/readobj/readobj.go b/_llcppgtest/cjson/demo/readobj/readobj.go index 8ac3ad92..0505059d 100644 --- a/_llcppgtest/cjson/demo/readobj/readobj.go +++ b/_llcppgtest/cjson/demo/readobj/readobj.go @@ -4,7 +4,7 @@ import ( "cjson" "fmt" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/gettext/demo/trans/trans.go b/_llcppgtest/gettext/demo/trans/trans.go index 774bb563..453a5840 100644 --- a/_llcppgtest/gettext/demo/trans/trans.go +++ b/_llcppgtest/gettext/demo/trans/trans.go @@ -4,7 +4,7 @@ import ( "gettext" "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func handle(severity c.Int, message gettext.MessageT, filename *int8, lineno c.Ulong, column c.Ulong, multiline_p c.Int, message_text *int8) { diff --git a/_llcppgtest/gmp/demo/isPrime/demo.go b/_llcppgtest/gmp/demo/isPrime/demo.go index a0d63215..519b84b8 100644 --- a/_llcppgtest/gmp/demo/isPrime/demo.go +++ b/_llcppgtest/gmp/demo/isPrime/demo.go @@ -5,7 +5,7 @@ import ( . "gmp" "strconv" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) var primes = []int{2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997} diff --git a/_llcppgtest/gpgerror/demo/keyerror/keyerror.go b/_llcppgtest/gpgerror/demo/keyerror/keyerror.go index af7ebb99..e3248a92 100644 --- a/_llcppgtest/gpgerror/demo/keyerror/keyerror.go +++ b/_llcppgtest/gpgerror/demo/keyerror/keyerror.go @@ -3,7 +3,7 @@ package main import ( "gpgerror" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) var SOURCEMASK = gpgerror.SOURCEDIM - 1 diff --git a/_llcppgtest/isl/demo/intersect/intersect.go b/_llcppgtest/isl/demo/intersect/intersect.go index 92a618a0..a12647ac 100644 --- a/_llcppgtest/isl/demo/intersect/intersect.go +++ b/_llcppgtest/isl/demo/intersect/intersect.go @@ -3,7 +3,7 @@ package main import ( "isl" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/libxml2/demo/parsexml/parsexml.go b/_llcppgtest/libxml2/demo/parsexml/parsexml.go index 2fbc5bde..5a847acb 100644 --- a/_llcppgtest/libxml2/demo/parsexml/parsexml.go +++ b/_llcppgtest/libxml2/demo/parsexml/parsexml.go @@ -4,7 +4,7 @@ import ( "libxml2" "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/libxslt/demo/withdeplibxml/demo.go b/_llcppgtest/libxslt/demo/withdeplibxml/demo.go index 5a6dc61d..458987ed 100644 --- a/_llcppgtest/libxslt/demo/withdeplibxml/demo.go +++ b/_llcppgtest/libxslt/demo/withdeplibxml/demo.go @@ -7,7 +7,7 @@ import ( "libxslt" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "github.com/goplus/llpkg/libxml2" ) diff --git a/_llcppgtest/lua/demo/hello/hello.go b/_llcppgtest/lua/demo/hello/hello.go index 441bd16e..8a135e48 100644 --- a/_llcppgtest/lua/demo/hello/hello.go +++ b/_llcppgtest/lua/demo/hello/hello.go @@ -3,7 +3,7 @@ package main import ( "lua" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/lua/demo/loadcall/loadcall.go b/_llcppgtest/lua/demo/loadcall/loadcall.go index 0c41c784..640b6cf4 100644 --- a/_llcppgtest/lua/demo/loadcall/loadcall.go +++ b/_llcppgtest/lua/demo/loadcall/loadcall.go @@ -5,7 +5,7 @@ import ( "lua" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/lua/demo/metatable/metatable.go b/_llcppgtest/lua/demo/metatable/metatable.go index a0781673..edfdcbe0 100644 --- a/_llcppgtest/lua/demo/metatable/metatable.go +++ b/_llcppgtest/lua/demo/metatable/metatable.go @@ -3,7 +3,7 @@ package main import ( "lua" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func toString(L *lua.State) c.Int { diff --git a/_llcppgtest/raylib/demo/demo.go b/_llcppgtest/raylib/demo/demo.go index a1cc6c47..fb9da484 100644 --- a/_llcppgtest/raylib/demo/demo.go +++ b/_llcppgtest/raylib/demo/demo.go @@ -3,7 +3,7 @@ package main import ( "raylib" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/sqlite/demo/hello/hello.go b/_llcppgtest/sqlite/demo/hello/hello.go index bed69586..0efa2127 100644 --- a/_llcppgtest/sqlite/demo/hello/hello.go +++ b/_llcppgtest/sqlite/demo/hello/hello.go @@ -3,8 +3,8 @@ package main import ( "sqlite" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/os" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/os" ) func main() { diff --git a/_llcppgtest/z3/demo/demo/demo.go b/_llcppgtest/z3/demo/demo/demo.go index aebe5600..21781c70 100644 --- a/_llcppgtest/z3/demo/demo/demo.go +++ b/_llcppgtest/z3/demo/demo/demo.go @@ -3,7 +3,7 @@ package main import ( "z3" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/zlib/demo/efficiency/efficiency.go b/_llcppgtest/zlib/demo/efficiency/efficiency.go index 533b1b3e..93d35eb2 100644 --- a/_llcppgtest/zlib/demo/efficiency/efficiency.go +++ b/_llcppgtest/zlib/demo/efficiency/efficiency.go @@ -4,7 +4,7 @@ import ( "unsafe" "zlib" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_llcppgtest/zlib/demo/normal/normal.go b/_llcppgtest/zlib/demo/normal/normal.go index 946cf7f9..aa2dcead 100644 --- a/_llcppgtest/zlib/demo/normal/normal.go +++ b/_llcppgtest/zlib/demo/normal/normal.go @@ -4,7 +4,7 @@ import ( "unsafe" "zlib" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/_xtool/llcppsigfetch/llcppsigfetch.go b/_xtool/llcppsigfetch/llcppsigfetch.go index 24d4f0be..08b7144d 100644 --- a/_xtool/llcppsigfetch/llcppsigfetch.go +++ b/_xtool/llcppsigfetch/llcppsigfetch.go @@ -24,13 +24,13 @@ import ( "strings" "unsafe" + "github.com/goplus/lib/c" "github.com/goplus/llcppg/_xtool/llcppsigfetch/dbg" "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse" "github.com/goplus/llcppg/_xtool/llcppsymg/args" "github.com/goplus/llcppg/_xtool/llcppsymg/clangutils" "github.com/goplus/llcppg/_xtool/llcppsymg/config" "github.com/goplus/llcppg/llcppg" - "github.com/goplus/llgo/c" "github.com/goplus/llpkg/cjson" ) diff --git a/_xtool/llcppsigfetch/parse/cvt.go b/_xtool/llcppsigfetch/parse/cvt.go index e8acdd17..b0bee604 100644 --- a/_xtool/llcppsigfetch/parse/cvt.go +++ b/_xtool/llcppsigfetch/parse/cvt.go @@ -7,14 +7,14 @@ import ( "strings" "unsafe" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/clang" "github.com/goplus/llcppg/_xtool/llcppsigfetch/dbg" "github.com/goplus/llcppg/_xtool/llcppsymg/clangutils" "github.com/goplus/llcppg/_xtool/llcppsymg/config" "github.com/goplus/llcppg/ast" "github.com/goplus/llcppg/llcppg" "github.com/goplus/llcppg/token" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/clang" "github.com/goplus/llpkg/cjson" ) diff --git a/_xtool/llcppsigfetch/parse/cvt_test/cvt.go b/_xtool/llcppsigfetch/parse/cvt_test/cvt.go index 7b5c8b8d..3cfb0a70 100644 --- a/_xtool/llcppsigfetch/parse/cvt_test/cvt.go +++ b/_xtool/llcppsigfetch/parse/cvt_test/cvt.go @@ -6,11 +6,11 @@ import ( "sort" "unsafe" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/clang" "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse" "github.com/goplus/llcppg/_xtool/llcppsymg/clangutils" "github.com/goplus/llcppg/llcppg" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/clang" "github.com/goplus/llpkg/cjson" ) diff --git a/_xtool/llcppsigfetch/parse/cvt_test/preprocess_test/preprocess.go b/_xtool/llcppsigfetch/parse/cvt_test/preprocess_test/preprocess.go index e61beeee..4f9143f6 100644 --- a/_xtool/llcppsigfetch/parse/cvt_test/preprocess_test/preprocess.go +++ b/_xtool/llcppsigfetch/parse/cvt_test/preprocess_test/preprocess.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" + "github.com/goplus/lib/c" "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse" test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test" "github.com/goplus/llcppg/llcppg" - "github.com/goplus/llgo/c" ) func main() { diff --git a/_xtool/llcppsigfetch/parse/cvt_test/type_test/type.go b/_xtool/llcppsigfetch/parse/cvt_test/type_test/type.go index 2fe21958..33e1b306 100644 --- a/_xtool/llcppsigfetch/parse/cvt_test/type_test/type.go +++ b/_xtool/llcppsigfetch/parse/cvt_test/type_test/type.go @@ -5,11 +5,11 @@ import ( "os" "unsafe" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/clang" "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse" test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test" "github.com/goplus/llcppg/ast" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/clang" "github.com/goplus/llpkg/cjson" ) diff --git a/_xtool/llcppsigfetch/parse/dump.go b/_xtool/llcppsigfetch/parse/dump.go index 2c87c6f3..2eaa4934 100644 --- a/_xtool/llcppsigfetch/parse/dump.go +++ b/_xtool/llcppsigfetch/parse/dump.go @@ -1,9 +1,9 @@ package parse import ( + "github.com/goplus/lib/c" "github.com/goplus/llcppg/ast" "github.com/goplus/llcppg/llcppg" - "github.com/goplus/llgo/c" "github.com/goplus/llpkg/cjson" ) diff --git a/_xtool/llcppsymg/_cmptest/clangutils_test/clangutils.go b/_xtool/llcppsymg/_cmptest/clangutils_test/clangutils.go index 2b0e4cb0..82a69229 100644 --- a/_xtool/llcppsymg/_cmptest/clangutils_test/clangutils.go +++ b/_xtool/llcppsymg/_cmptest/clangutils_test/clangutils.go @@ -6,9 +6,9 @@ import ( "path" "path/filepath" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/clang" "github.com/goplus/llcppg/_xtool/llcppsymg/clangutils" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/clang" ) func main() { diff --git a/_xtool/llcppsymg/clangutils/clangutils.go b/_xtool/llcppsymg/clangutils/clangutils.go index 35e18410..6e510d16 100644 --- a/_xtool/llcppsymg/clangutils/clangutils.go +++ b/_xtool/llcppsymg/clangutils/clangutils.go @@ -8,8 +8,8 @@ import ( "strings" "unsafe" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/clang" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/clang" ) type Config struct { diff --git a/_xtool/llcppsymg/config/config.go b/_xtool/llcppsymg/config/config.go index 25d74988..54581ee4 100644 --- a/_xtool/llcppsymg/config/config.go +++ b/_xtool/llcppsymg/config/config.go @@ -7,10 +7,10 @@ import ( "strings" "unsafe" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/clang" "github.com/goplus/llcppg/_xtool/llcppsymg/clangutils" "github.com/goplus/llcppg/llcppg" - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/clang" "github.com/goplus/llpkg/cjson" ) diff --git a/_xtool/llcppsymg/parse/parse.go b/_xtool/llcppsymg/parse/parse.go index 8dac8138..50253633 100644 --- a/_xtool/llcppsymg/parse/parse.go +++ b/_xtool/llcppsymg/parse/parse.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" + "github.com/goplus/lib/c/clang" "github.com/goplus/llcppg/_xtool/llcppsymg/clangutils" "github.com/goplus/llcppg/_xtool/llcppsymg/dbg" "github.com/goplus/llcppg/_xtool/llcppsymg/names" - "github.com/goplus/llgo/c/clang" ) type SymbolInfo struct { diff --git a/_xtool/llcppsymg/symbol/symbol.go b/_xtool/llcppsymg/symbol/symbol.go index 52b8f687..de042386 100644 --- a/_xtool/llcppsymg/symbol/symbol.go +++ b/_xtool/llcppsymg/symbol/symbol.go @@ -9,13 +9,13 @@ import ( "strings" "unsafe" + "github.com/goplus/lib/c" "github.com/goplus/llcppg/_xtool/llcppsymg/config" "github.com/goplus/llcppg/_xtool/llcppsymg/config/cfgparse" "github.com/goplus/llcppg/_xtool/llcppsymg/dbg" "github.com/goplus/llcppg/_xtool/llcppsymg/parse" "github.com/goplus/llcppg/_xtool/llcppsymg/syspath" "github.com/goplus/llcppg/llcppg" - "github.com/goplus/llgo/c" "github.com/goplus/llgo/xtool/nm" "github.com/goplus/llpkg/cjson" ) diff --git a/cmd/gogensig/convert/_comment_test.go b/cmd/gogensig/convert/_comment_test.go index 43369507..00e6d829 100644 --- a/cmd/gogensig/convert/_comment_test.go +++ b/cmd/gogensig/convert/_comment_test.go @@ -31,7 +31,7 @@ int ExecuteFoo(int a,Foo b); `, ` package typeref -import "github.com/goplus/llgo/c" +import "github.com/goplus/lib/c" /** Foo comment */ @@ -69,7 +69,7 @@ int ExecuteFoo(int a,Foo b); `, ` package typeref -import "github.com/goplus/llgo/c" +import "github.com/goplus/lib/c" /* Foo comment */ @@ -104,7 +104,7 @@ int ExecuteFoo(int a,Foo b); `, ` package typeref -import "github.com/goplus/llgo/c" +import "github.com/goplus/lib/c" // Foo comment type Foo struct { diff --git a/cmd/gogensig/convert/_testdata/_depcjson/gogensig.expect b/cmd/gogensig/convert/_testdata/_depcjson/gogensig.expect index 34e04b46..926eff60 100644 --- a/cmd/gogensig/convert/_testdata/_depcjson/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/_depcjson/gogensig.expect @@ -2,7 +2,7 @@ package depcjson import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) @@ -22,7 +22,7 @@ import ( "github.com/goplus/llcppg/cmd/gogensig/convert/testdata/thirddep" "github.com/goplus/llcppg/cmd/gogensig/convert/testdata/thirddep2" "github.com/goplus/llcppg/cmd/gogensig/convert/testdata/thirddep3" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/_systopkg/gogensig.expect b/cmd/gogensig/convert/_testdata/_systopkg/gogensig.expect index eee1e7f8..3d2a09b3 100644 --- a/cmd/gogensig/convert/_testdata/_systopkg/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/_systopkg/gogensig.expect @@ -7,8 +7,8 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package systopkg import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/time" + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/time" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/avoidkeyword/gogensig.expect b/cmd/gogensig/convert/_testdata/avoidkeyword/gogensig.expect index 39b341ba..a279f45d 100644 --- a/cmd/gogensig/convert/_testdata/avoidkeyword/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/avoidkeyword/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package avoidkeyword import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/cjson/gogensig.expect b/cmd/gogensig/convert/_testdata/cjson/gogensig.expect index 6415ae2b..b90846b7 100644 --- a/cmd/gogensig/convert/_testdata/cjson/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/cjson/gogensig.expect @@ -2,7 +2,7 @@ package cjson import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -424,7 +424,7 @@ func Free(object unsafe.Pointer) package cjson import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/enum/gogensig.expect b/cmd/gogensig/convert/_testdata/enum/gogensig.expect index 0a68a471..e09bf9f0 100644 --- a/cmd/gogensig/convert/_testdata/enum/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/enum/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package enum import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/forwarddecl/gogensig.expect b/cmd/gogensig/convert/_testdata/forwarddecl/gogensig.expect index 68d69045..bbb013a1 100644 --- a/cmd/gogensig/convert/_testdata/forwarddecl/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/forwarddecl/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package forwarddecl import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -28,7 +28,7 @@ type IoMethods struct { package forwarddecl import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/funcrefer/gogensig.expect b/cmd/gogensig/convert/_testdata/funcrefer/gogensig.expect index cb23118b..5dcdd50e 100644 --- a/cmd/gogensig/convert/_testdata/funcrefer/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/funcrefer/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package funcrefer import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/gpgerror/gogensig.expect b/cmd/gogensig/convert/_testdata/gpgerror/gogensig.expect index 05085868..8d60d03f 100644 --- a/cmd/gogensig/convert/_testdata/gpgerror/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/gpgerror/gogensig.expect @@ -2,7 +2,7 @@ package gpgerror import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/ignoresym/gogensig.expect b/cmd/gogensig/convert/_testdata/ignoresym/gogensig.expect index d6469445..9a0418fd 100644 --- a/cmd/gogensig/convert/_testdata/ignoresym/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/ignoresym/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package ignoresym import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/impls/gogensig.expect b/cmd/gogensig/convert/_testdata/impls/gogensig.expect index 499bc7df..c09960b9 100644 --- a/cmd/gogensig/convert/_testdata/impls/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/impls/gogensig.expect @@ -2,7 +2,7 @@ package impls import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/keepcomment/gogensig.expect b/cmd/gogensig/convert/_testdata/keepcomment/gogensig.expect index 5537f964..99295827 100644 --- a/cmd/gogensig/convert/_testdata/keepcomment/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/keepcomment/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package keepcomment import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/lua/gogensig.expect b/cmd/gogensig/convert/_testdata/lua/gogensig.expect index d89b50a9..31457e8d 100644 --- a/cmd/gogensig/convert/_testdata/lua/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/lua/gogensig.expect @@ -2,7 +2,7 @@ package lua import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -170,7 +170,7 @@ type Stream struct { package lua import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -644,7 +644,7 @@ const IDSIZE = 60 package lua import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/mix/gogensig.expect b/cmd/gogensig/convert/_testdata/mix/gogensig.expect index aca20656..7f573e5a 100644 --- a/cmd/gogensig/convert/_testdata/mix/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/mix/gogensig.expect @@ -2,7 +2,7 @@ package mix import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) @@ -19,7 +19,7 @@ type MixType X_mixType package mix import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/nested/gogensig.expect b/cmd/gogensig/convert/_testdata/nested/gogensig.expect index 040f7603..d1b78b37 100644 --- a/cmd/gogensig/convert/_testdata/nested/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/nested/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package nested import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/pubfile/gogensig.expect b/cmd/gogensig/convert/_testdata/pubfile/gogensig.expect index b137d77d..bfc7d02e 100644 --- a/cmd/gogensig/convert/_testdata/pubfile/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/pubfile/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package pubfile import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/pubprivate/gogensig.expect b/cmd/gogensig/convert/_testdata/pubprivate/gogensig.expect index 1b0a79f0..f5aca29e 100644 --- a/cmd/gogensig/convert/_testdata/pubprivate/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/pubprivate/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package pubprivate import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/receiver/gogensig.expect b/cmd/gogensig/convert/_testdata/receiver/gogensig.expect index c2f17078..e0aec06b 100644 --- a/cmd/gogensig/convert/_testdata/receiver/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/receiver/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package receiver import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/selfref/gogensig.expect b/cmd/gogensig/convert/_testdata/selfref/gogensig.expect index b89715ff..29817036 100644 --- a/cmd/gogensig/convert/_testdata/selfref/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/selfref/gogensig.expect @@ -7,7 +7,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package selfref import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/sqlite/gogensig.expect b/cmd/gogensig/convert/_testdata/sqlite/gogensig.expect index 61f13af0..f9c8c009 100644 --- a/cmd/gogensig/convert/_testdata/sqlite/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/sqlite/gogensig.expect @@ -2,7 +2,7 @@ package sqlite import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -714,7 +714,7 @@ type Fts5Api struct { package sqlite import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/union/gogensig.expect b/cmd/gogensig/convert/_testdata/union/gogensig.expect index 71d1a108..58fd2d8b 100644 --- a/cmd/gogensig/convert/_testdata/union/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/union/gogensig.expect @@ -2,7 +2,7 @@ package union import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/_testdata/xml2/gogensig.expect b/cmd/gogensig/convert/_testdata/xml2/gogensig.expect index b94cc93e..8f9d1f5f 100644 --- a/cmd/gogensig/convert/_testdata/xml2/gogensig.expect +++ b/cmd/gogensig/convert/_testdata/xml2/gogensig.expect @@ -2,7 +2,7 @@ package xml2 import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -172,7 +172,7 @@ const LLGoPackage string = "link: $(pkg-config --libs xxx);" package xml2 import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) @@ -186,7 +186,7 @@ func CheckVersion(version c.Int) package xml2 import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) diff --git a/cmd/gogensig/convert/builtin.go b/cmd/gogensig/convert/builtin.go index beeb42d7..bc4983e8 100644 --- a/cmd/gogensig/convert/builtin.go +++ b/cmd/gogensig/convert/builtin.go @@ -26,7 +26,7 @@ func NewBuiltinTypeMapWithPkgRefS(pkgs ...gogen.PkgRef) *BuiltinTypeMap { func NewBuiltinTypeMap(pkgPath, name string, conf *gogen.Config) *BuiltinTypeMap { p := gogen.NewPackage(pkgPath, name, conf) - clib := p.Import("github.com/goplus/llgo/c") + clib := p.Import("github.com/goplus/lib/c") builtinTypeMap := NewBuiltinTypeMapWithPkgRefS(clib, p.Unsafe()) return builtinTypeMap } diff --git a/cmd/gogensig/convert/builtin_test.go b/cmd/gogensig/convert/builtin_test.go index 5c22a738..8db24984 100644 --- a/cmd/gogensig/convert/builtin_test.go +++ b/cmd/gogensig/convert/builtin_test.go @@ -25,12 +25,12 @@ func TestBuiltinType(t *testing.T) { {"Char32", &ast.BuiltinType{Kind: ast.Char32}, "int32", false}, {"Short", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Short}, "int16", false}, {"UShort", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Short | ast.Unsigned}, "uint16", false}, - {"Int", &ast.BuiltinType{Kind: ast.Int}, "github.com/goplus/llgo/c.Int", false}, - {"UInt", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Unsigned}, "github.com/goplus/llgo/c.Uint", false}, - {"Long", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long}, "github.com/goplus/llgo/c.Long", false}, - {"ULong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long | ast.Unsigned}, "github.com/goplus/llgo/c.Ulong", false}, - {"LongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong}, "github.com/goplus/llgo/c.LongLong", false}, - {"ULongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong | ast.Unsigned}, "github.com/goplus/llgo/c.UlongLong", false}, + {"Int", &ast.BuiltinType{Kind: ast.Int}, "github.com/goplus/lib/c.Int", false}, + {"UInt", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Unsigned}, "github.com/goplus/lib/c.Uint", false}, + {"Long", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long}, "github.com/goplus/lib/c.Long", false}, + {"ULong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long | ast.Unsigned}, "github.com/goplus/lib/c.Ulong", false}, + {"LongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong}, "github.com/goplus/lib/c.LongLong", false}, + {"ULongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong | ast.Unsigned}, "github.com/goplus/lib/c.UlongLong", false}, {"Float", &ast.BuiltinType{Kind: ast.Float}, "float32", false}, {"Double", &ast.BuiltinType{Kind: ast.Float, Flags: ast.Double}, "float64", false}, {"ComplexFloat", &ast.BuiltinType{Kind: ast.Complex}, "complex64", false}, diff --git a/cmd/gogensig/convert/deps.go b/cmd/gogensig/convert/deps.go index 79eb0959..826803f7 100644 --- a/cmd/gogensig/convert/deps.go +++ b/cmd/gogensig/convert/deps.go @@ -42,7 +42,7 @@ type PkgInfo struct { } type PkgBase struct { - PkgPath string // package path, e.g. github.com/goplus/llgo/cjson + PkgPath string // package path, e.g. github.com/goplus/lib/cjson CppgConf *llcppg.Config // llcppg.cfg Pubs map[string]string // llcppg.pub } diff --git a/cmd/gogensig/convert/package.go b/cmd/gogensig/convert/package.go index 13babc14..e9d4aad7 100644 --- a/cmd/gogensig/convert/package.go +++ b/cmd/gogensig/convert/package.go @@ -75,7 +75,7 @@ func NewPackage(config *PackageConfig) *Package { // default have load llgo/c hasC := false for _, dep := range config.CppgConf.Deps { - if dep == "c" || dep == "github.com/goplus/llgo/c" { + if dep == "c" || dep == "github.com/goplus/lib/c" { hasC = true break } diff --git a/cmd/gogensig/convert/package_test.go b/cmd/gogensig/convert/package_test.go index a2a241cf..f5148898 100644 --- a/cmd/gogensig/convert/package_test.go +++ b/cmd/gogensig/convert/package_test.go @@ -87,7 +87,7 @@ func TestUnionDecl(t *testing.T) { }, expected: `package testpkg import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) type U struct { @@ -192,12 +192,12 @@ func TestToType(t *testing.T) { {"Char32", &ast.BuiltinType{Kind: ast.Char32}, "int32"}, {"Short", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Short}, "int16"}, {"UShort", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Short | ast.Unsigned}, "uint16"}, - {"Int", &ast.BuiltinType{Kind: ast.Int}, "github.com/goplus/llgo/c.Int"}, - {"UInt", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Unsigned}, "github.com/goplus/llgo/c.Uint"}, - {"Long", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long}, "github.com/goplus/llgo/c.Long"}, - {"ULong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long | ast.Unsigned}, "github.com/goplus/llgo/c.Ulong"}, - {"LongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong}, "github.com/goplus/llgo/c.LongLong"}, - {"ULongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong | ast.Unsigned}, "github.com/goplus/llgo/c.UlongLong"}, + {"Int", &ast.BuiltinType{Kind: ast.Int}, "github.com/goplus/lib/c.Int"}, + {"UInt", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Unsigned}, "github.com/goplus/lib/c.Uint"}, + {"Long", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long}, "github.com/goplus/lib/c.Long"}, + {"ULong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.Long | ast.Unsigned}, "github.com/goplus/lib/c.Ulong"}, + {"LongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong}, "github.com/goplus/lib/c.LongLong"}, + {"ULongLong", &ast.BuiltinType{Kind: ast.Int, Flags: ast.LongLong | ast.Unsigned}, "github.com/goplus/lib/c.UlongLong"}, {"Float", &ast.BuiltinType{Kind: ast.Float}, "float32"}, {"Double", &ast.BuiltinType{Kind: ast.Float, Flags: ast.Double}, "float64"}, {"ComplexFloat", &ast.BuiltinType{Kind: ast.Complex}, "complex64"}, @@ -521,7 +521,7 @@ func Foo(a uint16, b bool) float64`, package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -561,7 +561,7 @@ func Foo(a c.Uint, b c.Long) c.Ulong package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -610,7 +610,7 @@ func Foo(a c.Uint, b c.Long) c.Ulong package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -707,7 +707,7 @@ func Foo(a unsafe.Pointer) unsafe.Pointer package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -867,7 +867,7 @@ type Foo struct { package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -926,7 +926,7 @@ type Foo struct { package testpkg import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "unsafe" ) @@ -978,7 +978,7 @@ type Foo struct { package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -1027,7 +1027,7 @@ type Foo struct { package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -1139,7 +1139,7 @@ func TestTypedefFunc(t *testing.T) { package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) // llgo:type C @@ -1250,7 +1250,7 @@ func TestRedef(t *testing.T) { package testpkg import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) @@ -1307,7 +1307,7 @@ type DOUBLE float64`, package testpkg import ( -"github.com/goplus/llgo/c" +"github.com/goplus/lib/c" _ "unsafe" ) @@ -1409,7 +1409,7 @@ func TestEnumDecl(t *testing.T) { package testpkg import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) @@ -1436,7 +1436,7 @@ const ( package testpkg import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) @@ -1627,7 +1627,7 @@ func TestForwardDecl(t *testing.T) { package testpkg import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" _ "unsafe" ) diff --git a/cmd/gogensig/convert/testdata/basicdep/basicdep.go b/cmd/gogensig/convert/testdata/basicdep/basicdep.go index 290f568e..36662ea4 100644 --- a/cmd/gogensig/convert/testdata/basicdep/basicdep.go +++ b/cmd/gogensig/convert/testdata/basicdep/basicdep.go @@ -1,6 +1,6 @@ package basicdep -import "github.com/goplus/llgo/c" +import "github.com/goplus/lib/c" type BasicDep c.Long type Basic c.Long diff --git a/cmd/gogensig/convert/testdata/cjson/cJSON.go b/cmd/gogensig/convert/testdata/cjson/cJSON.go index 863ac8d5..8ba6462c 100644 --- a/cmd/gogensig/convert/testdata/cjson/cJSON.go +++ b/cmd/gogensig/convert/testdata/cjson/cJSON.go @@ -3,7 +3,7 @@ package cjson import ( "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) type CJSON struct { diff --git a/cmd/gogensig/convert/testdata/cjsonbool/cJSON.go b/cmd/gogensig/convert/testdata/cjsonbool/cJSON.go index f9598a6a..55a9553c 100644 --- a/cmd/gogensig/convert/testdata/cjsonbool/cJSON.go +++ b/cmd/gogensig/convert/testdata/cjsonbool/cJSON.go @@ -1,7 +1,7 @@ package cjson import ( - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) type CJSONBool c.Int diff --git a/cmd/gogensig/convert/testdata/thirddep/type.go b/cmd/gogensig/convert/testdata/thirddep/type.go index 8eb6e6da..8a80d247 100644 --- a/cmd/gogensig/convert/testdata/thirddep/type.go +++ b/cmd/gogensig/convert/testdata/thirddep/type.go @@ -3,7 +3,7 @@ package thirddep import ( _ "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) type TypeThirdDep struct { diff --git a/cmd/gogensig/convert/testdata/thirddep2/type.go b/cmd/gogensig/convert/testdata/thirddep2/type.go index e6bfa946..9b790b1a 100644 --- a/cmd/gogensig/convert/testdata/thirddep2/type.go +++ b/cmd/gogensig/convert/testdata/thirddep2/type.go @@ -3,7 +3,7 @@ package thirddep2 import ( _ "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) type TypeThirdDep2 struct { diff --git a/cmd/gogensig/convert/testdata/thirddep3/thirddep3.go b/cmd/gogensig/convert/testdata/thirddep3/thirddep3.go index f57f63eb..4a041337 100644 --- a/cmd/gogensig/convert/testdata/thirddep3/thirddep3.go +++ b/cmd/gogensig/convert/testdata/thirddep3/thirddep3.go @@ -3,7 +3,7 @@ package thirddep3 import ( _ "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) type ThirdDep3 struct { diff --git a/cmd/gogensig/convert/type.go b/cmd/gogensig/convert/type.go index ba39b7ff..46c6ff77 100644 --- a/cmd/gogensig/convert/type.go +++ b/cmd/gogensig/convert/type.go @@ -37,7 +37,7 @@ type TypeConv struct { } func NewConv(p *Package) *TypeConv { - clib := p.p.Import("github.com/goplus/llgo/c") + clib := p.p.Import("github.com/goplus/lib/c") math := p.p.Import("math") typeMap := NewBuiltinTypeMapWithPkgRefS(clib, math, p.p.Unsafe()) typeConv := &TypeConv{ diff --git a/doc/llcppg.md b/doc/llcppg.md index fb47905e..05071199 100644 --- a/doc/llcppg.md +++ b/doc/llcppg.md @@ -144,8 +144,8 @@ xmlNodePtr not found in `/path/to/libxml/dict.h`. ### Type Mapping Examples Standard Library Type Mapping -NOTE: "c" is an alias for "github.com/goplus/llgo/c" -`github.com/goplus/llgo/c/llcppg.pub` +NOTE: "c" is an alias for "github.com/goplus/lib/c" +`github.com/goplus/lib/c/llcppg.pub` ``` size_t SizeT intptr_t IntptrT diff --git a/go.mod b/go.mod index e8651d53..72e2f3c9 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,18 @@ module github.com/goplus/llcppg -go 1.20 +go 1.22.0 + +toolchain go1.22.10 require ( github.com/google/go-cmp v0.6.0 - github.com/goplus/gogen v1.16.4 + github.com/goplus/gogen v1.16.9 github.com/goplus/llgo v0.10.0 - github.com/goplus/llpkg/cjson v1.0.0 - github.com/goplus/mod v0.13.12 + github.com/goplus/mod v0.13.17 ) require ( - github.com/qiniu/x v1.13.10 // indirect - golang.org/x/mod v0.19.0 // indirect - golang.org/x/tools v0.19.0 // indirect + github.com/qiniu/x v1.13.12 // indirect + golang.org/x/mod v0.23.0 // indirect + golang.org/x/tools v0.30.0 // indirect ) diff --git a/go.sum b/go.sum index 7482ec2c..a985b08f 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,16 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/goplus/gogen v1.16.4 h1:RyU4KhJ8qmdJQwuHKpCYPh3hTFN4wSaPRwXa9syY4R8= -github.com/goplus/gogen v1.16.4/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8= +github.com/goplus/gogen v1.16.9 h1:BRNAsRzdyMcLBOLUe6+suVMmOe+D2HLfF7mAkS4/QW4= +github.com/goplus/gogen v1.16.9/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8= github.com/goplus/llgo v0.10.0 h1:s3U3cnO3cploF1xCCJleAb16NQFAmHxdUmdrNhRH3hY= github.com/goplus/llgo v0.10.0/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE= -github.com/goplus/llpkg/cjson v1.0.0 h1:yPKe1E976qfimxh0m+IWEZwEtJn91zMMKBYZFQwfZy0= -github.com/goplus/llpkg/cjson v1.0.0/go.mod h1:NxW/zhLMO1phlim2DxyoV3VJ5Nb+nAlUAx4WrdCPUgs= -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/qiniu/x v1.13.10 h1:J4Z3XugYzAq85SlyAfqlKVrbf05glMbAOh+QncsDQpE= -github.com/qiniu/x v1.13.10/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E= -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.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +github.com/goplus/mod v0.13.17 h1:aWp14xosENrh7t0/0qcIejDmQEiTgI3ou2+KoLDlSlE= +github.com/goplus/mod v0.13.17/go.mod h1:XlHf8mnQ4QkRDX14Of2tpywuHDd+JVpPStvh3egog+0= +github.com/qiniu/x v1.13.12 h1:UyAwja6dgKUOYWZMzzc02wLodwnZ7wmK/0XzRd0e78g= +github.com/qiniu/x v1.13.12/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E= +golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= +golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= diff --git a/install.sh b/install.sh index e7264288..550d1924 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,5 @@ #!/bin/bash set -e - # for test go install ./cmd/llcppcfg go install ./cmd/llcppgtest diff --git a/llcppg.go b/llcppg.go index 4a895f0e..1ee6b3f2 100644 --- a/llcppg.go +++ b/llcppg.go @@ -28,9 +28,6 @@ import ( "github.com/goplus/llcppg/cmd/gogensig/config" "github.com/goplus/llcppg/llcppg" "github.com/goplus/llgo/xtool/env" - - // import cjson to make it linked in go.mod - _ "github.com/goplus/llpkg/cjson" ) type modeFlags int