Merge pull request #1610 from xushiwei/q

newGmx bugfix: use classNameAndExt

cl/builtin_test.go

@@ -225,6 +225,15 @@ func TestGmxSettings(t *testing.T) {
 	if e := err.Error(); e != `github.com/goplus/gop/cl/internal/libc.Game not found` {
 		t.Fatal("newGmx:", e)
 	}
+
+	defer func() {
+		if e := recover(); e == nil {
+			t.Fatal("TestGmxSettings failed: no error?")
+		}
+	}()
+	newGmx(nil, pkg, "main.abcx", &ast.File{IsProj: true}, &Config{
+		LookupClass: lookupClass,
+	})
 }
 
 func TestSpxLookup(t *testing.T) {

cl/classfile.go

@@ -70,20 +70,16 @@ func classNameAndExt(file string) (name, ext string) {
 }
 
 func newGmx(ctx *pkgCtx, pkg *gox.Package, file string, f *ast.File, conf *Config) *gmxSettings {
-	fname := filepath.Base(file)
-	ext := modfile.ClassExt(fname)
+	tname, ext := classNameAndExt(file)
 	gt, ok := conf.LookupClass(ext)
 	if !ok {
 		panic("TODO: class not found")
 	}
 	var name string
 	if f.IsProj {
-		_, name = filepath.Split(file)
-		if idx := strings.Index(name, "."); idx > 0 {
-			name = name[:idx]
-			if name == "main" {
-				name = gt.Class
-			}
+		name = tname
+		if name == "main" {
+			name = gt.Class
 		}
 	}
 	pkgPaths := gt.PkgPaths