Merge pull request #1722 from xushiwei/t

testdata/gop-sample
goplus · Feb 11, 2024 · d8b054e · d8b054e
2 parents a461aff + 0ce9a04
commit d8b054e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 13 deletions.
diff --git a/cl/expr.go b/cl/expr.go
@@ -120,11 +120,6 @@ func compileIdent(ctx *blockCtx, ident *ast.Ident, flags int) (pkg gox.PkgRef, k
 		goto find
 	}
 
-	// function alias
-	if compileFuncAlias(ctx, scope, ident, flags) {
-		return
-	}
-
 	// pkgRef object
 	if (flags & clIdentSelectorExpr) != 0 {
 		if name == "C" && len(ctx.clookups) > 0 {
@@ -139,6 +134,11 @@ func compileIdent(ctx *blockCtx, ident *ast.Ident, flags int) (pkg gox.PkgRef, k
 		}
 	}
 
+	// function alias
+	if compileFuncAlias(ctx, scope, ident, flags) {
+		return
+	}
+
 	// object from import . "xxx"
 	if compilePkgRef(ctx, gox.PkgRef{}, ident, flags, objPkgRef) {
 		return

diff --git a/testdata/__gop-sample/go.mod b/testdata/__gop-sample/go.mod
diff --git a/testdata/__gop-sample/a.gop → testdata/gop-sample/a.gop b/testdata/__gop-sample/a.gop → testdata/gop-sample/a.gop
diff --git a/testdata/__gop-sample/b.gop → testdata/gop-sample/b.gop b/testdata/__gop-sample/b.gop → testdata/gop-sample/b.gop
diff --git a/testdata/__gop-sample/cpkag/b/ab.gop → testdata/gop-sample/cpkag/b/ab.gop b/testdata/__gop-sample/cpkag/b/ab.gop → testdata/gop-sample/cpkag/b/ab.gop
diff --git a/testdata/__gop-sample/gop.mod → testdata/gop-sample/go.mod b/testdata/__gop-sample/gop.mod → testdata/gop-sample/go.mod
@@ -1,5 +1,3 @@
 module gop-sample
 
-go 1.21
-
-gop 1.1
+go 1.18
diff --git a/testdata/__gop-sample/go.sum → testdata/gop-sample/go.sum b/testdata/__gop-sample/go.sum → testdata/gop-sample/go.sum