realdatatype bug fix

celt237 · Jul 4, 2024 · 09f0f55 · 09f0f55
1 parent 6574231
commit 09f0f55
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/annotation_test.go b/annotation_test.go
@@ -79,7 +79,7 @@ func TestAnnotation(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			CurrentAnnotationMode = tt.mode
+			currentAnnotationMode = tt.mode
 			fileParser := GetFileParser(tt.fileName)
 			fileDesc, err := fileParser.Parse()
 			if (err != nil) != tt.wantErr {

diff --git a/config.go b/config.go
@@ -2,4 +2,4 @@ package go_annotation
 
 const AnnotationPrefix = "@"
 
-var CurrentAnnotationMode = AnnotationModeArray
+var currentAnnotationMode = AnnotationModeArray
diff --git a/go-annotation.go b/go-annotation.go
@@ -2,21 +2,23 @@ package go_annotation
 
 // GetFileDesc 获取文件描述
 // fileName: 文件名
-func GetFileDesc(fileName string) (*FileDesc, error) {
+func GetFileDesc(fileName string, mode AnnotationMode) (*FileDesc, error) {
+	currentAnnotationMode = mode
 	return GetFileParser(fileName).Parse()
 }
 
 // GetFilesDescList 获取文件描述列表
 // directory: 目录
-func GetFilesDescList(directory string) ([]*FileDesc, error) {
+func GetFilesDescList(directory string, mode AnnotationMode) ([]*FileDesc, error) {
+	currentAnnotationMode = mode
 	var filesDesc []*FileDesc
 	// 读取目录下的所有文件
 	fileNames, err := GetFileNames(directory)
 	if err != nil {
 		return nil, err
 	}
 	for _, fileName := range fileNames {
-		fileDesc, err := GetFileDesc(fileName)
+		fileDesc, err := GetFileParser(fileName).Parse()
 		if err != nil {
 			return nil, err
 		}

diff --git a/interfaceParser.go b/interfaceParser.go
@@ -51,7 +51,7 @@ func (s *InterfaceParser) Parse() (*InterfaceDesc, error) {
 		Methods:     methods,
 		Imports:     s.parserImports(methods),
 		Comments:    comments,
-		Annotations: getAnnotationParser(CurrentAnnotationMode).Parse(comments),
+		Annotations: getAnnotationParser(currentAnnotationMode).Parse(comments),
 	}
 	return sDesc, nil
 }
@@ -105,7 +105,7 @@ func (s *InterfaceParser) parserMethod(method *ast.Field) (methodDesc *MethodDes
 		// comment
 		methodDesc.Comments = parseAtComments(method.Doc)
 		methodDesc.Description = parseDescription(methodDesc.Name, method.Doc)
-		methodDesc.Annotations = getAnnotationParser(CurrentAnnotationMode).Parse(methodDesc.Comments)
+		methodDesc.Annotations = getAnnotationParser(currentAnnotationMode).Parse(methodDesc.Comments)
 		return methodDesc, err
 	} else {
 		err = fmt.Errorf("method type is not funcType")

diff --git a/structParser.go b/structParser.go
@@ -50,7 +50,7 @@ func (s *StructParser) Parse() (*StructDesc, error) {
 		Methods:     methods,
 		Imports:     s.parserImports(methods),
 		Comments:    comments,
-		Annotations: getAnnotationParser(CurrentAnnotationMode).Parse(comments),
+		Annotations: getAnnotationParser(currentAnnotationMode).Parse(comments),
 	}
 	return sDesc, nil
 }
@@ -103,7 +103,7 @@ func (s *StructParser) parserMethod(method *ast.FuncDecl) (methodDesc *MethodDes
 	// comment
 	methodDesc.Comments = parseAtComments(method.Doc)
 	methodDesc.Description = parseDescription(methodDesc.Name, method.Doc)
-	methodDesc.Annotations = getAnnotationParser(CurrentAnnotationMode).Parse(methodDesc.Comments)
+	methodDesc.Annotations = getAnnotationParser(currentAnnotationMode).Parse(methodDesc.Comments)
 	return methodDesc, err
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ package go_annotation

		const AnnotationPrefix = "@"

		var CurrentAnnotationMode = AnnotationModeArray
		var currentAnnotationMode = AnnotationModeArray