modfile: Class add Embedded (class [-embed] *.workExt WorkClass)

Author: xushiwei

modfile/gop_test.go

@@ -71,7 +71,7 @@ go 1.17
 gop 1.1
 
 project .gmx Game github.com/goplus/spx math
-class .spx Sprite
+class -embed .spx Sprite
 class .spx2 *Sprite2
 class .spx3 Sprite SpriteProto
 
@@ -138,6 +138,9 @@ func TestParse1(t *testing.T) {
 	if len(f.proj().Works) != 3 {
 		t.Errorf("project workclass length expected be 3, but %d got", len(f.proj().Works))
 	}
+	if !f.proj().Works[0].Embedded {
+		t.Error("project class[0].Embedded expected be true")
+	}
 	if f.proj().Works[0].Ext != ".spx" {
 		t.Errorf("project class[0] exts expected be .spx, but %s got", f.proj().Works[0].Ext)
 	}
@@ -269,10 +272,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 ProjectClass] classFilePkgPath ...`, `
 project
 `)
-	doTestParseErr(t, `gop.mod:2: usage: project [*.projExt ProjClass] classFilePkgPath ...`, `
+	doTestParseErr(t, `gop.mod:2: usage: project [*.projExt ProjectClass] classFilePkgPath ...`, `
 project .gmx Game
 `)
 	doTestParseErr(t, `gop.mod:2: ext ." invalid: unquoted string cannot contain quote`, `
@@ -296,7 +299,7 @@ project "\?"
 	doTestParseErr(t, `gop.mod:2: work class must declare after a project definition`, `
 class .spx Sprite
 `)
-	doTestParseErr(t, `gop.mod:3: usage: class .workExt WorkClass [ProjClass]`, `
+	doTestParseErr(t, `gop.mod:3: usage: class [-embed] *.workExt WorkClass [WorkPrototype]`, `
 project github.com/goplus/spx math
 class .spx
 `)

modfile/rule.go

@@ -202,12 +202,12 @@ 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 ProjectClass] classFilePkgPath ...")
 			return
 		}
 		if isExt(args[0], true) {
 			if len(args) < 3 || strings.Contains(args[1], "/") {
-				errorf("usage: project [*.projExt ProjClass] classFilePkgPath ...")
+				errorf("usage: project [*.projExt ProjectClass] classFilePkgPath ...")
 				return
 			}
 			ext, fullExt, err := parseExt(&args[0], true)
@@ -244,8 +244,13 @@ func (f *File) parseVerb(errs *ErrorList, verb string, line *Line, args []string
 			errorf("work class must declare after a project definition")
 			return
 		}
+		embedded := false
+		if len(args) > 0 && args[0] == "-embed" {
+			args = args[1:]
+			embedded = true
+		}
 		if len(args) < 2 {
-			errorf("usage: class .workExt WorkClass [ProjClass]")
+			errorf("usage: class [-embed] *.workExt WorkClass [WorkPrototype]")
 			return
 		}
 		workExt, fullExt, err := parseExt(&args[0], false)
@@ -267,11 +272,12 @@ func (f *File) parseVerb(errs *ErrorList, verb string, line *Line, args []string
 			}
 		}
 		proj.Works = append(proj.Works, &Class{
-			Ext:     workExt,
-			FullExt: fullExt,
-			Class:   class,
-			Proto:   protoClass,
-			Syntax:  line,
+			Ext:      workExt,
+			FullExt:  fullExt,
+			Class:    class,
+			Proto:    protoClass,
+			Embedded: embedded,
+			Syntax:   line,
 		})
 	case "import":
 		proj := f.proj()
@@ -336,7 +342,7 @@ var (
 	symbolRE = regexp.MustCompile(`\*?[A-Z]\w*`)
 )
 
-// TODO: to be optimized
+// TODO(xsw): to be optimized
 func parseSymbol(s *string) (t string, err error) {
 	t, err = parseString(s)
 	if err != nil {