unique type & support -dirs flag & change subdir.pub to llcppg.pub & merge all llcppg.pub for subdirs to merge.llcppg.pub

Author: tsingbx

c/c.go

@@ -33,7 +33,7 @@ type (
 	Float   = float32
 	Double  = float64
 	Pointer = unsafe.Pointer
-	FilePtr = *FILE //cname:*FILE
+	FilePtr = *FILE
 )
 
 type FILE struct {
@@ -57,20 +57,20 @@ type integer interface {
 
 type SizeT = uintptr //cname:size_t
 
-type IntptrT = uintptr //cname:intptr_t
-type UintptrT = uintptr
-type Int8T = int8
-type Int16T = int16
-type Int32T = int32
-type Int64T = int64
+type IntptrT = uintptr  //cname:intptr_t
+type UintptrT = uintptr //cname:uintptr_t
+type Int8T = int8       //cname:int8_t
+type Int16T = int16     //cname:int16_t
+type Int32T = int32     //cname:int32_t
+type Int64T = int64     //cname:int64_t
 
-type Uint8T = uint8
-type Uint16T = uint16
-type Uint32T = uint32
-type Uint64T = uint64
+type Uint8T = uint8   //cname:uint8_t
+type Uint16T = uint16 //cname:uint16_t
+type Uint32T = uint32 //cname:uint32_t
+type Uint64T = uint64 //cname:uint64_t
 
-type IntmaxT = LongLong
-type UintmaxT = UlongLong
+type IntmaxT = LongLong   //cname:intmax_t
+type UintmaxT = UlongLong //cname:uintmax_t
 
 //go:linkname Str llgo.cstr
 func Str(string) *Char
@@ -261,13 +261,12 @@ func Perror(s *Char)
 func Usleep(useconds Uint) Int
 
 // -----------------------------------------------------------------------------
-
 type Option struct {
 	Name   *Char
 	HasArg Int
 	Flag   *Int
 	Val    Int
-}
+} //cname:option
 
 //go:linkname Argc __llgo_argc
 var Argc Int

c/c.pub

@@ -113,7 +113,7 @@ type SockaddrIn struct {
 	Port   uint16
 	Addr   InAddr
 	Zero   [8]c.Char
-}
+} //cname:_
 
 type SockaddrIn6 struct {
 	Len      uint8
@@ -122,37 +122,37 @@ type SockaddrIn6 struct {
 	Flowinfo c.Uint
 	Addr     In6Addr
 	ScopeId  c.Uint
-}
+} //cname:_
 
 type SockaddrStorage struct {
 	Len    uint8
 	Family uint8
 	pad1   [PAD1_SIZE]c.Char
 	align  c.LongLong
 	pad2   [PAD2_SIZE]c.Char
-}
+} //cname:_
 
 type InAddr struct {
 	Addr c.Uint
-}
+} //cname:_
 
 type In6Addr struct {
 	U6Addr [16]uint8
-}
+} //cname:_
 
 type SockAddr struct {
 	Len    uint8
 	Family uint8
 	Data   [14]c.Char
-}
+} //cname:sockaddr
 
 type Hostent struct {
 	Name     *c.Char  // official name of host
 	Aliases  **c.Char // null-terminated array of alternate names for the host
 	AddrType c.Int    // host address type
 	Length   c.Int    // length of address
 	AddrList **c.Char // null-terminated array of addresses for the host
-}
+} //cname:hostent
 
 //go:linkname Socket C.socket
 func Socket(domain c.Int, typ c.Int, protocol c.Int) c.Int
@@ -212,7 +212,7 @@ type AddrInfo struct {
 	CanOnName *c.Char
 	Addr      *SockAddr
 	Next      *AddrInfo
-}
+} //cname:addrinfo
 
 //go:linkname Getaddrinfo C.getaddrinfo
 func Getaddrinfo(host *c.Char, port *c.Char, addrInfo *AddrInfo, result **AddrInfo) c.Int

c/llama2/llama2.pub

@@ -59,15 +59,15 @@ const (
 )
 
 type (
-	ModeT C.mode_t
-	UidT  C.uid_t
-	GidT  C.gid_t
-	OffT  C.off_t
-	DevT  C.dev_t
+	ModeT C.mode_t //cname:mode_t
+	UidT  C.uid_t  //cname:uid_t
+	GidT  C.gid_t  //cname:gid_t
+	OffT  C.off_t  //cname:off_t
+	DevT  C.dev_t  //cname:dev_t
 )
 
 type (
-	StatT = syscall.Stat_t
+	StatT = syscall.Stat_t //cname:Stat_t
 )
 
 //go:linkname Errno C.llgoErrno
@@ -262,7 +262,7 @@ func Execvp(file *c.Char, argv **c.Char) c.Int
 
 // -----------------------------------------------------------------------------
 
-type PidT c.Int
+type PidT c.Int //cname:pid_t
 
 //go:linkname Fork C.fork
 func Fork() PidT

c/net/net.go

