Merge pull request #1724 from xushiwei/t

ParseFSFiles fix: support SaveAbsFile flag
goplus · Feb 12, 2024 · feeec64 · feeec64
2 parents 8a921c7 + 8c67726
commit feeec64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/parser/parser_gop.go b/parser/parser_gop.go
@@ -263,7 +263,14 @@ func ParseFiles(fset *token.FileSet, files []string, mode Mode) (map[string]*ast
 
 func ParseFSFiles(fset *token.FileSet, fs FileSystem, files []string, mode Mode) (map[string]*ast.Package, error) {
 	ret := map[string]*ast.Package{}
+	fabs := (mode & SaveAbsFile) != 0
+	if fabs {
+		mode &^= SaveAbsFile
+	}
 	for _, file := range files {
+		if fabs {
+			file, _ = fs.Abs(file)
+		}
 		f, err := ParseFSFile(fset, fs, file, nil, mode)
 		if err != nil {
 			return nil, err

diff --git a/parser/parserdir_test.go b/parser/parserdir_test.go
@@ -25,6 +25,7 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/goplus/gop/parser/fsx"
 	"github.com/goplus/gop/parser/fsx/memfs"
 	"github.com/goplus/gop/parser/parsertest"
 	"github.com/goplus/gop/scanner"
@@ -68,7 +69,7 @@ func TestReadSource(t *testing.T) {
 
 func TestParseFiles(t *testing.T) {
 	fset := token.NewFileSet()
-	if _, err := ParseFiles(fset, []string{"/foo/bar/not-exists"}, PackageClauseOnly); err == nil {
+	if _, err := ParseFSFiles(fset, fsx.Local, []string{"/foo/bar/not-exists"}, PackageClauseOnly|SaveAbsFile); err == nil {
 		t.Fatal("ParseFiles failed: no error?")
 	}
 }