Merge pull request #2361 from goplus/main

v1.4.6

Author: xushiwei

.github/codecov.yml

@@ -20,6 +20,7 @@ coverage:
     - "cl/internal/spx3"
     - "cl/internal/test"
     - "cl/internal/unit"
+    - "cl/internal/typesalias"
     - "parser/fsx"
     - "parser/parsertest"
     - "x/jsonrpc2"

.github/workflows/release-build.yml

@@ -57,7 +57,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.24.x
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3

README.md

@@ -76,6 +76,7 @@ Code style is just the first step. We have made many efforts to make the code mo
 | package main<br><br>import "fmt"<br><br>func main() {<br>&nbsp;&nbsp;&nbsp;&nbsp;fmt.Println("Hi")<br>} | import "fmt"<br><br>fmt.Println("Hi")<br> | Program structure: Go+ allows omitting `package main` and `func main` |
 | fmt.Println("Hi") | echo("Hi") | More builtin functions: It simplifies the expression of the most common tasks |
 | fmt.Println("Hi") | echo "Hi" | Command-line style code: It reduces the number of parentheses in the code as much as possible, making it closer to natural language |
+| name := "Ken"<br>fmt.Printf(<br>&nbsp;&nbsp;"Hi %s\n", name) | name := "Ken"<br>echo "Hi ${name}" | [Goodbye printf](doc/goodbye-printf.md), use `${expr}` in string literals |
 | a := []int{1, 2, 3} | a := [1, 2, 3] | List literals |
 | a = append(a, 4)<br>a = append(a, 5, 6, 7) | a <- 4<br>a <- 5, 6, 7 | Append values to a list |
 | a := map[string]int{<br>&nbsp;&nbsp;&nbsp;&nbsp;"Monday": 1,<br>&nbsp;&nbsp;&nbsp;&nbsp;"Tuesday": 2,<br>} | a := {<br>&nbsp;&nbsp;&nbsp;&nbsp;"Monday": 1,<br>&nbsp;&nbsp;&nbsp;&nbsp;"Tuesday": 2,<br>} | Mapping literals |

ast/ast.go

@@ -427,7 +427,18 @@ func (x *ChanType) Pos() token.Pos { return x.Begin }
 func (x *BadExpr) End() token.Pos { return x.To }
 
 // End returns position of first character immediately after the node.
