Skip to content

Commit 2c6cd98

Browse files
committed
Fix C++ warning about return values for event invokes.
1 parent 022709a commit 2c6cd98

File tree

1 file changed

+7
-24
lines changed

1 file changed

+7
-24
lines changed

src/Generator/Generators/QuickJS/QuickJSSources.cs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,14 @@ private void GenerateEventInvoke(Event @event)
418418
WriteLine($"JSValue event = JS_Interop_FindEvent(&events, {@event.GlobalId});");
419419
WriteLine($"if (JS_IsUndefined(event))");
420420

421+
var defaultValuePrinter = new CppDefaultValuePrinter(Context);
422+
var defaultValue = functionType.ReturnType.Visit(defaultValuePrinter);
423+
421424
var isVoidReturn = functionType.ReturnType.Type.IsPrimitiveType(PrimitiveType.Void);
422425
if (isVoidReturn)
423-
{
424426
WriteLineIndent($"return;");
425-
}
426427
else
427-
{
428-
var defaultValuePrinter = new CppDefaultValuePrinter(Context);
429-
var defaultValue = functionType.ReturnType.Visit(defaultValuePrinter);
430428
WriteLineIndent($"return {defaultValue};");
431-
}
432429
NewLine();
433430

434431
// Marshal the arguments.
@@ -460,24 +457,10 @@ private void GenerateEventInvoke(Event @event)
460457
WriteLine($"JSValue ret = JS_Call(ctx, data->function, JS_UNDEFINED, {@event.Parameters.Count}, argv);");
461458
WriteLine($"JS_FreeValue(ctx, ret);");
462459

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};");
481464

482465
UnindentAndWriteCloseBrace();
483466
}

0 commit comments

Comments
 (0)