x/format: GopClass support normal .gox

Author: visualfc

x/format/gopclass_test.go

@@ -197,3 +197,43 @@ func reset() {
 log.println "MainEntry"
 `)
 }
+
+func TestClassGox(t *testing.T) {
+	testClass(t, "gox class", "", "Rect", false, `package main
+
+type BaseClass struct {
+	x int
+	y int
+}
+type AggClass struct {
+}
+type Rect struct {
+	BaseClass
+	Width  float64
+	Height float64
+	*AggClass
+}
+
+func (this *Rect) Area() float64 {
+	return this.Width * this.Height
+}
+`, `var (
+	BaseClass
+	Width  float64
+	Height float64
+	*AggClass
+)
+
+type BaseClass struct {
+	x int
+	y int
+}
+
+type AggClass struct {
+}
+
+func Area() float64 {
+	return Width * Height
+}
+`)
+}

x/format/gopstyle.go

@@ -69,6 +69,9 @@ func Gopstyle(file *ast.File) {
 	formatFile(file)
 }
 
+// GopClassSource format Go+ source to Go+ class source.
+// pkg set class project pkg path, emtpy if normal .gox class.
+// class set the class name. proj indication project or class.
 func GopClassSource(src []byte, pkg string, class string, proj bool, filename ...string) (ret []byte, err error) {
 	var fname string
 	if filename != nil {
@@ -285,7 +288,7 @@ func formatClass(file *ast.File, pkg string, class string, proj bool) {
 				if spec, ok := v.Specs[0].(*ast.TypeSpec); ok && spec.Name.Name == class {
 					if st, ok := spec.Type.(*ast.StructType); ok {
 						for _, fs := range st.Fields.List {
-							if len(fs.Names) == 0 {
+							if len(fs.Names) == 0 && pkg != "" {
 								continue
 							}
 							varSpecs = append(varSpecs, &ast.ValueSpec{Names: fs.Names, Type: fs.Type})