parser: check not found Go+ class by composite gox

goplus · Aug 23, 2023 · b043e47 · b043e47
1 parent c7d5637
commit b043e47
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/cl/classfile.go b/cl/classfile.go
@@ -61,7 +61,7 @@ func (p *gmxSettings) getScheds(cb *gox.CodeBuilder) []goast.Stmt {
 }
 
 func newGmx(ctx *pkgCtx, pkg *gox.Package, file string, conf *Config) *gmxSettings {
-	ext := parser.ClassFileExt(file)
+	ext, _ := parser.ClassFileExt(file)
 	gt, ok := conf.LookupClass(ext)
 	if !ok {
 		panic("TODO: class not found")

diff --git a/cl/compile.go b/cl/compile.go
@@ -408,9 +408,11 @@ func NewPackage(pkgPath string, pkg *ast.Package, conf *Config) (p *gox.Package,
 	}
 	if ctx.gmxSettings == nil {
 		for file, gmx := range files {
-			if gmx.IsClass && parser.ClassFileExt(file) != ".gox" {
-				ctx.gmxSettings = newGmx(ctx, p, file, conf)
-				break
+			if gmx.IsClass {
+				if ext, _ := parser.ClassFileExt(file); ext != ".gox" {
+					ctx.gmxSettings = newGmx(ctx, p, file, conf)
+					break
+				}
 			}
 		}
 	}
@@ -560,7 +562,8 @@ func preloadGopFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, con
 	case f.IsClass:
 		classType = getDefaultClass(file)
 		if parent.gmxSettings != nil {
-			o, ok := parent.sprite[parser.ClassFileExt(file)]
+			ext, _ := parser.ClassFileExt(file)
+			o, ok := parent.sprite[ext]
 			if ok {
 				baseTypeName, baseType, spxClass = o.Name(), o.Type(), true
 			}

diff --git a/parser/parser_gop.go b/parser/parser_gop.go
@@ -19,6 +19,7 @@ package parser
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"io"
 	"io/fs"
 	"io/ioutil"
@@ -115,14 +116,14 @@ func ParseDirEx(fset *token.FileSet, path string, conf Config) (pkgs map[string]
 }
 
 // ClassFileExt returns the classfile extension
-func ClassFileExt(path string) string {
-	ext := filepath.Ext(path)
+func ClassFileExt(path string) (ext string, compositeGox bool) {
+	ext = filepath.Ext(path)
 	if ext == ".gox" {
 		if c := filepath.Ext(path[:len(path)-4]); c != "" {
-			return c
+			return c, true
 		}
 	}
-	return ext
+	return
 }
 
 // ParseFSDir calls ParseFile for all files with names ending in ".gop" in the
@@ -151,7 +152,7 @@ func ParseFSDir(fset *token.FileSet, fs FileSystem, path string, conf Config) (p
 			continue
 		}
 		fname := d.Name()
-		ext := ClassFileExt(fname)
+		ext, compositeGox := ClassFileExt(fname)
 		var isProj, isClass, useGoParser bool
 		switch ext {
 		case ".gop":
@@ -164,6 +165,9 @@ func ParseFSDir(fset *token.FileSet, fs FileSystem, path string, conf Config) (p
 			isClass = true
 		default:
 			if isProj, isClass = conf.IsClass(ext); !isClass {
+				if compositeGox {
+					return nil, fmt.Errorf("not found Go+ class by ext %q for %q", ext, fname)
+				}
 				continue
 			}
 		}