-func (x *Ident) End() token.Pos { return token.Pos(int(x.NamePos) + len(x.Name)) }
+func (x *Ident) End() token.Pos {
+	if x.Implicit() { // implicitly declared
+		return x.NamePos
+	}
+	return x.NamePos + token.Pos(len(x.Name))
+}
+
+// Implicit reports whether the identifier was implicitly declared
+func (x *Ident) Implicit() bool {
+	o := x.Obj
+	return o != nil && o.Kind >= implicitBase
+}
 
 // End returns position of first character immediately after the node.
 func (x *Ellipsis) End() token.Pos {
@@ -542,6 +553,11 @@ func (*ChanType) exprNode()      {}
 // Useful for ASTs generated by code other than the Go+ parser.
 func NewIdent(name string) *Ident { return &Ident{token.NoPos, name, nil} }
 
+// NewIdentEx creates a new Ident with position and with the given kind.
+func NewIdentEx(pos token.Pos, name string, kind ObjKind) *Ident {
+	return &Ident{pos, name, NewObj(kind, name)}
+}
+
 // IsExported reports whether name starts with an upper-case letter.
 func IsExported(name string) bool { return token.IsExported(name) }
 
@@ -1084,7 +1100,6 @@ func (*FuncDecl) declNode() {}
 // collectively building a Go+ package.
 type Package struct {
 	Name    string               // package name
-	Scope   *Scope               // package scope across all files
 	Imports map[string]*Object   // map of package id -> package object
 	Files   map[string]*File     // Go+ source files by filename
 	GoFiles map[string]*ast.File // Go source files by filename

ast/ast_gop.go

@@ -471,9 +471,7 @@ type File struct {
 	Name    *Ident        // package name
 	Decls   []Decl        // top-level declarations; or nil
 
-	Scope       *Scope          // package scope (this file only)
 	Imports     []*ImportSpec   // imports in this file
-	Unresolved  []*Ident        // unresolved identifiers in this file
 	Comments    []*CommentGroup // list of all comments in the source file
 	Code        []byte
 	ShadowEntry *FuncDecl // indicate the module entry point.

ast/filter.go

@@ -499,7 +499,7 @@ func MergePackageFiles(pkg *Package, mode MergeMode) *File {
 
 	// TODO(gri) need to compute unresolved identifiers!
 	return &File{
-		doc, pos, NewIdent(pkg.Name), decls, pkg.Scope,
-		imports, nil, comments, nil, nil, false, false, false, false,
+		doc, pos, NewIdent(pkg.Name), decls,
+		imports, comments, nil, nil, false, false, false, false,
 	}
 }

ast/resolve.go

@@ -18,6 +18,7 @@
 
 package ast
 
+/* TODO(xsw): remove
 import (
 	"fmt"
 	"strconv"
@@ -184,3 +185,4 @@ func NewPackage(fset *token.FileSet, files map[string]*File, importer Importer,
 	p.errors.Sort()
 	return &Package{pkgName, pkgScope, imports, files, nil}, p.errors.Err()
 }
+*/

ast/scope.go

@@ -154,6 +154,10 @@ const (
 	Var                // variable
 	Fun                // function or method
 	Lbl                // label
+	implicitBase
+
+	ImplicitPkg = ObjKind(implicitBase)
+	ImplicitFun = ObjKind(implicitBase + 1)
 )
 
 var objKindStrings = [...]string{
@@ -164,6 +168,9 @@ var objKindStrings = [...]string{
 	Var: "var",
 	Fun: "func",
 	Lbl: "label",
+
+	ImplicitPkg: "package",
+	ImplicitFun: "func",
 }
 
 func (kind ObjKind) String() string { return objKindStrings[kind] }

cl/builtin.go

@@ -21,6 +21,7 @@ import (
 	"go/types"
 
 	"github.com/goplus/gogen"
+	"github.com/goplus/gop/cl/internal/typesalias"
 )
 
 // -----------------------------------------------------------------------------
@@ -81,7 +82,7 @@ const (
 	osxPkgPath = "github.com/qiniu/x/gop/osx"
 )
 
-func newBuiltinDefault(pkg *gogen.Package, conf *gogen.Config) *types.Package {
+func (ctx *pkgCtx) newBuiltinDefault(pkg *gogen.Package, conf *gogen.Config) *types.Package {
 	builtin := types.NewPackage("", "")
 	fmt := pkg.TryImport("fmt")
 	os := pkg.TryImport("os")
@@ -95,9 +96,12 @@ func newBuiltinDefault(pkg *gogen.Package, conf *gogen.Config) *types.Package {
 	pkg.TryImport("strings")
 	if ng.Types != nil {
 		initMathBig(pkg, conf, ng)
-		if obj := ng.Types.Scope().Lookup("Gop_ninteger"); obj != nil {
-			if _, ok := obj.Type().(*types.Basic); !ok {
-				conf.EnableTypesalias = true
+		if typesalias.Support {
+			if obj := ng.Types.Scope().Lookup("Gop_ninteger"); obj != nil {
+				if _, ok := obj.Type().(*types.Basic); !ok {
+					conf.EnableTypesalias = true
+					ctx.featTypesAlias = true
+				}
 			}
 		}
 	}

cl/classfile.go

@@ -516,11 +516,12 @@ func gmxProjMain(pkg *gogen.Package, parent *pkgCtx, proj *gmxProject) {
 			mainFn := stk.Pop()
 			sigParams := mainFn.Type.(*types.Signature).Params()
 			callMain := func() {
+				src := parent.lookupClassNode(proj.gameClass_)
 				stk.Push(mainFn)
 				if _, isPtr := sigParams.At(0).Type().(*types.Pointer); isPtr {
-					cb.Val(recv).MemberRef(base.Name()).UnaryOp(gotoken.AND)
+					cb.Val(recv, src).MemberRef(base.Name()).UnaryOp(gotoken.AND)
 				} else {
-					cb.Val(recv) // template recv method
+					cb.Val(recv, src) // template recv method
 				}
 			}
 
@@ -531,15 +532,15 @@ func gmxProjMain(pkg *gogen.Package, parent *pkgCtx, proj *gmxProject) {
 				if len(sprites) == 1 && sprites[0].proto == "" { // no work class prototype
 					sp := sprites[0]
 					narg = 1 + len(sp.types)
-					genWorkClasses(pkg, cb, recv, sp, iobj, -1, callMain)
+					genWorkClasses(pkg, parent, cb, recv, sp, iobj, -1, callMain)
 				} else {
 					lstNames := make([]string, narg)
 					for i := 1; i < narg; i++ {
 						tslice := sigParams.At(i).Type()
 						tn := tslice.(*types.Slice).Elem().(*types.Named)
 						sp := spriteByProto(sprites, tn.Obj().Name()) // work class
 						if n := len(sp.types); n > 0 {
-							lstNames[i] = genWorkClasses(pkg, cb, recv, sp, iobj, i, nil)
+							lstNames[i] = genWorkClasses(pkg, parent, cb, recv, sp, iobj, i, nil)
 							cb.SliceLitEx(tslice, n, false).EndInit(1)
 							iobj += n
 						}
@@ -563,7 +564,7 @@ func gmxProjMain(pkg *gogen.Package, parent *pkgCtx, proj *gmxProject) {
 }
 
 func genWorkClasses(
-	pkg *gogen.Package, cb *gogen.CodeBuilder, recv *types.Var,
+	pkg *gogen.Package, parent *pkgCtx, cb *gogen.CodeBuilder, recv *types.Var,
 	sp *spxObj, iobj, ilst int, callMain func()) (lstName string) {
 	const (
 		indexGame     = 1
@@ -588,9 +589,10 @@ func genWorkClasses(
 	} else {
 		callMain()
 	}
-	for i := range sptypes {
+	for i, spt := range sptypes {
+		src := parent.lookupClassNode(spt)
 		objName := objNamePrefix + strconv.Itoa(iobj+i)
-		cb.VarVal(objName)
+		cb.VarVal(objName, src)
 	}
 	return
 }