File tree 3 files changed +19
-11
lines changed
3 files changed +19
-11
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ import (
10
10
. "github.com/gost-dom/code-gen/internal"
11
11
"github.com/gost-dom/code-gen/packagenames"
12
12
"github.com/gost-dom/code-gen/script-wrappers/configuration"
13
+ "github.com/gost-dom/code-gen/stdgen"
13
14
g "github.com/gost-dom/generators"
14
15
"github.com/gost-dom/webref/idl"
15
16
legacy "github.com/gost-dom/webref/idl/legacy"
@@ -298,10 +299,14 @@ func (d ESConstructorData) WrapperFunctionsToGenerate() iter.Seq[ESOperation] {
298
299
}
299
300
for _ , a := range d .Attributes {
300
301
if a .Getter != nil && ! a .Getter .CustomImplementation {
301
- yield (* a .Getter )
302
+ if ! yield (* a .Getter ) {
303
+ return
304
+ }
302
305
}
303
306
if a .Setter != nil && ! a .Setter .CustomImplementation {
304
- yield (* a .Setter )
307
+ if ! yield (* a .Setter ) {
308
+ return
309
+ }
305
310
}
306
311
}
307
312
}
@@ -318,11 +323,7 @@ func ReturnOnAnyError(errNames []g.Generator) g.Generator {
318
323
}
319
324
return g .StatementList (
320
325
g .Assign (g .Id ("err" ),
321
- g .Raw (jen .Qual ("errors" , "Join" ).CallFunc (func (g * jen.Group ) {
322
- for _ , e := range errNames {
323
- g .Add (e .Generate ())
324
- }
325
- })),
326
+ stdgen .ErrorsJoin (errNames ... ),
326
327
),
327
328
ReturnOnError {},
328
329
)
Original file line number Diff line number Diff line change 4
4
"fmt"
5
5
6
6
. "github.com/gost-dom/code-gen/internal"
7
+ "github.com/gost-dom/code-gen/stdgen"
7
8
g "github.com/gost-dom/generators"
8
9
9
10
"github.com/dave/jennifer/jen"
@@ -48,9 +49,7 @@ func (gen V8TargetGenerators) CreateInitFunction(data ESConstructorData) g.Gener
48
49
}
49
50
50
51
func (gen V8TargetGenerators ) ReturnErrMsg (errGen g.Generator ) g.Generator {
51
- return g .Return (g .Nil ,
52
- g .NewValuePackage ("New" , "errors" ).Call (errGen ),
53
- )
52
+ return g .Return (g .Nil , stdgen .ErrorsNew (errGen ))
54
53
}
55
54
56
55
func (gen V8TargetGenerators ) WrapperStructGenerators () PlatformWrapperStructGenerators {
@@ -294,7 +293,7 @@ func CreateV8WrapperMethodInstanceInvocations(
294
293
statements .Append (
295
294
g .Return (
296
295
g .Nil ,
297
- g . Raw ( jen . Qual ( "errors" , "New" ). Call ( jen . Lit (missingArgsConts ) )),
296
+ stdgen . ErrorsNew ( g . Lit (missingArgsConts )),
298
297
),
299
298
)
300
299
break
Original file line number Diff line number Diff line change @@ -8,3 +8,11 @@ import (
8
8
func LogDebug (args ... g.Generator ) g.Generator {
9
9
return g .NewValuePackage ("Debug" , packagenames .Log ).Call (args ... )
10
10
}
11
+
12
+ func ErrorsJoin (args ... g.Generator ) g.Generator {
13
+ return g .NewValuePackage ("Join" , "errors" ).Call (args ... )
14
+ }
15
+
16
+ func ErrorsNew (arg g.Generator ) g.Generator {
17
+ return g .NewValuePackage ("New" , "errors" ).Call (arg )
18
+ }
You can’t perform that action at this time.
0 commit comments