@@ -418,17 +418,14 @@ private void GenerateEventInvoke(Event @event)
418
418
WriteLine ( $ "JSValue event = JS_Interop_FindEvent(&events, { @event . GlobalId } );") ;
419
419
WriteLine ( $ "if (JS_IsUndefined(event))") ;
420
420
421
+ var defaultValuePrinter = new CppDefaultValuePrinter ( Context ) ;
422
+ var defaultValue = functionType . ReturnType . Visit ( defaultValuePrinter ) ;
423
+
421
424
var isVoidReturn = functionType . ReturnType . Type . IsPrimitiveType ( PrimitiveType . Void ) ;
422
425
if ( isVoidReturn )
423
- {
424
426
WriteLineIndent ( $ "return;") ;
425
- }
426
427
else
427
- {
428
- var defaultValuePrinter = new CppDefaultValuePrinter ( Context ) ;
429
- var defaultValue = functionType . ReturnType . Visit ( defaultValuePrinter ) ;
430
428
WriteLineIndent ( $ "return { defaultValue } ;") ;
431
- }
432
429
NewLine ( ) ;
433
430
434
431
// Marshal the arguments.
@@ -460,24 +457,10 @@ private void GenerateEventInvoke(Event @event)
460
457
WriteLine ( $ "JSValue ret = JS_Call(ctx, data->function, JS_UNDEFINED, { @event . Parameters . Count } , argv);") ;
461
458
WriteLine ( $ "JS_FreeValue(ctx, ret);") ;
462
459
463
- var defaultValuePrinter = new CppDefaultValuePrinter ( Context ) ;
464
- var defaultValue = functionType . ReturnType . Visit ( defaultValuePrinter ) ;
465
- WriteLineIndent ( $ "return { defaultValue } ;") ;
466
-
467
- //WriteLine($"{@class.QualifiedOriginalName}* instance = data->instance;");
468
-
469
- /*
470
- if (!isVoidReturn)
471
- {
472
- CTypePrinter.PushContext(TypePrinterContextKind.Native);
473
- var returnType = function.ReturnType.Visit(CTypePrinter);
474
- CTypePrinter.PopContext();
475
-
476
- Write($"{returnType} {Helpers.ReturnIdentifier} = ");
477
- }
478
-
479
- var @class = function.Namespace as Class;
480
- */
460
+ if ( isVoidReturn )
461
+ WriteLineIndent ( $ "return;") ;
462
+ else
463
+ WriteLineIndent ( $ "return { defaultValue } ;") ;
481
464
482
465
UnindentAndWriteCloseBrace ( ) ;
483
466
}
0 commit comments