From e27a3ce466e94e743a12ac30b4a5186cc4b85b5a Mon Sep 17 00:00:00 2001 From: tsingbx Date: Wed, 9 Apr 2025 14:40:59 +0800 Subject: [PATCH] change goplus/llgo/c to goplus/lib/c --- .github/workflows/verification.yml | 19 ++++++++++++------- .gitignore | 4 +++- bzip2/_demo/compress/compress.go | 2 +- bzip2/_demo/decompress/decompress.go | 2 +- bzip2/bzlib.go | 3 ++- bzip2/go.mod | 2 +- bzip2/go.sum | 4 ++-- bzip3/_demo/test/test.go | 2 +- bzip3/go.mod | 2 +- bzip3/go.sum | 4 ++-- bzip3/libbz3.go | 3 ++- cargs/_demo/test/test.go | 2 +- cargs/cargs.go | 3 ++- cjson/_demo/hello/hello.go | 2 +- cjson/cJSON.go | 3 ++- cjson/cJSON_Utils.go | 3 ++- libxml2/HTMLparser.go | 3 ++- libxml2/HTMLtree.go | 3 ++- libxml2/SAX.go | 3 ++- libxml2/SAX2.go | 3 ++- libxml2/_demo/hello/hello.go | 2 +- libxml2/c14n.go | 3 ++- libxml2/catalog.go | 3 ++- libxml2/chvalid.go | 3 ++- libxml2/debugXML.go | 3 ++- libxml2/dict.go | 3 ++- libxml2/encoding.go | 3 ++- libxml2/entities.go | 3 ++- libxml2/hash.go | 3 ++- libxml2/list.go | 3 ++- libxml2/nanoftp.go | 3 ++- libxml2/nanohttp.go | 3 ++- libxml2/parser.go | 3 ++- libxml2/parserInternals.go | 3 ++- libxml2/pattern.go | 3 ++- libxml2/relaxng.go | 3 ++- libxml2/schemasInternals.go | 3 ++- libxml2/schematron.go | 3 ++- libxml2/threads.go | 3 ++- libxml2/tree.go | 3 ++- libxml2/uri.go | 3 ++- libxml2/valid.go | 3 ++- libxml2/xinclude.go | 3 ++- libxml2/xlink.go | 3 ++- libxml2/xmlIO.go | 3 ++- libxml2/xmlautomata.go | 3 ++- libxml2/xmlerror.go | 3 ++- libxml2/xmlexports.go | 3 ++- libxml2/xmlmemory.go | 3 ++- libxml2/xmlmodule.go | 3 ++- libxml2/xmlreader.go | 3 ++- libxml2/xmlregexp.go | 3 ++- libxml2/xmlsave.go | 3 ++- libxml2/xmlschemas.go | 3 ++- libxml2/xmlschemastypes.go | 3 ++- libxml2/xmlstring.go | 3 ++- libxml2/xmlunicode.go | 3 ++- libxml2/xmlwriter.go | 3 ++- libxml2/xpath.go | 3 ++- libxml2/xpathInternals.go | 3 ++- libxslt/_demo/withdeplibxml/demo.go | 2 +- libxslt/documents.go | 5 +++-- libxslt/extensions.go | 5 +++-- libxslt/extra.go | 5 +++-- libxslt/functions.go | 5 +++-- libxslt/imports.go | 5 +++-- libxslt/keys.go | 5 +++-- libxslt/numbersInternals.go | 5 +++-- libxslt/pattern.go | 5 +++-- libxslt/security.go | 5 +++-- libxslt/templates.go | 5 +++-- libxslt/transform.go | 5 +++-- libxslt/variables.go | 5 +++-- libxslt/xsltInternals.go | 5 +++-- libxslt/xsltlocale.go | 5 +++-- libxslt/xsltutils.go | 5 +++-- sqlite3/_demo/hello/hello.go | 4 ++-- sqlite3/sqlite3.go | 3 ++- sqlite3/sqlite3ext.go | 3 ++- zlib/_demo/efficiency/efficiency.go | 2 +- zlib/_demo/normal/normal.go | 2 +- zlib/zconf.go | 3 ++- zlib/zlib.go | 5 +++-- 83 files changed, 182 insertions(+), 108 deletions(-) diff --git a/.github/workflows/verification.yml b/.github/workflows/verification.yml index d5b762cf..8d10836f 100644 --- a/.github/workflows/verification.yml +++ b/.github/workflows/verification.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - llgo: [v0.10.1] + llgo: [v0.11.0] llcppg: [v0.2.1] steps: - name: Checkout @@ -52,18 +52,23 @@ jobs: - name: Setup LLGo working-directory: .llgo run: | - echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list + echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main" | sudo tee /etc/apt/sources.list.d/llvm.list wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo apt-get update - sudo apt-get install -y python3 python3-pip llvm-18-dev libuv1-dev clang-18 libunwind-dev libclang-18-dev lld-18 cmake pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev - echo "/usr/lib/llvm-18/bin" >> $GITHUB_PATH - cd compiler - go install -v ./cmd/... - export LLGO_ROOT=$GITHUB_WORKSPACE/llgo + sudo apt-get install -y python3 python3-pip llvm-19-dev libuv1-dev clang-19 libunwind-dev libclang-19-dev lld-19 cmake pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev + echo "/usr/lib/llvm-19/bin" >> $GITHUB_PATH + bash ./install.sh + echo $PWD + export LLGO_ROOT=$PWD echo "LLGO_ROOT=$LLGO_ROOT" >> $GITHUB_ENV - name: Setup LLCppg working-directory: .llcppg run: | + echo "Using LLGO_ROOT: $LLGO_ROOT" + echo $PWD + cd $PWD + go get github.com/goplus/lib/c + go mod tidy -e llgo install ./_xtool/llcppsymg llgo install ./_xtool/llcppsigfetch go install github.com/goplus/llcppg/cmd/llcppcfg@${{matrix.llcppg}} diff --git a/.gitignore b/.gitignore index 4985a527..54a832bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -*.pc \ No newline at end of file +*.pc +*.work +.DS_Store \ No newline at end of file diff --git a/bzip2/_demo/compress/compress.go b/bzip2/_demo/compress/compress.go index 2c416d7d..6c17f3ca 100644 --- a/bzip2/_demo/compress/compress.go +++ b/bzip2/_demo/compress/compress.go @@ -4,7 +4,7 @@ import ( "fmt" "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "github.com/goplus/llpkg/bzip2" ) diff --git a/bzip2/_demo/decompress/decompress.go b/bzip2/_demo/decompress/decompress.go index 45b4992c..829e9c9c 100644 --- a/bzip2/_demo/decompress/decompress.go +++ b/bzip2/_demo/decompress/decompress.go @@ -6,7 +6,7 @@ import ( "os" "unsafe" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "github.com/goplus/llpkg/bzip2" ) diff --git a/bzip2/bzlib.go b/bzip2/bzlib.go index c4ce9cf6..8c7eb5fd 100644 --- a/bzip2/bzlib.go +++ b/bzip2/bzlib.go @@ -1,8 +1,9 @@ package bzip2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const RUN = 0 diff --git a/bzip2/go.mod b/bzip2/go.mod index bff9a7a0..faff6f92 100644 --- a/bzip2/go.mod +++ b/bzip2/go.mod @@ -2,4 +2,4 @@ module github.com/goplus/llpkg/bzip2 go 1.20 -require github.com/goplus/llgo v0.10.0 +require github.com/goplus/lib v0.2.0 diff --git a/bzip2/go.sum b/bzip2/go.sum index 3288b429..512980a5 100644 --- a/bzip2/go.sum +++ b/bzip2/go.sum @@ -1,2 +1,2 @@ -github.com/goplus/llgo v0.10.0 h1:s3U3cnO3cploF1xCCJleAb16NQFAmHxdUmdrNhRH3hY= -github.com/goplus/llgo v0.10.0/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE= +github.com/goplus/lib v0.2.0 h1:AjqkN1XK5H23wZMMlpaUYAMCDAdSBQ2NMFrLtSh7W4g= +github.com/goplus/lib v0.2.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0= diff --git a/bzip3/_demo/test/test.go b/bzip3/_demo/test/test.go index d4e6c315..2068b849 100644 --- a/bzip3/_demo/test/test.go +++ b/bzip3/_demo/test/test.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" zip "github.com/goplus/llpkg/bzip3" ) diff --git a/bzip3/go.mod b/bzip3/go.mod index bfc29bb1..93fd945d 100644 --- a/bzip3/go.mod +++ b/bzip3/go.mod @@ -2,4 +2,4 @@ module github.com/goplus/llpkg/bzip3 go 1.20 -require github.com/goplus/llgo v0.10.0 +require github.com/goplus/lib v0.2.0 diff --git a/bzip3/go.sum b/bzip3/go.sum index 3288b429..512980a5 100644 --- a/bzip3/go.sum +++ b/bzip3/go.sum @@ -1,2 +1,2 @@ -github.com/goplus/llgo v0.10.0 h1:s3U3cnO3cploF1xCCJleAb16NQFAmHxdUmdrNhRH3hY= -github.com/goplus/llgo v0.10.0/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE= +github.com/goplus/lib v0.2.0 h1:AjqkN1XK5H23wZMMlpaUYAMCDAdSBQ2NMFrLtSh7W4g= +github.com/goplus/lib v0.2.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0= diff --git a/bzip3/libbz3.go b/bzip3/libbz3.go index adfdad1f..caeced5e 100644 --- a/bzip3/libbz3.go +++ b/bzip3/libbz3.go @@ -1,8 +1,9 @@ package bzip3 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) const OK = 0 diff --git a/cargs/_demo/test/test.go b/cargs/_demo/test/test.go index cd91e005..138f1a05 100644 --- a/cargs/_demo/test/test.go +++ b/cargs/_demo/test/test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - C "github.com/goplus/llgo/c" + C "github.com/goplus/lib/c" "github.com/goplus/llpkg/cargs" ) diff --git a/cargs/cargs.go b/cargs/cargs.go index 02297ad8..cb509293 100644 --- a/cargs/cargs.go +++ b/cargs/cargs.go @@ -1,8 +1,9 @@ package cargs import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) /** diff --git a/cjson/_demo/hello/hello.go b/cjson/_demo/hello/hello.go index c3d3eef8..c8bdc11c 100644 --- a/cjson/_demo/hello/hello.go +++ b/cjson/_demo/hello/hello.go @@ -5,7 +5,7 @@ import ( "github.com/goplus/llpkg/cjson" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/cjson/cJSON.go b/cjson/cJSON.go index 6b0b1a9a..0fc11715 100644 --- a/cjson/cJSON.go +++ b/cjson/cJSON.go @@ -1,8 +1,9 @@ package cjson import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const VERSION_MAJOR = 1 diff --git a/cjson/cJSON_Utils.go b/cjson/cJSON_Utils.go index 64b5e441..3287540b 100644 --- a/cjson/cJSON_Utils.go +++ b/cjson/cJSON_Utils.go @@ -1,8 +1,9 @@ package cjson import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) /* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec. */ diff --git a/libxml2/HTMLparser.go b/libxml2/HTMLparser.go index e761b738..5da571f3 100644 --- a/libxml2/HTMLparser.go +++ b/libxml2/HTMLparser.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type HtmlParserCtxt ParserCtxt diff --git a/libxml2/HTMLtree.go b/libxml2/HTMLtree.go index 654b4838..65a1acb2 100644 --- a/libxml2/HTMLtree.go +++ b/libxml2/HTMLtree.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) // llgo:link (*Char).HtmlNewDoc C.htmlNewDoc diff --git a/libxml2/SAX.go b/libxml2/SAX.go index 742bedfc..3b3f56e4 100644 --- a/libxml2/SAX.go +++ b/libxml2/SAX.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) //go:linkname GetPublicId C.getPublicId diff --git a/libxml2/SAX2.go b/libxml2/SAX2.go index 47faa273..96795729 100644 --- a/libxml2/SAX2.go +++ b/libxml2/SAX2.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) //go:linkname SAX2GetPublicId C.xmlSAX2GetPublicId diff --git a/libxml2/_demo/hello/hello.go b/libxml2/_demo/hello/hello.go index f8bb5657..0737bb3b 100644 --- a/libxml2/_demo/hello/hello.go +++ b/libxml2/_demo/hello/hello.go @@ -5,7 +5,7 @@ import ( "github.com/goplus/llpkg/libxml2" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/libxml2/c14n.go b/libxml2/c14n.go index 8916af7f..6bae8c6d 100644 --- a/libxml2/c14n.go +++ b/libxml2/c14n.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type C14NMode c.Int diff --git a/libxml2/catalog.go b/libxml2/catalog.go index c7cb9700..73b4e71c 100644 --- a/libxml2/catalog.go +++ b/libxml2/catalog.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type CatalogPrefer c.Int diff --git a/libxml2/chvalid.go b/libxml2/chvalid.go index 930bc52c..03b6e091 100644 --- a/libxml2/chvalid.go +++ b/libxml2/chvalid.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlChSRange struct { diff --git a/libxml2/debugXML.go b/libxml2/debugXML.go index cc007f82..c3585f04 100644 --- a/libxml2/debugXML.go +++ b/libxml2/debugXML.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) /* diff --git a/libxml2/dict.go b/libxml2/dict.go index 59aa5310..b9497b66 100644 --- a/libxml2/dict.go +++ b/libxml2/dict.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type Dict X_xmlDict diff --git a/libxml2/encoding.go b/libxml2/encoding.go index b09e0ff5..e8a3fd3b 100644 --- a/libxml2/encoding.go +++ b/libxml2/encoding.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type CharEncError c.Int diff --git a/libxml2/entities.go b/libxml2/entities.go index 421da70a..fc4d61b5 100644 --- a/libxml2/entities.go +++ b/libxml2/entities.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type EntityType c.Int diff --git a/libxml2/hash.go b/libxml2/hash.go index 36d1b350..3c40efb0 100644 --- a/libxml2/hash.go +++ b/libxml2/hash.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlHashTable struct { diff --git a/libxml2/list.go b/libxml2/list.go index 61ede1ed..64771b2f 100644 --- a/libxml2/list.go +++ b/libxml2/list.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlLink struct { diff --git a/libxml2/nanoftp.go b/libxml2/nanoftp.go index 2177512d..4f744d1a 100644 --- a/libxml2/nanoftp.go +++ b/libxml2/nanoftp.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) // llgo:type C diff --git a/libxml2/nanohttp.go b/libxml2/nanohttp.go index 4d65fb06..22df6d73 100644 --- a/libxml2/nanohttp.go +++ b/libxml2/nanohttp.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) //go:linkname NanoHTTPInit C.xmlNanoHTTPInit diff --git a/libxml2/parser.go b/libxml2/parser.go index 51cf6816..ddbd1870 100644 --- a/libxml2/parser.go +++ b/libxml2/parser.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const DEFAULT_VERSION = "1.0" diff --git a/libxml2/parserInternals.go b/libxml2/parserInternals.go index 02b00254..f653693f 100644 --- a/libxml2/parserInternals.go +++ b/libxml2/parserInternals.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) const MAX_TEXT_LENGTH = 10000000 diff --git a/libxml2/pattern.go b/libxml2/pattern.go index 48371d2a..c742c81f 100644 --- a/libxml2/pattern.go +++ b/libxml2/pattern.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlPattern struct { diff --git a/libxml2/relaxng.go b/libxml2/relaxng.go index e16b699d..2e843d96 100644 --- a/libxml2/relaxng.go +++ b/libxml2/relaxng.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlRelaxNG struct { diff --git a/libxml2/schemasInternals.go b/libxml2/schemasInternals.go index 3f7637a8..d2479dee 100644 --- a/libxml2/schemasInternals.go +++ b/libxml2/schemasInternals.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const SCHEMAS_ANYATTR_SKIP = 1 diff --git a/libxml2/schematron.go b/libxml2/schematron.go index 094e8dd3..d223a950 100644 --- a/libxml2/schematron.go +++ b/libxml2/schematron.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type SchematronValidOptions c.Int diff --git a/libxml2/threads.go b/libxml2/threads.go index 619886e4..21e4adbc 100644 --- a/libxml2/threads.go +++ b/libxml2/threads.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlMutex struct { diff --git a/libxml2/tree.go b/libxml2/tree.go index 3e5ace3d..5140c179 100644 --- a/libxml2/tree.go +++ b/libxml2/tree.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const BASE_BUFFER_SIZE = 4096 diff --git a/libxml2/uri.go b/libxml2/uri.go index bbde823b..ba9a25ec 100644 --- a/libxml2/uri.go +++ b/libxml2/uri.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlURI struct { diff --git a/libxml2/valid.go b/libxml2/valid.go index 771c0efc..dc0d063c 100644 --- a/libxml2/valid.go +++ b/libxml2/valid.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlValidState struct { diff --git a/libxml2/xinclude.go b/libxml2/xinclude.go index b6409819..49ca9a9a 100644 --- a/libxml2/xinclude.go +++ b/libxml2/xinclude.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlXIncludeCtxt struct { diff --git a/libxml2/xlink.go b/libxml2/xlink.go index 56ca41df..40c1e04c 100644 --- a/libxml2/xlink.go +++ b/libxml2/xlink.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type XlinkHRef *Char diff --git a/libxml2/xmlIO.go b/libxml2/xmlIO.go index cb557eef..cc60ca8c 100644 --- a/libxml2/xmlIO.go +++ b/libxml2/xmlIO.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) // llgo:type C diff --git a/libxml2/xmlautomata.go b/libxml2/xmlautomata.go index 591c7f3f..4495f088 100644 --- a/libxml2/xmlautomata.go +++ b/libxml2/xmlautomata.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlAutomata struct { diff --git a/libxml2/xmlerror.go b/libxml2/xmlerror.go index bc579aa4..76bc2dfe 100644 --- a/libxml2/xmlerror.go +++ b/libxml2/xmlerror.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type ErrorLevel c.Int diff --git a/libxml2/xmlexports.go b/libxml2/xmlexports.go index 8de30a43..1076e918 100644 --- a/libxml2/xmlexports.go +++ b/libxml2/xmlexports.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) /* diff --git a/libxml2/xmlmemory.go b/libxml2/xmlmemory.go index 05deb471..67d857db 100644 --- a/libxml2/xmlmemory.go +++ b/libxml2/xmlmemory.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) // llgo:type C diff --git a/libxml2/xmlmodule.go b/libxml2/xmlmodule.go index 5889a7e2..3e7ce31e 100644 --- a/libxml2/xmlmodule.go +++ b/libxml2/xmlmodule.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlModule struct { diff --git a/libxml2/xmlreader.go b/libxml2/xmlreader.go index f804a584..65f0712e 100644 --- a/libxml2/xmlreader.go +++ b/libxml2/xmlreader.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type ParserSeverities c.Int diff --git a/libxml2/xmlregexp.go b/libxml2/xmlregexp.go index 2c97d118..c39228d9 100644 --- a/libxml2/xmlregexp.go +++ b/libxml2/xmlregexp.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlRegexp struct { diff --git a/libxml2/xmlsave.go b/libxml2/xmlsave.go index 1158e276..2218f01c 100644 --- a/libxml2/xmlsave.go +++ b/libxml2/xmlsave.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type SaveOption c.Int diff --git a/libxml2/xmlschemas.go b/libxml2/xmlschemas.go index e2ad577c..8e21f5f1 100644 --- a/libxml2/xmlschemas.go +++ b/libxml2/xmlschemas.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type SchemaValidError c.Int diff --git a/libxml2/xmlschemastypes.go b/libxml2/xmlschemastypes.go index 1a4ff78d..ab2aabfb 100644 --- a/libxml2/xmlschemastypes.go +++ b/libxml2/xmlschemastypes.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) type SchemaWhitespaceValueType c.Int diff --git a/libxml2/xmlstring.go b/libxml2/xmlstring.go index 213fa71e..3028050b 100644 --- a/libxml2/xmlstring.go +++ b/libxml2/xmlstring.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type Char int8 diff --git a/libxml2/xmlunicode.go b/libxml2/xmlunicode.go index 98ccbbc9..b519e81e 100644 --- a/libxml2/xmlunicode.go +++ b/libxml2/xmlunicode.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) //go:linkname UCSIsAegeanNumbers C.xmlUCSIsAegeanNumbers diff --git a/libxml2/xmlwriter.go b/libxml2/xmlwriter.go index 6e73d690..c42fe43f 100644 --- a/libxml2/xmlwriter.go +++ b/libxml2/xmlwriter.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) type X_xmlTextWriter struct { diff --git a/libxml2/xpath.go b/libxml2/xpath.go index c2e53b44..af6f0954 100644 --- a/libxml2/xpath.go +++ b/libxml2/xpath.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const XPATH_POINT = 5 diff --git a/libxml2/xpathInternals.go b/libxml2/xpathInternals.go index 05463bcc..501c386f 100644 --- a/libxml2/xpathInternals.go +++ b/libxml2/xpathInternals.go @@ -1,8 +1,9 @@ package libxml2 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) //go:linkname XPathPopBoolean C.xmlXPathPopBoolean diff --git a/libxslt/_demo/withdeplibxml/demo.go b/libxslt/_demo/withdeplibxml/demo.go index 587f2e5d..fca0b3fb 100644 --- a/libxslt/_demo/withdeplibxml/demo.go +++ b/libxslt/_demo/withdeplibxml/demo.go @@ -7,7 +7,7 @@ import ( "github.com/goplus/llpkg/libxslt" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" "github.com/goplus/llpkg/libxml2" ) diff --git a/libxslt/documents.go b/libxslt/documents.go index 7c51d5bb..7e30dbcc 100644 --- a/libxslt/documents.go +++ b/libxslt/documents.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) //go:linkname NewDocument C.xsltNewDocument diff --git a/libxslt/extensions.go b/libxslt/extensions.go index b36d6242..6b66c8b6 100644 --- a/libxslt/extensions.go +++ b/libxslt/extensions.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) /** diff --git a/libxslt/extra.go b/libxslt/extra.go index 5be071cd..f936f2f1 100644 --- a/libxslt/extra.go +++ b/libxslt/extra.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) //go:linkname FunctionNodeSet C.xsltFunctionNodeSet diff --git a/libxslt/functions.go b/libxslt/functions.go index d8dba771..54ecaf62 100644 --- a/libxslt/functions.go +++ b/libxslt/functions.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) //go:linkname XPathFunctionLookup C.xsltXPathFunctionLookup diff --git a/libxslt/imports.go b/libxslt/imports.go index 6f5ee31b..5a75b1aa 100644 --- a/libxslt/imports.go +++ b/libxslt/imports.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) /* diff --git a/libxslt/keys.go b/libxslt/keys.go index 64d00816..b2e13ac7 100644 --- a/libxslt/keys.go +++ b/libxslt/keys.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) //go:linkname AddKey C.xsltAddKey diff --git a/libxslt/numbersInternals.go b/libxslt/numbersInternals.go index 7cc5ac02..14e8952a 100644 --- a/libxslt/numbersInternals.go +++ b/libxslt/numbersInternals.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) type X_xsltCompMatch struct { diff --git a/libxslt/pattern.go b/libxslt/pattern.go index 7952dfc7..f1b7cf5a 100644 --- a/libxslt/pattern.go +++ b/libxslt/pattern.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) type CompMatch X_xsltCompMatch diff --git a/libxslt/security.go b/libxslt/security.go index 3ba2e06f..d4c96922 100644 --- a/libxslt/security.go +++ b/libxslt/security.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) type X_xsltSecurityPrefs struct { diff --git a/libxslt/templates.go b/libxslt/templates.go index ff314c87..850a8515 100644 --- a/libxslt/templates.go +++ b/libxslt/templates.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) //go:linkname EvalXPathPredicate C.xsltEvalXPathPredicate diff --git a/libxslt/transform.go b/libxslt/transform.go index 93b7001e..8ace3f2d 100644 --- a/libxslt/transform.go +++ b/libxslt/transform.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" _ "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) /** diff --git a/libxslt/variables.go b/libxslt/variables.go index 80c0c1ea..31cf02b2 100644 --- a/libxslt/variables.go +++ b/libxslt/variables.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) const RVT_LOCAL = 1 diff --git a/libxslt/xsltInternals.go b/libxslt/xsltInternals.go index 4ba883eb..1d818ce2 100644 --- a/libxslt/xsltInternals.go +++ b/libxslt/xsltInternals.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) const MAX_SORT = 15 diff --git a/libxslt/xsltlocale.go b/libxslt/xsltlocale.go index 3c66a5af..1fc96273 100644 --- a/libxslt/xsltlocale.go +++ b/libxslt/xsltlocale.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) //go:linkname NewLocale C.xsltNewLocale diff --git a/libxslt/xsltutils.go b/libxslt/xsltutils.go index 7fc62787..3a0bcd9d 100644 --- a/libxslt/xsltutils.go +++ b/libxslt/xsltutils.go @@ -1,9 +1,10 @@ package libxslt import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llpkg/libxml2" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/llpkg/libxml2" ) /* diff --git a/sqlite3/_demo/hello/hello.go b/sqlite3/_demo/hello/hello.go index 2c3c57f6..ce551a65 100644 --- a/sqlite3/_demo/hello/hello.go +++ b/sqlite3/_demo/hello/hello.go @@ -3,8 +3,8 @@ package main import ( "github.com/goplus/llpkg/sqlite3" - "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/sqlite3/sqlite3.go b/sqlite3/sqlite3.go index 4c439898..e7276a2a 100644 --- a/sqlite3/sqlite3.go +++ b/sqlite3/sqlite3.go @@ -1,8 +1,9 @@ package sqlite3 import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const VERSION = "3.49.1" diff --git a/sqlite3/sqlite3ext.go b/sqlite3/sqlite3ext.go index a4335d65..069df800 100644 --- a/sqlite3/sqlite3ext.go +++ b/sqlite3/sqlite3ext.go @@ -1,8 +1,9 @@ package sqlite3 import ( - "github.com/goplus/llgo/c" _ "unsafe" + + "github.com/goplus/lib/c" ) // llgo:type C diff --git a/zlib/_demo/efficiency/efficiency.go b/zlib/_demo/efficiency/efficiency.go index 7b6bf499..9bd8a57d 100644 --- a/zlib/_demo/efficiency/efficiency.go +++ b/zlib/_demo/efficiency/efficiency.go @@ -5,7 +5,7 @@ import ( "github.com/goplus/llpkg/zlib" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/zlib/_demo/normal/normal.go b/zlib/_demo/normal/normal.go index 6721b1da..e69eb2cb 100644 --- a/zlib/_demo/normal/normal.go +++ b/zlib/_demo/normal/normal.go @@ -5,7 +5,7 @@ import ( "github.com/goplus/llpkg/zlib" - "github.com/goplus/llgo/c" + "github.com/goplus/lib/c" ) func main() { diff --git a/zlib/zconf.go b/zlib/zconf.go index 905b2e2e..51ea4ceb 100644 --- a/zlib/zconf.go +++ b/zlib/zconf.go @@ -1,8 +1,9 @@ package zlib import ( - "github.com/goplus/llgo/c" "unsafe" + + "github.com/goplus/lib/c" ) const MAX_MEM_LEVEL = 9 diff --git a/zlib/zlib.go b/zlib/zlib.go index b71f70a8..c609ec85 100644 --- a/zlib/zlib.go +++ b/zlib/zlib.go @@ -1,9 +1,10 @@ package zlib import ( - "github.com/goplus/llgo/c" - "github.com/goplus/llgo/c/os" "unsafe" + + "github.com/goplus/lib/c" + "github.com/goplus/lib/c/os" ) const VERSION = "1.3.1"