Merge pull request #1597 from xushiwei/emb

support var document (eg. //go:embed)
goplus · Jan 6, 2024 · 7b32e03 · 7b32e03
2 parents d6b48e1 + 713ffd6
commit 7b32e03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cl/compile.go b/cl/compile.go
@@ -994,7 +994,7 @@ func preloadFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, gopFil
 							vSpec = nil
 							old, _ := p.SetCurFile(goFile, true)
 							defer p.RestoreCurFile(old)
-							loadVars(ctx, v, true)
+							loadVars(ctx, v, d.Doc, true)
 							removeNames(syms, v.Names)
 						}
 					})
@@ -1224,7 +1224,7 @@ func loadConsts(ctx *blockCtx, cdecl *gox.ConstDefs, v *ast.ValueSpec, iotav int
 	defNames(ctx, v.Names, nil)
 }
 
-func loadVars(ctx *blockCtx, v *ast.ValueSpec, global bool) {
+func loadVars(ctx *blockCtx, v *ast.ValueSpec, doc *ast.CommentGroup, global bool) {
 	var typ types.Type
 	if v.Type != nil {
 		typ = toType(ctx, v.Type)
@@ -1239,7 +1239,8 @@ func loadVars(ctx *blockCtx, v *ast.ValueSpec, global bool) {
 	} else {
 		scope = ctx.cb.Scope()
 	}
-	varDecl := ctx.pkg.NewVarEx(scope, v.Names[0].Pos(), typ, names...)
+	varDefs := ctx.pkg.NewVarDefs(scope).SetComments(doc)
+	varDecl := varDefs.New(v.Names[0].Pos(), typ, names...)
 	if nv := len(v.Values); nv > 0 {
 		cb := varDecl.InitStart(ctx.pkg)
 		if enableRecover {

diff --git a/cl/stmt.go b/cl/stmt.go
@@ -828,7 +828,7 @@ func compileDeclStmt(ctx *blockCtx, expr *ast.DeclStmt) {
 		case token.VAR:
 			for _, spec := range d.Specs {
 				v := spec.(*ast.ValueSpec)
-				loadVars(ctx, v, false)
+				loadVars(ctx, v, d.Doc, false)
 			}
 		default:
 			log.Panicln("TODO: compileDeclStmt - unknown")