symMap field of llcppg.cfg support -

Author: tsingbx

_demo/cjsondemo/demo.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/goplus/llgo/c"
-	cjson "github.com/goplus/llpkg/cjson"
+	"github.com/goplus/llpkg/cjson"
 )
 
 func main() {

_xtool/llcppsigfetch/dbg/debug.go

@@ -5,8 +5,9 @@ type dbgFlags = int
 var flags dbgFlags
 
 const (
-	DbgParse   dbgFlags = 1 << iota
-	DbgFlagAll          = DbgParse
+	DbgParse dbgFlags = 1 << iota
+	DbgVisitTop
+	DbgFlagAll = DbgParse
 )
 
 func SetDebugParse() {
@@ -20,3 +21,11 @@ func GetDebugParse() bool {
 func SetDebugAll() {
 	flags = DbgFlagAll
 }
+
+func SetDebugVisitTop() {
+	flags |= DbgVisitTop
+}
+
+func GetDebugVisitTop() bool {
+	return flags&DbgVisitTop != 0
+}

_xtool/llcppsigfetch/parse/cvt.go

@@ -229,7 +229,9 @@ func (ct *Converter) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResul
 	inFile := ct.InFile(cursor)
 
 	name := toStr(cursor.String())
-	ct.logf("visitTop: Cursor: %s\n", name)
+	if dbg.GetDebugVisitTop() {
+		ct.logf("visitTop: Cursor: %s\n", name)
+	}
 
 	if !inFile {
 		return clang.ChildVisit_Continue
@@ -243,17 +245,23 @@ func (ct *Converter) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResul
 			return clang.ChildVisit_Continue
 		}
 		ct.Pkg.File.Includes = append(ct.Pkg.File.Includes, include)
-		ct.logln("visitTop: ProcessInclude END ", include.Path)
+		if dbg.GetDebugVisitTop() {
+			ct.logln("visitTop: ProcessInclude END ", include.Path)
+		}
 	case clang.CursorMacroDefinition:
 		macro := ct.ProcessMacro(cursor)
 		if cursor.IsMacroBuiltin() == 0 {
 			ct.Pkg.File.Macros = append(ct.Pkg.File.Macros, macro)
 		}
-		ct.logln("visitTop: ProcessMacro END ", macro.Name, "Tokens Length:", len(macro.Tokens))
+		if dbg.GetDebugVisitTop() {
+			ct.logln("visitTop: ProcessMacro END ", macro.Name, "Tokens Length:", len(macro.Tokens))
+		}
 	case clang.CursorEnumDecl:
 		enum := ct.ProcessEnumDecl(cursor)
 		ct.Pkg.File.Decls = append(ct.Pkg.File.Decls, enum)
-		ct.logf("visitTop: ProcessEnumDecl END")
+		if dbg.GetDebugVisitTop() {
+			ct.logf("visitTop: ProcessEnumDecl END")
+		}
 		if enum.Name != nil {
 			ct.logln(enum.Name.Name)
 		} else {
@@ -264,11 +272,15 @@ func (ct *Converter) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResul
 		classDecl := ct.ProcessClassDecl(cursor)
 		ct.Pkg.File.Decls = append(ct.Pkg.File.Decls, classDecl)
 		// class havent anonymous situation
-		ct.logln("visitTop: ProcessClassDecl END", classDecl.Name.Name)
+		if dbg.GetDebugVisitTop() {
+			ct.logln("visitTop: ProcessClassDecl END", classDecl.Name.Name)
+		}
 	case clang.CursorStructDecl:
 		structDecl := ct.ProcessStructDecl(cursor)
 		ct.Pkg.File.Decls = append(ct.Pkg.File.Decls, structDecl)
-		ct.logf("visitTop: ProcessStructDecl END")
+		if dbg.GetDebugVisitTop() {
+			ct.logf("visitTop: ProcessStructDecl END")
+		}
 		if structDecl.Name != nil {
 			ct.logln(structDecl.Name.Name)
 		} else {
@@ -277,7 +289,9 @@ func (ct *Converter) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResul
 	case clang.CursorUnionDecl:
 		unionDecl := ct.ProcessUnionDecl(cursor)
 		ct.Pkg.File.Decls = append(ct.Pkg.File.Decls, unionDecl)
-		ct.logf("visitTop: ProcessUnionDecl END")
+		if dbg.GetDebugVisitTop() {
+			ct.logf("visitTop: ProcessUnionDecl END")
+		}
 		if unionDecl.Name != nil {
 			ct.logln(unionDecl.Name.Name)
 		} else {
@@ -288,14 +302,18 @@ func (ct *Converter) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResul
 		// Example: void MyClass::myMethod() { ... } out-of-class method
 		funcDecl := ct.ProcessFuncDecl(cursor)
 		ct.Pkg.File.Decls = append(ct.Pkg.File.Decls, funcDecl)
-		ct.logln("visitTop: ProcessFuncDecl END", funcDecl.Name.Name, funcDecl.MangledName, "isStatic:", funcDecl.IsStatic, "isInline:", funcDecl.IsInline)
+		if dbg.GetDebugVisitTop() {
+			ct.logln("visitTop: ProcessFuncDecl END", funcDecl.Name.Name, funcDecl.MangledName, "isStatic:", funcDecl.IsStatic, "isInline:", funcDecl.IsInline)
+		}
 	case clang.CursorTypedefDecl:
 		typedefDecl := ct.ProcessTypeDefDecl(cursor)
 		if typedefDecl == nil {
 			return clang.ChildVisit_Continue
 		}
 		ct.Pkg.File.Decls = append(ct.Pkg.File.Decls, typedefDecl)
-		ct.logln("visitTop: ProcessTypeDefDecl END", typedefDecl.Name.Name)
+		if dbg.GetDebugVisitTop() {
+			ct.logln("visitTop: ProcessTypeDefDecl END", typedefDecl.Name.Name)
+		}
 	case clang.CursorNamespace:
 		clangutils.VisitChildren(cursor, ct.visitTop)
 	}

_xtool/llcppsymg/_cmptest/symg_test/cjson/llcppg.cfg

@@ -8,6 +8,7 @@
 	"cplusplus": false,
 	"symMap": {
 		"cJSON_AddArrayToObject":".AddArrayToObj",
-		"cJSON_AddBoolToObject":"AddBoolToObj"
+		"cJSON_AddBoolToObject":"AddBoolToObj",
+		"cJSON_AddNumberToObject":"-"
 	}
 }

_xtool/llcppsymg/_cmptest/symg_test/symg.go

@@ -55,6 +55,7 @@ func TestParseHeaderFile() {
 				"cJSON_Delete",
 				"cJSON_AddArrayToObject",
 				"cJSON_AddBoolToObject",
+				"cJSON_AddNumberToObject",
 			},
 		},
 		{

_xtool/llcppsymg/dbg/debug.go

@@ -8,6 +8,7 @@ const (
 	DbgSymbol        dbgFlags = 1 << iota
 	DbgParseIsMethod          //print parse.go isMethod debug log info
 	DbgEditSymMap             //print user edit sym map info
+	DbgVisitTop               //print visitTop
 	DbgFlagAll       = DbgSymbol | DbgParseIsMethod
 )
 
@@ -34,3 +35,11 @@ func SetDebugEditSymMap() {
 func GetDebugEditSymMap() bool {
 	return flags&DbgEditSymMap != 0
 }
+
+func SetDebugVisitTop() {
+	flags |= DbgVisitTop
+}
+
+func GetDebugVisitTop() bool {
+	return flags&DbgVisitTop != 0
+}

_xtool/llcppsymg/parse/parse.go

@@ -207,6 +207,7 @@ func (p *SymbolProcessor) userEditGoName(manglingName string) (goName string, is
 func (p *SymbolProcessor) genGoName(cursor clang.Cursor, mangleName string) string {
 
 	edittedGoName, isEdittedGoName, isEdittedMethodName := p.userEditGoName(mangleName)
+
 	if dbg.GetDebugEditSymMap() && isEdittedGoName {
 		fmt.Println("edittedGoName:", edittedGoName)
 		fmt.Println("isEdittedGoName", isEdittedGoName)
@@ -295,16 +296,22 @@ func (p *SymbolProcessor) collectFuncInfo(cursor clang.Cursor) {
 		return
 	}
 
+	// ignore
+	goName := p.genGoName(cursor, manglingName)
+	if goName == "-" || len(goName) == 0 {
+		return
+	}
+
 	p.SymbolMap[manglingName] = &SymbolInfo{
-		GoName:    p.genGoName(cursor, manglingName),
+		GoName:    goName,
 		ProtoName: p.genProtoName(cursor),
 	}
 }
 
 func (p *SymbolProcessor) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResult {
 	filename := clang.GoString(cursor.Location().File().FileName())
 	if _, ok := p.processedFiles[filename]; ok {
-		if dbg.GetDebugSymbol() {
+		if dbg.GetDebugVisitTop() && p.isSelfFile(filename) {
 			fmt.Printf("visitTop: %s has been processed: \n", filename)
 		}
 		return clang.ChildVisit_Continue
@@ -313,7 +320,7 @@ func (p *SymbolProcessor) visitTop(cursor, parent clang.Cursor) clang.ChildVisit
 		return clang.ChildVisit_Continue
 	}
 	p.processingFiles[filename] = struct{}{}
-	if dbg.GetDebugSymbol() && filename != "" {
+	if dbg.GetDebugVisitTop() && p.isSelfFile(filename) {
 		fmt.Printf("visitTop: %s\n", filename)
 	}
 	switch cursor.Kind {
@@ -334,20 +341,20 @@ func (p *SymbolProcessor) collect(cfg *clangutils.Config) error {
 		filename = clangutils.TEMP_FILE
 	}
 	if _, ok := p.processedFiles[filename]; ok {
-		if dbg.GetDebugSymbol() {
+		if dbg.GetDebugSymbol() && p.isSelfFile(filename) {
 			fmt.Printf("%s has been processed: \n", filename)
 		}
 		return nil
 	}
-	if dbg.GetDebugSymbol() {
+	if dbg.GetDebugSymbol() && p.isSelfFile(filename) {
 		fmt.Printf("create translation unit: \nfile:%s\nIsCpp:%v\nTemp:%v\nArgs:%v\n", filename, cfg.IsCpp, cfg.Temp, cfg.Args)
 	}
 	_, unit, err := clangutils.CreateTranslationUnit(cfg)
 	if err != nil {
 		return errors.New("Unable to parse translation unit for file " + filename)
 	}
 	cursor := unit.Cursor()
-	if dbg.GetDebugSymbol() {
+	if dbg.GetDebugVisitTop() && p.isSelfFile(filename) {
 		fmt.Printf("%s start collect \n", filename)
 	}
 	clangutils.VisitChildren(cursor, p.visitTop)