change symMap field of llcppg.cfg to map type

Author: tsingbx

_xtool/llcppsymg/_cmptest/config_test/config.go

@@ -118,7 +118,7 @@ func TestGenDylibPaths() {
 	tempDir := os.TempDir()
 	tempDefaultPath, err := os.MkdirTemp(tempDir, "symblib")
 	if err != nil {
-		fmt.Printf(err)
+		fmt.Println(err)
 		return
 	}
 	affix := ".dylib"

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

@@ -6,8 +6,8 @@
 	],
 	"trimPrefixes": ["cJSON_"],
 	"cplusplus": false,
-	"symMap": [
-		"cJSON_AddArrayToObject:.AddArrayToObj",
-		"cJSON_AddBoolToObject:AddBoolToObj"
-	]
+	"symMap": {
+		"cJSON_AddArrayToObject":".AddArrayToObj",
+		"cJSON_AddBoolToObject":"AddBoolToObj"
+	}
 }

_xtool/llcppsymg/config/config.go

@@ -33,9 +33,13 @@ func GetConf(data []byte) (Conf, error) {
 		TrimPrefixes: GetStringArrayItem(parsedConf, "trimPrefixes"),
 		Cplusplus:    GetBoolItem(parsedConf, "cplusplus"),
 		Mix:          GetBoolItem(parsedConf, "mix"),
-		SymMap:       GetStringArrayItem(parsedConf, "symMap"),
+		SymMap:       GetMapItem[string](parsedConf, "symMap"),
 	}
 
+	//cannot use GetMapItem[string](parsedConf, "symMap")
+	// (value of type MapType[string]) as []string value
+	// in struct literal (compile)
+
 	return Conf{
 		JSON:   parsedConf,
 		Config: config,
@@ -55,6 +59,50 @@ func GetStringItem(obj *cjson.JSON, key string, defval string) (value string) {
 	return GetString(item)
 }
 
+func GetItemValue(item *cjson.JSON) (any, bool) {
+	if item.IsArray() != 0 {
+		return item, false
+	} else if item.IsBool() != 0 {
+		if item.IsTrue() != 0 {
+			return true, true
+		}
+		return false, true
+	} else if item.IsNumber() != 0 {
+		return float64(item.GetNumberValue()), true
+	} else if item.IsObject() != 0 {
+		return item, false
+	} else if item.IsNull() != 0 {
+		return nil, false
+	} else if item.IsInvalid() != 0 {
+		return nil, false
+	} else if item.IsRaw() != 0 {
+		return item, false
+	} else if item.IsString() != 0 {
+		return GetString(item), true
+	}
+	return nil, false
+}
+
+func GetMapItem[ValueType any](obj *cjson.JSON, mapItemKey string) map[string]ValueType {
+	cStrOfMapItemKey := c.AllocaCStr(mapItemKey)
+	mapObj := obj.GetObjectItem(cStrOfMapItemKey)
+	if mapObj == nil {
+		return nil
+	}
+	m := make(map[string]ValueType)
+	for child := mapObj.Child; child != nil; child = child.Next {
+		key := c.GoString(child.String)
+		value, ok := GetItemValue(child)
+		if ok {
+			tValue, ok := value.(ValueType)
+			if ok {
+				m[key] = tValue
+			}
+		}
+	}
+	return m
+}
+
 func GetStringArrayItem(obj *cjson.JSON, key string) (value []string) {
 	item := obj.GetObjectItemCaseSensitive(c.AllocaCStr(key))
 	if item == nil {

_xtool/llcppsymg/llcppsymg.go

@@ -58,7 +58,7 @@ func main() {
 		} else {
 			fmt.Println("Config From File", ags.CfgFile)
 		}
-		fmt.Printf("%s\n", conf.String())
+		fmt.Printf("%s\n", conf.Config.String())
 	}
 
 	if err != nil {

_xtool/llcppsymg/parse/parse.go

@@ -28,17 +28,11 @@ type Config struct {
 
 func NewConfig(files, prefixes, cflags []string,
 	isCpp bool,
-	symMap []string) *Config {
-	m := make(map[string]string)
-	for _, keyVal := range symMap {
-		strs := strings.Split(keyVal, ":")
-		if len(strs) == 2 {
-			key := strings.TrimSpace(strs[0])
-			val := strings.TrimSpace(strs[1])
-			m[key] = val
-		}
+	symMap map[string]string) *Config {
+	if symMap == nil {
+		symMap = make(map[string]string)
 	}
-	return &Config{Files: files, Prefixes: prefixes, Cflags: cflags, IsCpp: isCpp, SymMap: m}
+	return &Config{Files: files, Prefixes: prefixes, Cflags: cflags, IsCpp: isCpp, SymMap: symMap}
 }
 
 func (p *Config) String() string {

cmd/llcppcfg/llcppgcfg/cfg_test.go

@@ -500,7 +500,7 @@ func TestNewLLCppConfig(t *testing.T) {
 				Cplusplus:      false,
 				Impl:           []llcppg.ImplFiles{*llcppg.NewImplFiles()},
 				KeepUnderScore: false,
-				SymMap:         []string{},
+				SymMap:         map[string]string{},
 				TypeMap:        map[string]string{},
 			},
 		},

cmd/llcppcfg/llcppgcfg/cfg_test_data/bdw-gc/llcppg.cfg

@@ -37,6 +37,6 @@
 		}
 	],
 	"mix": false,
-	"symMap": [],
+	"symMap": {},
 	"typeMap": {}
 }

cmd/llcppcfg/llcppgcfg/cfg_test_data/cjson/llcppg.cfg

@@ -20,6 +20,6 @@
 		}
 	],
 	"mix": false,
-	"symMap": [],
+	"symMap": {},
 	"typeMap": {}
 }

cmd/llcppcfg/llcppgcfg/cfg_test_data/libffi/llcppg.cfg

@@ -19,6 +19,6 @@
 		}
 	],
 	"mix": false,
-	"symMap": [],
+	"symMap": {},
 	"typeMap": {}
 }

llcppg/llcppg.go

@@ -38,12 +38,12 @@ type Config struct {
 	KeepUnderScore bool              `json:"keepUnderScore"`
 	Impl           []ImplFiles       `json:"impl"`
 	Mix            bool              `json:"mix"`
-	SymMap         []string          `json:"symMap"`
+	SymMap         map[string]string `json:"symMap"`
 	TypeMap        map[string]string `json:"typeMap"`
 }
 
 func NewDefaultConfig() *Config {
-	cfg := &Config{SymMap: make([]string, 0), TypeMap: make(map[string]string), Impl: []ImplFiles{*NewImplFiles()}}
+	cfg := &Config{SymMap: make(map[string]string), TypeMap: make(map[string]string), Impl: []ImplFiles{*NewImplFiles()}}
 	return cfg
 }