set all DbgFlagAll to 0

Author: tsingbx

_xtool/llcppsigfetch/dbg/debug.go

@@ -11,7 +11,7 @@ const (
 	DbgGetCurFile
 	DbgMacro
 	DbgFileType
-	DbgFlagAll = DbgParse
+	DbgFlagAll = 0
 )
 
 func SetDebugParse() {

_xtool/llcppsigfetch/llcppsigfetch.go

@@ -43,9 +43,6 @@ func main() {
 		printUsage()
 		return
 	}
-	if ags.VerboseSigfetchParse {
-		dbg.SetDebugParse()
-	}
 	if ags.Verbose {
 		dbg.SetDebugAll()
 	}

_xtool/llcppsymg/args/args.go

@@ -6,12 +6,10 @@ import (
 )
 
 type Args struct {
-	Help                 bool
-	Verbose              bool
-	VerboseSigfetchParse bool //-vsp llcppsigfetch parse.go
-	VerboseParseIsMethod bool //-vpim
-	UseStdin             bool
-	CfgFile              string
+	Help     bool
+	Verbose  bool
+	UseStdin bool
+	CfgFile  string
 }
 
 func ParseArgs(args []string, defaultCfgFile string, swflags map[string]bool) (*Args, []string) {
@@ -27,12 +25,6 @@ func ParseArgs(args []string, defaultCfgFile string, swflags map[string]bool) (*
 			case "-v":
 				result.Verbose = true
 				continue
-			case "-vpim":
-				result.VerboseParseIsMethod = true
-				continue
-			case "-vsp":
-				result.VerboseSigfetchParse = true
-				continue
 			case "-":
 				result.UseStdin = true
 				continue

_xtool/llcppsymg/dbg/debug.go

@@ -12,9 +12,13 @@ const (
 	DbgCollectFuncInfo
 	DbgNewSymbol
 	DbgFileType
-	DbgFlagAll = DbgSymbol | DbgParseIsMethod
+	DbgFlagAll = 0
 )
 
+func SetDebugAll() {
+	flags = DbgFlagAll
+}
+
 func SetDebugSymbol() {
 	flags |= DbgSymbol
 }

_xtool/llcppsymg/dbg/debug_test.go

@@ -129,3 +129,21 @@ func TestSetDebugFileType(t *testing.T) {
 		})
 	}
 }
+
+func TestSetDebugAll(t *testing.T) {
+	tests := []struct {
+		name string
+	}{
+		{
+			name: "TestSetDebugAll",
+		}
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			SetDebugAll()
+			if dbgFlags != DbgFlagAll {
+				t.Errorf("dbgFlags = %v, want %v", dbgFlags, DbgFlagAll)
+			}
+		})
+	}
+}

_xtool/llcppsymg/llcppsymg.go

@@ -51,12 +51,8 @@ func main() {
 	check(err)
 	defer conf.Delete()
 
-	if ags.VerboseParseIsMethod {
-		dbg.SetDebugParseIsMethod()
-	}
-
 	if ags.Verbose {
-		dbg.SetDebugSymbol()
+		dbg.SetDebugAll()
 		if ags.UseStdin {
 			fmt.Println("Config From Stdin")
 		} else {

cmd/gogensig/dbg/debug.go

@@ -12,7 +12,7 @@ const (
 	DbgNew
 	DbgWrite
 	DbgUnmarshalling
-	DbgFlagAll = 0 | DbgError | DbgLog
+	DbgFlagAll = 0
 )
 
 func SetDebugSymbolNotFound() {

cmd/gogensig/unmarshal/unmarshal.go

@@ -3,10 +3,12 @@ package unmarshal
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"os"
 	"reflect"
 
 	"github.com/goplus/llcppg/ast"
+	"github.com/goplus/llcppg/cmd/gogensig/dbg"
 	"github.com/goplus/llcppg/llcppg"
 )
 
@@ -667,7 +669,10 @@ func File(data []byte) (ast.Node, error) {
 	for i, declData := range fileData.Decls {
 		declNode, err := Node(declData)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "error unmarshalling %d Decl in File: %v\n%s\n", i, err, string(declData))
+			fmt.Fprintf(os.Stderr, "error unmarshalling %d Decl err: %v\n", i, err)
+			if dbg.GetDebugUnmarshalling() {
+				log.Println(string(declData))
+			}
 			continue
 		}
 		decl, ok := declNode.(ast.Decl)

cmd/gogensig/unmarshal/unmarshal_test.go

@@ -2,10 +2,14 @@ package unmarshal_test
 
 import (
 	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
 	"strings"
 	"testing"
 
 	"github.com/goplus/llcppg/ast"
+	"github.com/goplus/llcppg/cmd/gogensig/dbg"
 	"github.com/goplus/llcppg/cmd/gogensig/unmarshal"
 	"github.com/goplus/llcppg/llcppg"
 )
@@ -1799,3 +1803,36 @@ func TestUnmarshalPkgErrors(t *testing.T) {
 		})
 	}
 }
+
+func TestTestUnmarshalLog(t *testing.T) {
+	dbg.SetDebugUnmarshalling()
+	tmpDir, err := os.MkdirTemp(os.TempDir(), "isl")
+	if err != nil {
+		t.Error(err)
+	}
+	defer func() {
+		err = os.RemoveAll(tmpDir)
+		if err != nil {
+			t.Error(err)
+		}
+	}()
+	runCommandInDir(tmpDir, func(err error) {
+		runCommandInDir(tmpDir, func(err error) {
+			runCommandInDir(tmpDir, func(err error) {
+				fmt.Println("done")
+			}, "llcppg")
+		}, "llcppcfg", "gettext")
+	}, "go", "mod", "init", "gettext")
+}
+
+func runCommandInDir(dir string, done func(error), name string, args ...string) {
+	cmd := exec.Command(name, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stderr = os.Stderr
+	cmd.Stdout = os.Stdout
+	cmd.Dir = dir
+	err := cmd.Run()
+	if done != nil {
+		done(err)
+	}
+}