@@ -36,7 +36,7 @@ type aThread struct {
 type RoutineFunc func(c.Pointer) c.Pointer
 
 // Thread represents a POSIX thread.
-type Thread = *aThread
+type Thread = *aThread //cname:pthread_t
 
 // The pthread_exit() function terminates the calling thread and
 // returns a value via retval that (if the thread is joinable) is
@@ -63,7 +63,7 @@ type Attr struct {
 	Detached byte
 	SsSp     *c.Char
 	SsSize   uintptr
-}
+} //cname:attr
 
 // llgo:link (*Attr).Init C.pthread_attr_init
 func (attr *Attr) Init() c.Int { return 0 }
@@ -92,7 +92,7 @@ func (attr *Attr) SetStackAddr(stackAddr c.Pointer) c.Int { return 0 }
 // -----------------------------------------------------------------------------
 // Thread Local Storage
 
-type Key c.Uint
+type Key c.Uint //cname:pthread_key_t
 
 // llgo:link (*Key).Create C.pthread_key_create
 func (key *Key) Create(destructor func(c.Pointer)) c.Int { return 0 }

c/net/net.pub

@@ -34,7 +34,7 @@ const (
 // -----------------------------------------------------------------------------
 
 // Once is an object that will perform exactly one action.
-type Once C.pthread_once_t
+type Once C.pthread_once_t //cname:pthread_once_t
 
 //go:linkname OnceInit llgoSyncOnceInitVal
 var OnceInit Once
@@ -44,7 +44,7 @@ func (o *Once) Do(f func()) c.Int { return 0 }
 
 // -----------------------------------------------------------------------------
 
-type MutexType c.Int
+type MutexType c.Int //cname:_
 
 const (
 	MUTEX_NORMAL     MutexType = C.PTHREAD_MUTEX_NORMAL
@@ -54,7 +54,7 @@ const (
 )
 
 // MutexAttr is a mutex attribute object.
-type MutexAttr C.pthread_mutexattr_t
+type MutexAttr C.pthread_mutexattr_t //cname:pthread_mutexattr_t
 
 // llgo:link (*MutexAttr).Init C.pthread_mutexattr_init
 func (a *MutexAttr) Init(attr *MutexAttr) c.Int { return 0 }
@@ -68,7 +68,7 @@ func (a *MutexAttr) SetType(typ MutexType) c.Int { return 0 }
 // -----------------------------------------------------------------------------
 
 // Mutex is a mutual exclusion lock.
-type Mutex C.pthread_mutex_t
+type Mutex C.pthread_mutex_t //cname:pthread_mutex_t
 
 // llgo:link (*Mutex).Init C.pthread_mutex_init
 func (m *Mutex) Init(attr *MutexAttr) c.Int { return 0 }
@@ -88,7 +88,7 @@ func (m *Mutex) Unlock() {}
 // -----------------------------------------------------------------------------
 
 // RWLockAttr is a read-write lock attribute object.
-type RWLockAttr C.pthread_rwlockattr_t
+type RWLockAttr C.pthread_rwlockattr_t //cname:pthread_rwlockattr_t
 
 // llgo:link (*RWLockAttr).Init C.pthread_rwlockattr_init
 func (a *RWLockAttr) Init(attr *RWLockAttr) c.Int { return 0 }
@@ -105,7 +105,7 @@ func (a *RWLockAttr) GetPShared(pshared *c.Int) c.Int { return 0 }
 // -----------------------------------------------------------------------------
 
 // RWLock is a read-write lock.
-type RWLock C.pthread_rwlock_t
+type RWLock C.pthread_rwlock_t //cname:pthread_rwlock_t
 
 // llgo:link (*RWLock).Init C.pthread_rwlock_init
 func (rw *RWLock) Init(attr *RWLockAttr) c.Int { return 0 }
@@ -134,7 +134,7 @@ func (rw *RWLock) Unlock() {}
 // -----------------------------------------------------------------------------
 
 // CondAttr is a condition variable attribute object.
-type CondAttr C.pthread_condattr_t
+type CondAttr C.pthread_condattr_t //cname:pthread_condattr_t
 
 // llgo:link (*CondAttr).Init C.pthread_condattr_init
 func (a *CondAttr) Init(attr *CondAttr) c.Int { return 0 }
@@ -151,7 +151,7 @@ func (a *CondAttr) GetClock(clock *time.ClockidT) c.Int { return 0 }
 // -----------------------------------------------------------------------------
 
 // Cond is a condition variable.
-type Cond C.pthread_cond_t
+type Cond C.pthread_cond_t //cname:pthread_cond_t
 
 // llgo:link (*Cond).Init C.pthread_cond_init
 func (c *Cond) Init(attr *CondAttr) c.Int { return 0 }

c/os/os.go

@@ -30,8 +30,8 @@ const (
 )
 
 type (
-	JmpBuf    = C.jmp_buf
-	SigjmpBuf = C.sigjmp_buf
+	JmpBuf    = C.jmp_buf    //cname:jmp_buf
+	SigjmpBuf = C.sigjmp_buf //cname:sigjmp_buf
 )
 
 // -----------------------------------------------------------------------------