refactor(classfile): remove built-in .spx and .gmx handling

aofei · aofei · commit 92ebe0dc13a2 · 2026-03-18T17:10:21.000+08:00
Remove the remaining default `.spx` and `.gmx` classfile detection from the parser, build helpers, formatter, watcher, and related tests. This also drops legacy `.yap`-specific test cases and chore script filters, keeping `_yap.gox` as the supported yap classfile form in this repository. Updates goplus/mod#139 Signed-off-by: Aofei Sheng <aofei@aofeisheng.com>
diff --git a/cl/builtin_test.go b/cl/builtin_test.go
@@ -290,8 +290,8 @@ func TestClassNameAndExt(t *testing.T) {
 	if name != "bar_abc" || clsfile != "bar.abc" || ext != "_yap.gox" {
 		t.Fatal("classNameAndExt:", name, ext)
 	}
-	name, clsfile, ext = ClassNameAndExt("/foo/get-bar_:id.yap")
-	if name != "get_bar_id" || clsfile != "get-bar_:id" || ext != ".yap" {
+	name, clsfile, ext = ClassNameAndExt("/foo/get-bar_:id_app.gox")
+	if name != "get_bar_id" || clsfile != "get-bar_:id" || ext != "_app.gox" {
 		t.Fatal("classNameAndExt:", name, ext)
 	}
 }
@@ -326,10 +326,6 @@ func TestFileClassType(t *testing.T) {
 		{true, true, false, "Abc_test.gox", "caseAbc", true, true},
 		{true, true, false, "main_test.gox", "case_main", true, true},
 
-		{true, false, false, "get.yap", "get", false, true},
-		{true, false, false, "get_p_#id.yap", "get_p_id", false, true},
-		{true, false, true, "main.yap", "AppV2", false, true},
-
 		{true, false, false, "abc_yap.gox", "abc", false, true},
 		{true, false, false, "Abc_yap.gox", "Abc", false, true},
 		{true, false, true, "main_yap.gox", "App", false, true},
@@ -344,11 +340,6 @@ func TestFileClassType(t *testing.T) {
 	}
 	lookupClass := func(ext string) (c *Project, ok bool) {
 		switch ext {
-		case ".yap":
-			return &modfile.Project{
-				Ext: ".yap", Class: "AppV2",
-				Works:    []*modfile.Class{{Ext: ".yap", Class: "Handler"}},
-				PkgPaths: []string{"github.com/goplus/yap"}}, true
 		case "_yap.gox":
 			return &modfile.Project{
 				Ext: "_yap.gox", Class: "App",
@@ -643,7 +634,7 @@ func testPanic(t *testing.T, panicMsg string, doPanic func()) {
 
 func TestClassFileEnd(t *testing.T) {
 	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "get.yap", `json {"id": ${id} }`, parser.ParseXGoClass)
+	f, err := parser.ParseFile(fset, "get_app.gox", `json {"id": ${id} }`, parser.ParseXGoClass)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/cmd/chore/xgofullspec/fullspec.xgo b/cmd/chore/xgofullspec/fullspec.xgo
@@ -31,7 +31,7 @@ func dump(f any) {
 func isGopFile(file string) bool {
 	if len(file) > 4 {
 		switch file[len(file)-4:] {
-		case ".xgo", ".gop", ".gox", ".gsh", ".spx", ".yap":
+		case ".xgo", ".gop", ".gox", ".gsh":
 			return true
 		}
 	}
diff --git a/cmd/chore/xgominispec/minispec.xgo b/cmd/chore/xgominispec/minispec.xgo
@@ -27,7 +27,7 @@ import (
 func isGopFile(file string) bool {
 	if len(file) > 4 {
 		switch file[len(file)-4:] {
-		case ".xgo", ".gop", ".gox", ".gsh", ".spx", ".yap":
+		case ".xgo", ".gop", ".gox", ".gsh":
 			return true
 		}
 	}
diff --git a/cmd/internal/gopfmt/fmt.go b/cmd/internal/gopfmt/fmt.go
@@ -151,7 +151,7 @@ func (w *walker) walk(path string, d fs.DirEntry, err error) error {
 					switch ext {
 					case ".go", ".xgo", ".gop":
 						ok = true
-					case ".gox", ".spx", ".gmx":
+					case ".gox":
 						ok, class = true, true
 					default:
 						class = mod.IsClass(ext)
@@ -164,7 +164,7 @@ func (w *walker) walk(path string, d fs.DirEntry, err error) error {
 					switch ext {
 					case ".go", ".xgo", ".gop":
 						ok = true
-					case ".gox", ".spx", ".gmx":
+					case ".gox":
 						ok, class = true, true
 					}
 					return
diff --git a/go.sum b/go.sum
@@ -2,7 +2,7 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
 github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/goplus/cobra v1.9.13 h1:onu/65rXILVMc7RBvdY1mGdOIZ/F4C/6o7DWgglwFaw=
+github.com/goplus/cobra v1.9.13 h1:doLBppK2LJ4Giy3qv3WdJrZKXMLVpYOJ/hmYBcCzpQ4=
 github.com/goplus/cobra v1.9.13/go.mod h1:p4LhfNJDKEpiGjGiNn0crUXL5dUPA5DX2ztYpEJR34E=
 github.com/goplus/gogen v1.21.2 h1:xbXPgZOZiQx/WBM0nZxVSxFbtdCMZCRB+lguDnh8pfs=
 github.com/goplus/gogen v1.21.2/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ=
diff --git a/parser/_testdata/gmxtest/foo.gmx b/parser/_testdata/gmxtest/foo.gmx
diff --git a/parser/_testdata/gmxtest/parser.expect b/parser/_testdata/gmxtest/parser.expect
diff --git a/parser/_testdata/spxtest/foo.spx b/parser/_testdata/spxtest/foo.spx
diff --git a/parser/_testdata/spxtest/parser.expect b/parser/_testdata/spxtest/parser.expect
diff --git a/parser/parser_xgo.go b/parser/parser_xgo.go
@@ -244,9 +244,7 @@ func reqPkg(pkgs map[string]*ast.Package, name string) *ast.Package {
 func defaultClassKind(fname string) (isProj bool, ok bool) {
 	ext := path.Ext(fname)
 	switch ext {
-	case ".spx":
-		return fname == "main.spx", true
-	case ".gsh", ".gmx":
+	case ".gsh":
 		return true, true
 	}
 	return
diff --git a/parser/parserdir_test.go b/parser/parserdir_test.go
@@ -247,15 +247,6 @@ func doTestParseEntry(t *testing.T, parseEntry func(fset *token.FileSet, filenam
 			t.Fatal("ParseEntry failed:", err)
 		}
 	})
-	t.Run(".spx file", func(t *testing.T) {
-		f, err := parseEntry(fset, "./main.spx", src, conf)
-		if err != nil {
-			t.Fatal("ParseEntry failed:", err)
-		}
-		if !f.IsClass || !f.IsProj || f.IsNormalGox {
-			t.Fatal("ParseEntry main.spx:", f.IsClass, f.IsProj, f.IsNormalGox)
-		}
-	})
 }
 
 func TestParseEntry2(t *testing.T) {
diff --git a/x/build/build.go b/x/build/build.go
@@ -54,10 +54,6 @@ func RegisterClassFileType(ext string, class string, works []*Class, pkgPaths ..
 	}
 }
 
-func init() {
-	RegisterClassFileType(".gmx", "Game", []*Class{{Ext: ".spx", Class: "Sprite"}}, "github.com/goplus/spx", "math")
-}
-
 type Package struct {
 	Fset *token.FileSet
 	Pkg  *gogen.Package
@@ -77,23 +73,16 @@ func (p *Package) ToAst() *goast.File {
 
 func ClassKind(fname string) (isProj, ok bool) {
 	ext := modfile.ClassExt(fname)
-	switch ext {
-	case ".gmx":
-		return true, true
-	case ".spx":
-		return fname == "main.spx", true
-	default:
-		if c, ok := projects[ext]; ok {
-			for _, w := range c.Works {
-				if w.Ext == ext {
-					if ext != c.Ext || fname != "main"+ext {
-						return false, true
-					}
-					break
+	if c, ok := projects[ext]; ok {
+		for _, w := range c.Works {
+			if w.Ext == ext {
+				if ext != c.Ext || fname != "main"+ext {
+					return false, true
 				}
+				break
 			}
-			return true, true
 		}
+		return true, true
 	}
 	return
 }
diff --git a/x/build/build_test.go b/x/build/build_test.go
@@ -72,9 +72,6 @@ func testKind(t *testing.T, name string, proj, class bool) {
 
 func TestKind(t *testing.T) {
 	testKind(t, "Cat.gox", false, false)
-	testKind(t, "Cat.spx", false, true)
-	testKind(t, "main.spx", true, true)
-	testKind(t, "main.gmx", true, true)
 	testKind(t, "Cat.tspx", false, true)
 	testKind(t, "main.tspx", true, true)
 	testKind(t, "blog_yap.gox", true, true)
diff --git a/x/watcher/changes.go b/x/watcher/changes.go
@@ -81,7 +81,7 @@ func (p *Changes) doLookupMod(name string) *module {
 				}
 			})
 		}
-		mod.exts = append(mod.exts, ".xgo", ".gop", ".go", ".gox", ".gmx")
+		mod.exts = append(mod.exts, ".xgo", ".gop", ".go", ".gox")
 		p.mods[name] = mod
 		if debugMod {
 			log.Println("Mod:", name, "Exts:", mod.exts)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func dump(f any) {`
`31`	`31`	`func isGopFile(file string) bool {`
`32`	`32`	`if len(file) > 4 {`
`33`	`33`	`switch file[len(file)-4:] {`
`34`		`- case ".xgo", ".gop", ".gox", ".gsh", ".spx", ".yap":`
	`34`	`+ case ".xgo", ".gop", ".gox", ".gsh":`
`35`	`35`	`return true`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`func isGopFile(file string) bool {`
`28`	`28`	`if len(file) > 4 {`
`29`	`29`	`switch file[len(file)-4:] {`
`30`		`- case ".xgo", ".gop", ".gox", ".gsh", ".spx", ".yap":`
	`30`	`+ case ".xgo", ".gop", ".gox", ".gsh":`
`31`	`31`	`return true`
`32`	`32`	`}`
`33`	`33`	`}`