x/format: TestClassSpx

Author: visualfc

Diff for: x/format/gopclass_test.go

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package format_test
+
+import (
+	"testing"
+
+	"github.com/goplus/gop/x/format"
+)
+
+func testClass(t *testing.T, name string, pkg string, class string, entry string, src, expect string) {
+	t.Run(name, func(t *testing.T) {
+		result, err := format.GopClassSource([]byte(src), pkg, class, entry, name)
+		if err != nil {
+			t.Fatal("format.GopClassSource failed:", err)
+		}
+		if ret := string(result); ret != expect {
+			t.Fatalf("%s => Expect:\n%s\n=> Got:\n%s\n", name, expect, ret)
+		}
+	})
+}
+
+func TestClassSpx(t *testing.T) {
+	testClass(t, "spx class", "github.com/goplus/spx", "Calf", "Main", `package main
+
+type Calf struct {
+	spx.Sprite
+	*Game
+	index int
+	info  string
+}
+func (this *Calf) Update() {
+	this.index++
+}
+func (this *Calf) Main() {
+	this.OnStart(func() {
+		this.Say("Hello Go+")
+	})
+}
+func (this *Calf) Classfname() string {
+	return "Calf"
+}
+`, `var (
+	index int
+	info  string
+)
+
+func Update() {
+	index++
+}
+
+onStart func() {
+	say "Hello Go+"
+}
+`)
+}

Diff for: x/format/gopstyle.go

@@ -244,14 +244,56 @@ func formatClass(file *ast.File, pkg string, class string, entry string) {
 		classPkg:  path.Base(pkg),
 		className: class,
 	}
+	if file.Name.Name == "main" {
+		file.NoPkgDecl = true
+	}
+	var fnEntry *ast.FuncDecl
+	var decls []ast.Decl
+	var varSpecs []ast.Spec
+	for _, decl := range file.Decls {
+		switch v := decl.(type) {
+		case *ast.FuncDecl:
+			if isClassFunc(v, class) {
+				v.IsClass = true
+				switch v.Name.Name {
+				case entry:
+					fnEntry = v
+					file.ShadowEntry = v
+					continue
+				case "Classfname":
+					v.Shadow = true
+				}
+			}
+		case *ast.GenDecl:
+			if v.Tok == token.TYPE {
+				if spec, ok := v.Specs[0].(*ast.TypeSpec); ok && spec.Name.Name == class {
+					if st, ok := spec.Type.(*ast.StructType); ok {
+						for _, fs := range st.Fields.List {
+							if len(fs.Names) == 0 {
+								continue
+							}
+							varSpecs = append(varSpecs, &ast.ValueSpec{Names: fs.Names, Type: fs.Type})
+						}
+						continue
+					}
+				}
+			}
+		}
+		decls = append(decls, decl)
+	}
+	if len(varSpecs) != 0 {
+		decls = append([]ast.Decl{&ast.GenDecl{Tok: token.VAR, Specs: varSpecs}}, decls...)
+	}
+	if fnEntry != nil {
+		decls = append(decls, fnEntry)
+	}
+	file.Decls = decls
+
 	for _, decl := range file.Decls {
 		switch v := decl.(type) {
 		case *ast.FuncDecl:
 			// delay the process, because package level vars need to be processed first.
 			funcs = append(funcs, v)
-			if isClassFunc(v, class) && v.Name.Name == entry {
-				file.ShadowEntry = v
-			}
 		case *ast.GenDecl:
 			switch v.Tok {
 			case token.IMPORT:
@@ -330,6 +372,7 @@ func funcRecv(v *ast.FuncDecl) *ast.Ident {
 
 func formatFuncDecl(ctx *formatCtx, v *ast.FuncDecl) {
 	if ctx.classMode && isClassFunc(v, ctx.className) {
+		v.IsClass = true
 		if recv := funcRecv(v); recv != nil {
 			ctx.funcRecv = recv.Name
 			defer func() {