llcppsigfetch:marco tokens & refine test

chore/_xtool/llcppsigfetch/parse/cvt.go

@@ -11,6 +11,7 @@ import (
 	"github.com/goplus/llgo/c/cjson"
 	"github.com/goplus/llgo/c/clang"
 	"github.com/goplus/llgo/chore/llcppg/ast"
+	"github.com/goplus/llgo/chore/llcppg/token"
 )
 
 type Converter struct {
@@ -322,23 +323,17 @@ func (ct *Converter) ProcessMarco(cursor clang.Cursor) {
 	tokensSlice := unsafe.Slice(tokens, int(numTokens))
 
 	macro := &ast.Macro{
-		Name: &ast.TokenInfo{
-			Token: ast.Token(tokensSlice[0].Kind()),
-			Lit:   c.GoString(ct.unit.Token(tokensSlice[0]).CStr()),
-		},
-		Body: make([]*ast.TokenInfo, 0),
+		Name:   c.GoString(name.CStr()),
+		Tokens: make([]*ast.Token, 0),
 	}
 
-	if numTokens > 1 { //have body
-		for i := 1; i < int(numTokens); i++ {
-			tok := tokensSlice[i]
-			tokStr := ct.unit.Token(tok)
-			macro.Body = append(macro.Body, &ast.TokenInfo{
-				Token: ast.Token(tok.Kind()),
-				Lit:   c.GoString(tokStr.CStr()),
-			})
-			tokStr.Dispose()
-		}
+	for _, tok := range tokensSlice {
+		tokStr := ct.unit.Token(tok)
+		macro.Tokens = append(macro.Tokens, &ast.Token{
+			Token: toToken(tok),
+			Lit:   c.GoString(tokStr.CStr()),
+		})
+		tokStr.Dispose()
 	}
 	ct.curFile.Macros = append(ct.curFile.Macros, macro)
 }
@@ -530,3 +525,11 @@ func IsExplicitUnsigned(t clang.Type) bool {
 		t.Kind == clang.TypeULong || t.Kind == clang.TypeULongLong ||
 		t.Kind == clang.TypeUInt128
 }
+
+func toToken(tok clang.Token) token.Token {
+	if tok.Kind() < clang.Punctuation || tok.Kind() > clang.Comment {
+		return token.ILLEGAL
+	} else {
+		return token.Token(tok.Kind() + 1)
+	}
+}