Merge pull request #101 from xushiwei/q

modfile parseExt: Class, Project add FullExt

Author: xushiwei

modfile/ext.go

@@ -24,22 +24,34 @@ import (
 	"github.com/qiniu/x/errors"
 )
 
-// can be "_[class].gox" or ".[class]"
-func isExt(s string) bool {
-	return len(s) > 1 && (s[0] == '_' || s[0] == '.')
+// can be "_[class].gox", "*_[class].gox", ".[class]" or "*.[class]"
+// can be "main_[class].gox", "main.[class]" if isProj is true
+func isExt(s string, isProj bool) bool {
+	return len(s) > 1 && (s[0] == '*' || s[0] == '_' || s[0] == '.') ||
+		isProj && len(s) > 4 && s[:4] == "main" && (s[4] == '_' || s[4] == '.')
 }
 
-func parseExt(s *string) (t string, err error) {
-	t, err = parseString(s)
+func getExt(s string) string {
+	if len(s) > 1 && s[0] == '*' {
+		return s[1:]
+	}
+	if len(s) > 4 && s[:4] == "main" {
+		return s[4:]
+	}
+	return s
+}
+
+func parseExt(s *string, isProj bool) (ext, fullExt string, err error) {
+	t, err := parseString(s)
 	if err != nil {
 		goto failed
 	}
-	if isExt(t) {
-		return
+	if isExt(t, isProj) {
+		return getExt(t), t, nil
 	}
 	err = errors.New("invalid ext format")
 failed:
-	return "", &InvalidExtError{
+	return "", "", &InvalidExtError{
 		Ext: *s,
 		Err: err,
 	}

modfile/gop_test.go

@@ -269,10 +269,10 @@ gop 1.1 1.2
 	doTestParseErr(t, `gop.mod:2: invalid gop version '1.x': must match format 1.23`, `
 gop 1.x
 `)
-	doTestParseErr(t, `gop.mod:2: usage: project [.projExt ProjClass] classFilePkgPath ...`, `
+	doTestParseErr(t, `gop.mod:2: usage: project [*.projExt ProjClass] classFilePkgPath ...`, `
 project
 `)
-	doTestParseErr(t, `gop.mod:2: usage: project [.projExt ProjClass] classFilePkgPath ...`, `
+	doTestParseErr(t, `gop.mod:2: usage: project [*.projExt ProjClass] classFilePkgPath ...`, `
 project .gmx Game
 `)
 	doTestParseErr(t, `gop.mod:2: ext ." invalid: unquoted string cannot contain quote`, `

modfile/rule.go

@@ -59,10 +59,12 @@ type Gop = modfile.Go
 
 // A Class is the work class statement.
 type Class struct {
-	Ext    string // can be "_[class].gox" or ".[class]", eg. "_yap.gox" or ".spx"
-	Class  string // "Sprite"
-	Proto  string // prototype of the work class (not empty if multiple work classes)
-	Syntax *Line
+	Ext      string // can be "_[class].gox" or ".[class]", eg. "_yap.gox" or ".spx"
+	FullExt  string // can be "*_[class].gox", "_[class].gox", "*.[class]" or ".[class]"
+	Class    string // "Sprite"
+	Proto    string // prototype of the work class (not empty if multiple work classes)
+	Embedded bool   // if true, the class instance will be embedded in the project
+	Syntax   *Line
 }
 
 // A Import is the import statement.
@@ -75,6 +77,7 @@ type Import struct {
 // A Project is the project statement.
 type Project struct {
 	Ext      string    // can be "_[class].gox" or ".[class]", eg. "_yap.gox" or ".gmx"
+	FullExt  string    // can be "main_[class].gox", "*_[class].gox", "_[class].gox", "main.[class]", "*.[class]" or ".[class]"
 	Class    string    // "Game"
 	Works    []*Class  // work class of classfile
 	PkgPaths []string  // package paths of classfile and optional inline-imported packages.
@@ -199,15 +202,15 @@ func (f *File) parseVerb(errs *ErrorList, verb string, line *Line, args []string
 		f.Gop.Version = args[0]
 	case "project":
 		if len(args) < 1 {
-			errorf("usage: project [.projExt ProjClass] classFilePkgPath ...")
+			errorf("usage: project [*.projExt ProjClass] classFilePkgPath ...")
 			return
 		}
-		if isExt(args[0]) {
+		if isExt(args[0], true) {
 			if len(args) < 3 || strings.Contains(args[1], "/") {
-				errorf("usage: project [.projExt ProjClass] classFilePkgPath ...")
+				errorf("usage: project [*.projExt ProjClass] classFilePkgPath ...")
 				return
 			}
-			ext, err := parseExt(&args[0])
+			ext, fullExt, err := parseExt(&args[0], true)
 			if err != nil {
 				wrapError(err)
 				return
@@ -223,7 +226,7 @@ func (f *File) parseVerb(errs *ErrorList, verb string, line *Line, args []string
 				return
 			}
 			f.addProj(&Project{
-				Ext: ext, Class: class, PkgPaths: pkgPaths, Syntax: line,
+				Ext: ext, FullExt: fullExt, Class: class, PkgPaths: pkgPaths, Syntax: line,
 			})
 			return
 		}
@@ -245,7 +248,7 @@ func (f *File) parseVerb(errs *ErrorList, verb string, line *Line, args []string
 			errorf("usage: class .workExt WorkClass [ProjClass]")
 			return
 		}
-		workExt, err := parseExt(&args[0])
+		workExt, fullExt, err := parseExt(&args[0], false)
 		if err != nil {
 			wrapError(err)
 			return
@@ -264,10 +267,11 @@ func (f *File) parseVerb(errs *ErrorList, verb string, line *Line, args []string
 			}
 		}
 		proj.Works = append(proj.Works, &Class{
-			Ext:    workExt,
-			Class:  class,
-			Proto:  protoClass,
-			Syntax: line,
+			Ext:     workExt,
+			FullExt: fullExt,
+			Class:   class,
+			Proto:   protoClass,
+			Syntax:  line,
 		})
 	case "import":
 		proj := f.proj()
@@ -329,7 +333,7 @@ func AutoQuote(s string) string {
 }
 
 var (
-	symbolRE = regexp.MustCompile("\\*?[A-Z]\\w*")
+	symbolRE = regexp.MustCompile(`\*?[A-Z]\w*`)
 )
 
 // TODO: to be optimized

modfile/rule_test.go

@@ -26,25 +26,57 @@ var addParseExtTests = []struct {
 	desc    string
 	ext     string
 	want    string
+	wantF   string
 	wantErr string
+	isProj  bool
 }{
 	{
 		"spx ok",
 		".spx",
 		".spx",
+		".spx",
 		"",
+		false,
 	},
 	{
 		"yap ok",
 		"_yap.gox",
 		"_yap.gox",
+		"_yap.gox",
+		"",
+		false,
+	},
+	{
+		"yap ok",
+		"*_yap.gox",
+		"_yap.gox",
+		"*_yap.gox",
+		"",
+		false,
+	},
+	{
+		"yap ok",
+		"main_yap.gox",
+		"_yap.gox",
+		"main_yap.gox",
 		"",
+		true,
+	},
+	{
+		"yap ok",
+		"main_yap.gox",
+		"",
+		"",
+		"ext main_yap.gox invalid: invalid ext format",
+		false,
 	},
 	{
 		"not a ext",
 		"gmx",
 		"",
+		"",
 		"ext gmx invalid: invalid ext format",
+		false,
 	},
 }
 
@@ -57,14 +89,14 @@ func TestParseExt(t *testing.T) {
 	}
 	for _, tt := range addParseExtTests {
 		t.Run(tt.desc, func(t *testing.T) {
-			ext, err := parseExt(&tt.ext)
+			ext, extF, err := parseExt(&tt.ext, tt.isProj)
 			if err != nil {
 				if err.Error() != tt.wantErr {
 					t.Fatalf("wanterr: %s, but got: %s", tt.wantErr, err)
 				}
 			}
-			if ext != tt.want {
-				t.Fatalf("want: %s, but got: %s", tt.want, ext)
+			if ext != tt.want || extF != tt.wantF {
+				t.Fatalf("want: %s %s, but got: %s %s", tt.want, tt.wantF, ext, extF)
 			}
 		})
 	}