Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: goplus/llpkg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: libtool/v1.0.0
Choose a base ref
...
head repository: goplus/llpkg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: libxml2/v1.0.2
Choose a head ref
  • 3 commits
  • 8 files changed
  • 2 contributors

Commits on Jun 20, 2025

  1. ci: upgrade llcppg and llgo (#78) 

    * chore: upgrade llcppg and llgo

* ci: adjust deps

* ci: add conan pre setup for linux
    @MeteorsLiu
    MeteorsLiu authored Jun 20, 2025
    Copy the full SHA
    a0ae65b View commit details

  2. ci: upgrade llcppg (#79) 

    * chore: upgrade llcppg and llgo

* ci: adjust deps

* ci: add conan pre setup for linux

* ci: fix typo

* ci: fix typo
    @MeteorsLiu
    MeteorsLiu authored Jun 20, 2025
    Copy the full SHA
    e5c9636 View commit details

  3. Patch libxml2 

    Release-as: libxml2/v1.0.2 (#77)
    @luoliwoshang
    luoliwoshang authored Jun 20, 2025
    Copy the full SHA
    0649c6a View commit details
Showing with 97 additions and 86 deletions.
  1. +19 −8 .github/workflows/verification.yml
  2. +1 −1 libxml2/debugXML.go
  3. +2 −2 libxml2/encoding.go
  4. +27 −27 libxml2/parser.go
  5. +37 −37 libxml2/tree.go
  6. +2 −2 libxml2/valid.go
  7. +3 −3 libxml2/xlink.go
  8. +6 −6 libxml2/xpath.go
27 changes: 19 additions & 8 deletions .github/workflows/verification.yml
View file
Original file line number Diff line number Diff line change
@@ -23,8 +23,9 @@ jobs:
- macos-latest
- ubuntu-24.04
- ubuntu-24.04-arm
llgo: [87c7b65223eea16ade3ad1de4079bf2a20d20b1b]
llcppg: [v0.5.1]
llvm: [19]
llgo: [e68355d94f9f9ec17caae6e0d397bd55f8c5ec33]
llcppg: [v0.6.0]

runs-on: ${{matrix.os}}
steps:
@@ -52,18 +53,28 @@ jobs:
- name: Install dependencies
if: startsWith(matrix.os, 'macos')
run: |
brew install llvm@19 bdw-gc openssl libffi libuv cmake cjson conan lld@19
brew install llvm@${{matrix.llvm}} bdw-gc openssl libffi libuv cmake conan lld@${{matrix.llvm}}
brew link --force libffi
echo "$(brew --prefix llvm@19)/bin" >> $GITHUB_PATH
echo "$(brew --prefix lld@19)/bin" >> $GITHUB_PATH
echo "$(brew --prefix llvm@${{matrix.llvm}})/bin" >> $GITHUB_PATH
echo "$(brew --prefix lld@${{matrix.llvm}})/bin" >> $GITHUB_PATH
- name: Install dependencies
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
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
echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-${{matrix.llvm}} 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 install -y python3 libcjson-dev 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
sudo apt-get install -y llvm-${{matrix.llvm}}-dev \
clang-${{matrix.llvm}} \
libclang-${{matrix.llvm}}-dev \
lld-${{matrix.llvm}} \
libunwind-${{matrix.llvm}}-dev \
libc++-${{matrix.llvm}}-dev \
pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libuv1-dev
echo "/usr/lib/llvm-${{matrix.llvm}}/bin" >> $GITHUB_PATH
- name: Pre setup Conan
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt install -y python3
python3 -m pip install conan
- name: Set up Conan
run: |
2 changes: 1 addition & 1 deletion libxml2/debugXML.go
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ type X_xmlShellCtxt struct {
Pctxt XPathContextPtr
Loaded c.Int
Output *c.FILE
Input c.Pointer
Input ShellReadlineFunc
}
type ShellCtxt X_xmlShellCtxt
type ShellCtxtPtr *ShellCtxt
4 changes: 2 additions & 2 deletions libxml2/encoding.go
View file
Original file line number Diff line number Diff line change
@@ -53,8 +53,8 @@ type CharEncodingOutputFunc func(*c.Char, *c.Int, *c.Char, *c.Int) c.Int

type X_xmlCharEncodingHandler struct {
Name *c.Char
Input c.Pointer
Output c.Pointer
Input CharEncodingInputFunc
Output CharEncodingOutputFunc
}
type CharEncodingHandler X_xmlCharEncodingHandler
type CharEncodingHandlerPtr *CharEncodingHandler
54 changes: 27 additions & 27 deletions libxml2/parser.go
View file
Original file line number Diff line number Diff line change
@@ -172,33 +172,33 @@ type StartElementNsSAX2Func func(c.Pointer, *Char, *Char, *Char, c.Int, **Char,
type EndElementNsSAX2Func func(c.Pointer, *Char, *Char, *Char)

type X_xmlSAXHandlerV1 struct {
InternalSubset c.Pointer
IsStandalone c.Pointer
HasInternalSubset c.Pointer
HasExternalSubset c.Pointer
ResolveEntity c.Pointer
GetEntity c.Pointer
EntityDecl c.Pointer
NotationDecl c.Pointer
AttributeDecl c.Pointer
ElementDecl c.Pointer
UnparsedEntityDecl c.Pointer
SetDocumentLocator c.Pointer
StartDocument c.Pointer
EndDocument c.Pointer
StartElement c.Pointer
EndElement c.Pointer
Reference c.Pointer
Characters c.Pointer
IgnorableWhitespace c.Pointer
ProcessingInstruction c.Pointer
Comment c.Pointer
Warning c.Pointer
Error c.Pointer
FatalError c.Pointer
GetParameterEntity c.Pointer
CdataBlock c.Pointer
ExternalSubset c.Pointer
InternalSubset InternalSubsetSAXFunc
IsStandalone IsStandaloneSAXFunc
HasInternalSubset HasInternalSubsetSAXFunc
HasExternalSubset HasExternalSubsetSAXFunc
ResolveEntity ResolveEntitySAXFunc
GetEntity GetEntitySAXFunc
EntityDecl EntityDeclSAXFunc
NotationDecl NotationDeclSAXFunc
AttributeDecl AttributeDeclSAXFunc
ElementDecl ElementDeclSAXFunc
UnparsedEntityDecl UnparsedEntityDeclSAXFunc
SetDocumentLocator SetDocumentLocatorSAXFunc
StartDocument StartDocumentSAXFunc
EndDocument EndDocumentSAXFunc
StartElement StartElementSAXFunc
EndElement EndElementSAXFunc
Reference ReferenceSAXFunc
Characters CharactersSAXFunc
IgnorableWhitespace IgnorableWhitespaceSAXFunc
ProcessingInstruction ProcessingInstructionSAXFunc
Comment CommentSAXFunc
Warning WarningSAXFunc
Error ErrorSAXFunc
FatalError FatalErrorSAXFunc
GetParameterEntity GetParameterEntitySAXFunc
CdataBlock CdataBlockSAXFunc
ExternalSubset ExternalSubsetSAXFunc
Initialized c.Uint
}
type SAXHandlerV1 X_xmlSAXHandlerV1
74 changes: 37 additions & 37 deletions libxml2/tree.go
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ const DOCB_DOCUMENT_NODE = 21

type X_xmlParserInputBuffer struct {
Context c.Pointer
Readcallback c.Pointer
Closecallback c.Pointer
Readcallback InputReadCallback
Closecallback InputCloseCallback
Encoder CharEncodingHandlerPtr
Buffer BufPtr
Raw BufPtr
@@ -24,8 +24,8 @@ type ParserInputBufferPtr *ParserInputBuffer

type X_xmlOutputBuffer struct {
Context c.Pointer
Writecallback c.Pointer
Closecallback c.Pointer
Writecallback OutputWriteCallback
Closecallback OutputCloseCallback
Encoder CharEncodingHandlerPtr
Buffer BufPtr
Conv BufPtr
@@ -46,7 +46,7 @@ type X_xmlParserInput struct {
Line c.Int
Col c.Int
Consumed c.Ulong
Free c.Pointer
Free ParserInputDeallocate
Encoding *Char
Version *Char
Flags c.Int
@@ -154,7 +154,7 @@ type X_xmlParserCtxt struct {
Nsdb *ParserNsData
AttrHashMax c.Uint
AttrHash *AttrHashBucket
ErrorHandler c.Pointer
ErrorHandler StructuredErrorFunc
ErrorCtxt c.Pointer
}
type ParserCtxt X_xmlParserCtxt
@@ -170,38 +170,38 @@ type SAXLocator X_xmlSAXLocator
type SAXLocatorPtr *SAXLocator

type X_xmlSAXHandler struct {
InternalSubset c.Pointer
IsStandalone c.Pointer
HasInternalSubset c.Pointer
HasExternalSubset c.Pointer
ResolveEntity c.Pointer
GetEntity c.Pointer
EntityDecl c.Pointer
NotationDecl c.Pointer
AttributeDecl c.Pointer
ElementDecl c.Pointer
UnparsedEntityDecl c.Pointer
SetDocumentLocator c.Pointer
StartDocument c.Pointer
EndDocument c.Pointer
StartElement c.Pointer
EndElement c.Pointer
Reference c.Pointer
Characters c.Pointer
IgnorableWhitespace c.Pointer
ProcessingInstruction c.Pointer
Comment c.Pointer
Warning c.Pointer
Error c.Pointer
FatalError c.Pointer
GetParameterEntity c.Pointer
CdataBlock c.Pointer
ExternalSubset c.Pointer
InternalSubset InternalSubsetSAXFunc
IsStandalone IsStandaloneSAXFunc
HasInternalSubset HasInternalSubsetSAXFunc
HasExternalSubset HasExternalSubsetSAXFunc
ResolveEntity ResolveEntitySAXFunc
GetEntity GetEntitySAXFunc
EntityDecl EntityDeclSAXFunc
NotationDecl NotationDeclSAXFunc
AttributeDecl AttributeDeclSAXFunc
ElementDecl ElementDeclSAXFunc
UnparsedEntityDecl UnparsedEntityDeclSAXFunc
SetDocumentLocator SetDocumentLocatorSAXFunc
StartDocument StartDocumentSAXFunc
EndDocument EndDocumentSAXFunc
StartElement StartElementSAXFunc
EndElement EndElementSAXFunc
Reference ReferenceSAXFunc
Characters CharactersSAXFunc
IgnorableWhitespace IgnorableWhitespaceSAXFunc
ProcessingInstruction ProcessingInstructionSAXFunc
Comment CommentSAXFunc
Warning WarningSAXFunc
Error ErrorSAXFunc
FatalError FatalErrorSAXFunc
GetParameterEntity GetParameterEntitySAXFunc
CdataBlock CdataBlockSAXFunc
ExternalSubset ExternalSubsetSAXFunc
Initialized c.Uint
X_private c.Pointer
StartElementNs c.Pointer
EndElementNs c.Pointer
Serror c.Pointer
StartElementNs StartElementNsSAX2Func
EndElementNs EndElementNsSAX2Func
Serror StructuredErrorFunc
}
type SAXHandler X_xmlSAXHandler
type SAXHandlerPtr *SAXHandler
@@ -559,7 +559,7 @@ type X_xmlDOMWrapCtxt struct {
X_private c.Pointer
Type c.Int
NamespaceMap c.Pointer
GetNsForNodeFunc c.Pointer
GetNsForNodeFunc DOMWrapAcquireNsFunction
}
type DOMWrapCtxt X_xmlDOMWrapCtxt
type DOMWrapCtxtPtr *DOMWrapCtxt
4 changes: 2 additions & 2 deletions libxml2/valid.go
View file
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ type ValidityWarningFunc func(__llgo_arg_0 c.Pointer, __llgo_arg_1 *c.Char, __ll

type X_xmlValidCtxt struct {
UserData c.Pointer
Error c.Pointer
Warning c.Pointer
Error ValidityErrorFunc
Warning ValidityWarningFunc
Node NodePtr
NodeNr c.Int
NodeMax c.Int
6 changes: 3 additions & 3 deletions libxml2/xlink.go
View file
Original file line number Diff line number Diff line change
@@ -47,9 +47,9 @@ type XlinkExtendedLinkFunk func(c.Pointer, NodePtr, c.Int, *XlinkHRef, *XlinkRol
type XlinkExtendedLinkSetFunk func(c.Pointer, NodePtr, c.Int, *XlinkHRef, *XlinkRole, c.Int, *XlinkTitle, **Char)

type X_xlinkHandler struct {
Simple c.Pointer
Extended c.Pointer
Set c.Pointer
Simple XlinkSimpleLinkFunk
Extended XlinkExtendedLinkFunk
Set XlinkExtendedLinkSetFunk
}
type XlinkHandler X_xlinkHandler
type XlinkHandlerPtr *XlinkHandler
12 changes: 6 additions & 6 deletions libxml2/xpath.go
View file
Original file line number Diff line number Diff line change
@@ -33,17 +33,17 @@ type X_xmlXPathContext struct {
Here NodePtr
Origin NodePtr
NsHash HashTablePtr
VarLookupFunc c.Pointer
VarLookupFunc XPathVariableLookupFunc
VarLookupData c.Pointer
Extra c.Pointer
Function *Char
FunctionURI *Char
FuncLookupFunc c.Pointer
FuncLookupFunc XPathFuncLookupFunc
FuncLookupData c.Pointer
TmpNsList *NsPtr
TmpNsNr c.Int
UserData c.Pointer
Error c.Pointer
Error StructuredErrorFunc
LastError Error
DebugNode NodePtr
Dict DictPtr
@@ -142,7 +142,7 @@ type XPathConvertFunc func(XPathObjectPtr, c.Int) c.Int

type X_xmlXPathType struct {
Name *Char
Func c.Pointer
Func XPathConvertFunc
}
type XPathType X_xmlXPathType
type XPathTypePtr *XPathType
@@ -159,7 +159,7 @@ type XPathEvalFunc func(XPathParserContextPtr, c.Int)

type X_xmlXPathFunct struct {
Name *Char
Func c.Pointer
Func XPathEvalFunc
}
type XPathFunct X_xmlXPathFunct
type XPathFuncPtr *XPathFunct
@@ -169,7 +169,7 @@ type XPathAxisFunc func(XPathParserContextPtr, XPathObjectPtr) XPathObjectPtr

type X_xmlXPathAxis struct {
Name *Char
Func c.Pointer
Func XPathAxisFunc
}
type XPathAxis X_xmlXPathAxis
type XPathAxisPtr *XPathAxis