Skip to content

Commit be7a272

Browse files
visualfcvisualfc
committed
x/format: ClassConfig support gopt/overload
1 parent c30a0ac commit be7a272

File tree

3 files changed

+170
-49
lines changed

3 files changed

+170
-49
lines changed

‎x/format/gopclass_test.go

+119-17
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,24 @@ import (
2222
"github.com/goplus/gop/x/format"
2323
)
2424

25-
func testClass(t *testing.T, name string, pkg string, class string, proj bool, src, expect string) {
25+
func testClass(t *testing.T, name string, cfg *format.ClassConfig, src, expect string) {
2626
t.Run(name, func(t *testing.T) {
27-
result, err := format.GopClassSource([]byte(src), pkg, class, proj, name)
27+
result, err := format.GopClassSource([]byte(src), cfg, name)
2828
if err != nil {
2929
t.Fatal("format.GopClassSource failed:", err)
3030
}
3131
if ret := string(result); ret != expect {
32-
t.Fatalf("%s => Expect:\n%s\n=> Got:\n%s\n", name, expect, ret)
32+
t.Fatalf("%s => Expect:\n%s\n=> Got:\n%s\n== end", name, expect, ret)
3333
}
3434
})
3535
}
3636

3737
func TestClassSpx(t *testing.T) {
38-
testClass(t, "spx class", "github.com/goplus/spx", "Calf", false, `package main
38+
testClass(t, "spx class", &format.ClassConfig{
39+
PkgPath: "github.com/goplus/spx",
40+
ClassName: "Calf",
41+
Overload: map[string]string{"OnMsg__1": "OnMsg"},
42+
}, `package main
3943
4044
import (
4145
"github.com/goplus/spx"
@@ -109,11 +113,11 @@ func Dump() {
109113
log.println info
110114
}
111115
112-
onStart func() {
116+
onStart => {
113117
say "Hello Go+"
114118
}
115119
116-
onMsg__1 "tap", func() {
120+
onMsg "tap", => {
117121
118122
for calfPlay {
119123
@@ -138,7 +142,11 @@ onMsg__1 "tap", func() {
138142
}
139143

140144
func TestClassProj(t *testing.T) {
141-
testClass(t, "spx project", "github.com/goplus/spx", "Game", true, `package main
145+
testClass(t, "spx project", &format.ClassConfig{
146+
PkgPath: "github.com/goplus/spx",
147+
ClassName: "Game",
148+
Project: true,
149+
}, `package main
142150
143151
import "github.com/goplus/spx"
144152
import "log"
@@ -152,15 +160,10 @@ type Game struct {
152160
var calfPlay = false
153161
var calfDie = false
154162
var calfGravity = 0.0
155-
//line main.spx:30:1
156163
func (this *Game) reset() {
157-
//line main.spx:31:1
158164
this.userScore = 0
159-
//line main.spx:32:1
160165
calfPlay = false
161-
//line main.spx:33:1
162166
calfDie = false
163-
//line main.spx:34:1
164167
calfGravity = 0.0
165168
}
166169
func (this *Game) MainEntry() {
@@ -184,13 +187,9 @@ var calfDie = false
184187
var calfGravity = 0.0
185188
186189
func reset() {
187-
188190
userScore = 0
189-
190191
calfPlay = false
191-
192192
calfDie = false
193-
194193
calfGravity = 0.0
195194
}
196195
@@ -199,7 +198,10 @@ log.println "MainEntry"
199198
}
200199

201200
func TestClassGox(t *testing.T) {
202-
testClass(t, "gox class", "", "Rect", false, `package main
201+
testClass(t, "gox class", &format.ClassConfig{
202+
ClassName: "Rect",
203+
Comments: true,
204+
}, `package main
203205
204206
type BaseClass struct {
205207
x int
@@ -214,6 +216,7 @@ type Rect struct {
214216
*AggClass
215217
}
216218
219+
// Area is call rect area
217220
func (this *Rect) Area() float64 {
218221
return this.Width * this.Height
219222
}
@@ -232,8 +235,107 @@ type BaseClass struct {
232235
type AggClass struct {
233236
}
234237
238+
// Area is call rect area
235239
func Area() float64 {
236240
return Width * Height
237241
}
238242
`)
239243
}
244+
245+
func TestClassGopt(t *testing.T) {
246+
testClass(t, "test class", &format.ClassConfig{
247+
PkgPath: "github.com/goplus/gop/cl/internal/spx",
248+
ClassName: "Game",
249+
Project: true,
250+
Gopt: map[string]string{
251+
"Gopt_Sprite_Clone__0": "Clone",
252+
"Gopt_Sprite_Clone__1": "Clone",
253+
},
254+
Overload: map[string]string{"Broadcast__0": "Broadcast"},
255+
}, `package main
256+
257+
import "github.com/goplus/gop/cl/internal/spx"
258+
259+
type Game struct {
260+
*spx.MyGame
261+
Kai Kai
262+
}
263+
func (this *Game) onInit() {
264+
spx.Gopt_Sprite_Clone__0(this.Kai)
265+
this.Broadcast__0("msg1")
266+
}
267+
func (this *Game) MainEntry() {
268+
}
269+
func (this *Game) Main() {
270+
spx.Gopt_MyGame_Main(this)
271+
}
272+
func main() {
273+
new(Game).Main()
274+
}
275+
`, `var Kai Kai
276+
277+
func onInit() {
278+
Kai.clone
279+
broadcast "msg1"
280+
}
281+
282+
283+
`)
284+
testClass(t, "test class", &format.ClassConfig{
285+
PkgPath: "github.com/goplus/gop/cl/internal/spx",
286+
ClassName: "Kai",
287+
Gopt: map[string]string{
288+
"Gopt_Sprite_Clone__0": "Clone",
289+
"Gopt_Sprite_Clone__1": "Clone",
290+
},
291+
Overload: map[string]string{"Broadcast__0": "Broadcast"},
292+
}, `package main
293+
294+
import "github.com/goplus/gop/cl/internal/spx"
295+
296+
type info struct {
297+
x int
298+
y int
299+
}
300+
301+
type Kai struct {
302+
spx.Sprite
303+
*Game
304+
a int
305+
}
306+
307+
func (this *Kai) onInit() {
308+
this.a = 1
309+
spx.Gopt_Sprite_Clone__0(this)
310+
spx.Gopt_Sprite_Clone__1(this, info{1, 2})
311+
spx.Gopt_Sprite_Clone__1(this, &info{1, 2})
312+
}
313+
func (this *Kai) onCloned() {
314+
this.Say("Hi")
315+
}
316+
func (this *Kai) Classfname() string {
317+
return "Kai"
318+
}
319+
func (this *Kai) Main() {
320+
}
321+
`, `var a int
322+
323+
type info struct {
324+
x int
325+
y int
326+
}
327+
328+
func onInit() {
329+
a = 1
330+
clone
331+
clone info{1, 2}
332+
clone &info{1, 2}
333+
}
334+
335+
func onCloned() {
336+
say "Hi"
337+
}
338+
339+
340+
`)
341+
}

‎x/format/gopstyle.go

+35-26
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,29 @@ func Gopstyle(file *ast.File) {
6969
formatFile(file)
7070
}
7171

72+
type ClassConfig struct {
73+
PkgPath string // Go+ class project pkgpath, empty if normal .gox class. (optional)
74+
ClassName string // project or class name.
75+
Project bool // true means ClassName is project.
76+
Comments bool // true means parse comments.
77+
Gopt map[string]string // Gopt_ function name mapping. (optional)
78+
Overload map[string]string // Overload function name mapping. (optional)
79+
}
80+
7281
// GopClassSource format Go+ source to Go+ class source.
73-
// pkg set class project pkg path, emtpy if normal .gox class.
74-
// class set the class name. proj indication project or class.
75-
func GopClassSource(src []byte, pkg string, class string, proj bool, filename ...string) (ret []byte, err error) {
82+
func GopClassSource(src []byte, cfg *ClassConfig, filename ...string) (ret []byte, err error) {
7683
var fname string
7784
if filename != nil {
7885
fname = filename[0]
7986
}
8087
fset := token.NewFileSet()
88+
mode := parser.AllErrors
89+
if cfg.Comments {
90+
mode |= parser.ParseComments
91+
}
8192
var f *ast.File
82-
if f, err = parser.ParseFile(fset, fname, src, parser.AllErrors); err == nil {
83-
GopClass(f, pkg, class, proj)
93+
if f, err = parser.ParseFile(fset, fname, src, mode); err == nil {
94+
GopClass(f, cfg)
8495
var buf bytes.Buffer
8596
if err = format.Node(&buf, fset, f); err == nil {
8697
ret = buf.Bytes()
@@ -90,8 +101,8 @@ func GopClassSource(src []byte, pkg string, class string, proj bool, filename ..
90101
}
91102

92103
// GopClass format ast.File to Go+ class
93-
func GopClass(file *ast.File, pkg string, class string, proj bool) {
94-
formatClass(file, pkg, class, proj)
104+
func GopClass(file *ast.File, cfg *ClassConfig) {
105+
formatClass(file, cfg)
95106
}
96107

97108
func findFuncDecl(decls []ast.Decl, name string) (int, *ast.FuncDecl) {
@@ -167,12 +178,11 @@ type importCtx struct {
167178
}
168179

169180
type formatCtx struct {
170-
imports map[string]*importCtx
171-
scope *types.Scope
172-
classMode bool //class mode
173-
classPkg string //class pkg name
174-
className string //this class
175-
funcRecv string //this class func recv
181+
imports map[string]*importCtx
182+
scope *types.Scope
183+
classCfg *ClassConfig
184+
classPkg string //this class pkg name
185+
funcRecv string //this class func recv
176186
}
177187

178188
func (ctx *formatCtx) insert(name string) {
@@ -238,14 +248,13 @@ func formatFile(file *ast.File) {
238248
}
239249
}
240250

241-
func formatClass(file *ast.File, pkg string, class string, proj bool) {
251+
func formatClass(file *ast.File, cfg *ClassConfig) {
242252
var funcs []*ast.FuncDecl
243253
ctx := &formatCtx{
244-
imports: make(map[string]*importCtx),
245-
scope: types.NewScope(nil, token.NoPos, token.NoPos, ""),
246-
classMode: true,
247-
classPkg: path.Base(pkg),
248-
className: class,
254+
imports: make(map[string]*importCtx),
255+
scope: types.NewScope(nil, token.NoPos, token.NoPos, ""),
256+
classCfg: cfg,
257+
classPkg: path.Base(cfg.PkgPath),
249258
}
250259
if file.Name.Name == "main" {
251260
file.NoPkgDecl = true
@@ -257,17 +266,17 @@ func formatClass(file *ast.File, pkg string, class string, proj bool) {
257266
for _, decl := range file.Decls {
258267
switch v := decl.(type) {
259268
case *ast.FuncDecl:
260-
if isClassFunc(v, class) {
269+
if isClassFunc(v, cfg.ClassName) {
261270
v.IsClass = true
262271
switch v.Name.Name {
263272
case "MainEntry":
264-
if proj {
273+
if cfg.Project {
265274
fnEntry = v
266275
file.ShadowEntry = v
267276
continue
268277
}
269278
case "Main":
270-
if !proj {
279+
if !cfg.Project {
271280
fnEntry = v
272281
file.ShadowEntry = v
273282
continue
@@ -276,7 +285,7 @@ func formatClass(file *ast.File, pkg string, class string, proj bool) {
276285
case "Classfname":
277286
v.Shadow = true
278287
}
279-
} else if v.Name.Name == "main" && proj {
288+
} else if v.Name.Name == "main" && cfg.Project {
280289
v.Shadow = true
281290
}
282291
case *ast.GenDecl:
@@ -285,10 +294,10 @@ func formatClass(file *ast.File, pkg string, class string, proj bool) {
285294
imports = append(imports, v)
286295
continue
287296
case token.TYPE:
288-
if spec, ok := v.Specs[0].(*ast.TypeSpec); ok && spec.Name.Name == class {
297+
if spec, ok := v.Specs[0].(*ast.TypeSpec); ok && spec.Name.Name == cfg.ClassName {
289298
if st, ok := spec.Type.(*ast.StructType); ok {
290299
for _, fs := range st.Fields.List {
291-
if len(fs.Names) == 0 && pkg != "" {
300+
if len(fs.Names) == 0 && cfg.PkgPath != "" {
292301
continue
293302
}
294303
varSpecs = append(varSpecs, &ast.ValueSpec{Names: fs.Names, Type: fs.Type})
@@ -392,7 +401,7 @@ func funcRecv(v *ast.FuncDecl) *ast.Ident {
392401
}
393402

394403
func formatFuncDecl(ctx *formatCtx, v *ast.FuncDecl) {
395-
if ctx.classMode && isClassFunc(v, ctx.className) {
404+
if ctx.classCfg != nil && isClassFunc(v, ctx.classCfg.ClassName) {
396405
v.IsClass = true
397406
if recv := funcRecv(v); recv != nil {
398407
ctx.funcRecv = recv.Name

‎x/format/stmt_expr_or_type.go

+16-6
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func formatSelectorExpr(ctx *formatCtx, v *ast.SelectorExpr, ref *ast.Expr) {
182182
if _, o := ctx.scope.LookupParent(x.Name, token.NoPos); o != nil {
183183
break
184184
}
185-
if ctx.classMode && (x.Name == ctx.funcRecv || x.Name == ctx.classPkg) {
185+
if ctx.classCfg != nil && (x.Name == ctx.funcRecv || x.Name == ctx.classPkg) {
186186
*ref = v.Sel
187187
break
188188
}
@@ -221,7 +221,7 @@ func isClassSched(ctx *formatCtx, stmt ast.Stmt) bool {
221221

222222
func formatStmts(ctx *formatCtx, stmts []ast.Stmt) {
223223
for i, stmt := range stmts {
224-
if ctx.classMode && isClassSched(ctx, stmt) {
224+
if ctx.classCfg != nil && isClassSched(ctx, stmt) {
225225
stmts[i] = &ast.EmptyStmt{}
226226
continue
227227
}
@@ -283,10 +283,20 @@ func formatStmt(ctx *formatCtx, stmt ast.Stmt) {
283283
func formatExprStmt(ctx *formatCtx, v *ast.ExprStmt) {
284284
switch x := v.X.(type) {
285285
case *ast.CallExpr:
286-
if ctx.classMode {
287-
if sel, ok := x.Fun.(*ast.SelectorExpr); ok && sel.Sel.Name == "Sched" {
288-
if ident, ok := sel.X.(*ast.Ident); ok && ident.Name == ctx.classPkg {
289-
return
286+
if ctx.classCfg != nil {
287+
if sel, ok := x.Fun.(*ast.SelectorExpr); ok {
288+
if name, ok := ctx.classCfg.Overload[sel.Sel.Name]; ok {
289+
sel.Sel.Name = name
290+
} else if ident, ok := sel.X.(*ast.Ident); ok && ident.Name == ctx.classPkg {
291+
if name, ok := ctx.classCfg.Gopt[sel.Sel.Name]; ok {
292+
if len(x.Args) > 0 {
293+
x.Fun = &ast.SelectorExpr{
294+
X: x.Args[0],
295+
Sel: ast.NewIdent(name),
296+
}
297+
x.Args = x.Args[1:]
298+
}
299+
}
290300
}
291301
}
292302
}

0 commit comments

Comments
 (0)