admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llcppsigfetch:use fmt to log because linux nil defer of log

Browse Source
This commit is contained in:
luoliwoshang
2024-10-23 15:13:14 +08:00
parent a608c51e36
commit 91ebf88c97
3 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
chore/_xtool/llcppsigfetch/parse/cvt.go
View File

@@ -2,7 +2,6 @@ package parse
import (
"fmt"
"log"
"os"
"strings"
"unsafe"
@@ -67,11 +66,11 @@ type Config struct {
func NewConverter(config *clangutils.Config) (*Converter, error) {
if debugParse {
log.Println("NewConverter: config")
log.Println("config.File", config.File)
log.Println("config.Args", config.Args)
log.Println("config.IsCpp", config.IsCpp)
log.Println("config.Temp", config.Temp)
fmt.Fprintln(os.Stderr, "NewConverter: config")
fmt.Fprintln(os.Stderr, "config.File", config.File)
fmt.Fprintln(os.Stderr, "config.Args", config.Args)
fmt.Fprintln(os.Stderr, "config.IsCpp", config.IsCpp)
fmt.Fprintln(os.Stderr, "config.Temp", config.Temp)
}
index, unit, err := clangutils.CreateTranslationUnit(config)
@@ -130,16 +129,16 @@ func (ct *Converter) decIndent() {
func (ct *Converter) logf(format string, args ...interface{}) {
if debugParse {
log.Printf(ct.logBase()+format, args...)
fmt.Fprintf(os.Stderr, ct.logBase()+format, args...)
}
}
func (ct *Converter) logln(args ...interface{}) {
if debugParse {
if len(args) > 0 {
firstArg := fmt.Sprintf("%s%v", ct.logBase(), args[0])
log.Println(append([]interface{}{firstArg}, args[1:]...)...)
fmt.Fprintln(os.Stderr, append([]interface{}{firstArg}, args[1:]...)...)
} else {
log.Println(ct.logBase())
fmt.Fprintln(os.Stderr, ct.logBase())
}
}
}

11
chore/_xtool/llcppsigfetch/parse/parse.go
View File

@@ -2,7 +2,8 @@ package parse
import (
"errors"
"log"
"fmt"
"os"
"github.com/goplus/llgo/c/cjson"
"github.com/goplus/llgo/chore/_xtool/llcppsymg/clangutils"
@@ -42,7 +43,7 @@ func (p *Context) Output() *cjson.JSON {
// ProcessFiles processes the given files and adds them to the context
func (p *Context) ProcessFiles(files []string) error {
if debugParse {
log.Println("ProcessFiles: files", files, "isCpp", p.IsCpp)
fmt.Fprintln(os.Stderr, "ProcessFiles: files", files, "isCpp", p.IsCpp)
}
for _, file := range files {
if err := p.processFile(file); err != nil {
@@ -55,12 +56,12 @@ func (p *Context) ProcessFiles(files []string) error {
// parse file and add it to the context,avoid duplicate parsing
func (p *Context) processFile(path string) error {
if debugParse {
log.Println("processFile: path", path)
fmt.Fprintln(os.Stderr, "processFile: path", path)
}
for _, entry := range p.Files {
if entry.Path == path {
if debugParse {
log.Println("processFile: already parsed", path)
fmt.Fprintln(os.Stderr, "processFile: already parsed", path)
}
return nil
}
@@ -76,7 +77,7 @@ func (p *Context) processFile(path string) error {
func (p *Context) parseFile(path string) ([]*FileEntry, error) {
if debugParse {
log.Println("parseFile: path", path)
fmt.Fprintln(os.Stderr, "parseFile: path", path)
}
converter, err := NewConverter(&clangutils.Config{
File: path,