Merge pull request #1671 from xushiwei/class

ast.Walk: support OverloadFuncDecl
goplus · Jan 26, 2024 · 182883e · 182883e
2 parents 2c25669 + 4b1428b
commit 182883e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/ast/walk.go b/ast/walk.go
@@ -98,9 +98,18 @@ func Walk(v Visitor, node Node) {
 		}
 
 	// Expressions
-	case *BadExpr, *Ident, *BasicLit:
+	case *BadExpr, *Ident:
 		// nothing to do
 
+	case *BasicLit:
+		if n.Extra != nil { // Go+ extended
+			for _, part := range n.Extra.Parts {
+				if e, ok := part.(Expr); ok {
+					Walk(v, e)
+				}
+			}
+		}
+
 	case *Ellipsis:
 		if n.Elt != nil {
 			Walk(v, n.Elt)
@@ -377,7 +386,7 @@ func Walk(v Visitor, node Node) {
 			Walk(v, f)
 		}
 
-	// Go+ expr and stmt
+	// Go+ extended expr and stmt
 	case *SliceLit:
 		walkExprList(v, n.Elts)
 
@@ -433,6 +442,16 @@ func Walk(v Visitor, node Node) {
 			Walk(v, n.Default)
 		}
 
+	case *OverloadFuncDecl:
+		if n.Doc != nil {
+			Walk(v, n.Doc)
+		}
+		if n.Recv != nil {
+			Walk(v, n.Recv)
+		}
+		Walk(v, n.Name)
+		walkExprList(v, n.Funcs)
+
 	default:
 		panic(fmt.Sprintf("ast.Walk: unexpected node type %T", n))
 	}

diff --git a/cl/expr.go b/cl/expr.go
@@ -1175,7 +1175,7 @@ func compileErrWrapExpr(ctx *blockCtx, v *ast.ErrWrapExpr, inFlags int) {
 			retName = "_gop_ret" + strconv.Itoa(i+1)
 		}
 	}
-	sig := types.NewSignature(nil, nil, types.NewTuple(ret...), false)
+	sig := types.NewSignatureType(nil, nil, nil, nil, types.NewTuple(ret...), false)
 	if useClosure {
 		cb.NewClosureWith(sig).BodyStart(pkg)
 	} else {

diff --git a/parser/interface.go b/parser/interface.go
@@ -46,12 +46,15 @@ const (
 	AllErrors = Mode(goparser.AllErrors)
 	// SkipObjectResolution - don't resolve identifiers to objects - see ParseFile
 	SkipObjectResolution = Mode(goparser.SkipObjectResolution)
+
 	// ParseGoAsGoPlus - parse Go files by gop/parser
 	ParseGoAsGoPlus Mode = 1 << 16
 	// ParserGoPlusClass - parse Go+ classfile by gop/parser
 	ParseGoPlusClass Mode = 1 << 17
 	// SaveAbsFile - parse and save absolute path to pkg.Files
 	SaveAbsFile Mode = 1 << 18
+
+	goReservedFlags Mode = ((1 << 16) - 1)
 )
 
 // -----------------------------------------------------------------------------

diff --git a/parser/parser_gop.go b/parser/parser_gop.go
@@ -161,7 +161,7 @@ func ParseFSDir(fset *token.FileSet, fs FileSystem, dir string, conf Config) (pk
 			filename := fs.Join(dir, fname)
 			if useGoParser {
 				if filedata, err := fs.ReadFile(filename); err == nil {
-					if src, err := goparser.ParseFile(fset, filename, filedata, goparser.Mode(conf.Mode)); err == nil {
+					if src, err := goparser.ParseFile(fset, filename, filedata, goparser.Mode(conf.Mode&goReservedFlags)); err == nil {
 						pkg := reqPkg(pkgs, src.Name.Name)
 						if pkg.GoFiles == nil {
 							pkg.GoFiles = make(map[string]*goast.File)