Skip to content

Commit 3161f9b

Browse files
halx99halx99
committed
sync js bindings
1 parent c9547d5 commit 3161f9b

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎yasio/impl/yasio_jsb.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ bool js_yasio_io_event_kind(JSContext *ctx, uint32_t argc, jsval *vp)
11231123
cobj = (io_event *)(proxy ? proxy->ptr : nullptr);
11241124
JSB_PRECONDITION2(cobj, ctx, false, "js_yasio_io_event_kind : Invalid Native Object");
11251125

1126-
args.rval().set(int32_to_jsval(ctx, cobj->type()));
1126+
args.rval().set(int32_to_jsval(ctx, cobj->kind()));
11271127

11281128
return true;
11291129
}
@@ -1240,7 +1240,7 @@ bool js_yasio_io_service_start_service(JSContext *ctx, uint32_t argc, jsval *vp)
12401240
JS::RootedObject jstarget(ctx, args.thisv().toObjectOrNull());
12411241
std::shared_ptr<JSFunctionWrapper> func(
12421242
new JSFunctionWrapper(ctx, jstarget, arg1, args.thisv()));
1243-
io_event_callback_t callback = [=](inet::event_ptr event) {
1243+
io_event_cb_t callback = [=](inet::event_ptr event) {
12441244
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
12451245
jsval jevent = jsb_yasio_to_jsval(ctx, std::move(event));
12461246
JS::RootedValue rval(ctx);
@@ -1428,7 +1428,7 @@ bool js_yasio_io_service_set_option(JSContext *ctx, uint32_t argc, jsval *vp)
14281428
JS::RootedObject jstarget(ctx, args.thisv().toObjectOrNull());
14291429
std::shared_ptr<JSFunctionWrapper> func(
14301430
new JSFunctionWrapper(ctx, jstarget, args[1], args.thisv()));
1431-
io_event_callback_t callback = [=](inet::event_ptr event) {
1431+
io_event_cb_t callback = [=](inet::event_ptr event) {
14321432
JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET
14331433
jsval jevent = jsb_yasio_to_jsval(ctx, std::move(event));
14341434
JS::RootedValue rval(ctx);

‎yasio/impl/yasio_jsb20.cpp‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ SE_BIND_FINALIZE_FUNC(js_yasio_ibstream_finalize)
302302
static bool js_yasio_ibstream_read_bool(se::State &s)
303303
{
304304
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
305-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
305+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
306306
const auto &args = s.args();
307307
size_t argc = args.size();
308308

@@ -316,7 +316,7 @@ SE_BIND_FUNC(js_yasio_ibstream_read_bool)
316316
template <typename T> static bool js_yasio_ibstream_read_ix(se::State &s)
317317
{
318318
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
319-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
319+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
320320
const auto &args = s.args();
321321
size_t argc = args.size();
322322

@@ -335,7 +335,7 @@ SE_BIND_FUNC(js_yasio_ibstream_read_i32)
335335
template <typename T> static bool js_yasio_ibstream_read_ux(se::State &s)
336336
{
337337
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
338-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
338+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
339339
const auto &args = s.args();
340340
size_t argc = args.size();
341341

@@ -354,7 +354,7 @@ SE_BIND_FUNC(js_yasio_ibstream_read_u32)
354354
template <typename T> static bool js_yasio_ibstream_read_dx(se::State &s)
355355
{
356356
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
357-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
357+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
358358
const auto &args = s.args();
359359
size_t argc = args.size();
360360

@@ -372,7 +372,7 @@ SE_BIND_FUNC(js_yasio_ibstream_read_lf)
372372
static bool js_yasio_ibstream_read_i24(se::State &s)
373373
{
374374
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
375-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
375+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
376376
const auto &args = s.args();
377377
size_t argc = args.size();
378378

@@ -385,7 +385,7 @@ SE_BIND_FUNC(js_yasio_ibstream_read_i24)
385385
static bool js_yasio_ibstream_read_u24(se::State &s)
386386
{
387387
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
388-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
388+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
389389
const auto &args = s.args();
390390
size_t argc = args.size();
391391

@@ -398,7 +398,7 @@ SE_BIND_FUNC(js_yasio_ibstream_read_u24)
398398
static bool js_yasio_ibstream_read_string(se::State &s)
399399
{
400400
yasio::ibstream *cobj = (yasio::ibstream *)s.nativeThisObject();
401-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
401+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
402402
const auto &args = s.args();
403403
size_t argc = args.size();
404404

@@ -472,7 +472,7 @@ SE_BIND_CTOR(jsb_yasio_obstream_constructor, __jsb_yasio_obstream_class, js_yasi
472472
static bool js_yasio_obstream_push32(se::State &s)
473473
{
474474
auto cobj = (yasio::obstream *)s.nativeThisObject();
475-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
475+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
476476
const auto &args = s.args();
477477
size_t argc = args.size();
478478

@@ -487,7 +487,7 @@ SE_BIND_FUNC(js_yasio_obstream_push32)
487487
static bool js_yasio_obstream_pop32(se::State &s)
488488
{
489489
auto cobj = (yasio::obstream *)s.nativeThisObject();
490-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
490+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
491491
const auto &args = s.args();
492492
size_t argc = args.size();
493493

@@ -509,7 +509,7 @@ SE_BIND_FUNC(js_yasio_obstream_pop32)
509509
static bool js_yasio_obstream_push24(se::State &s)
510510
{
511511
auto cobj = (yasio::obstream *)s.nativeThisObject();
512-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
512+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
513513
const auto &args = s.args();
514514
size_t argc = args.size();
515515

@@ -524,7 +524,7 @@ SE_BIND_FUNC(js_yasio_obstream_push24)
524524
static bool js_yasio_obstream_pop24(se::State &s)
525525
{
526526
auto cobj = (yasio::obstream *)s.nativeThisObject();
527-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
527+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
528528
const auto &args = s.args();
529529
size_t argc = args.size();
530530

@@ -546,7 +546,7 @@ SE_BIND_FUNC(js_yasio_obstream_pop24)
546546
static bool js_yasio_obstream_push16(se::State &s)
547547
{
548548
auto cobj = (yasio::obstream *)s.nativeThisObject();
549-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
549+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
550550
const auto &args = s.args();
551551
size_t argc = args.size();
552552

@@ -561,7 +561,7 @@ SE_BIND_FUNC(js_yasio_obstream_push16)
561561
static bool js_yasio_obstream_pop16(se::State &s)
562562
{
563563
auto cobj = (yasio::obstream *)s.nativeThisObject();
564-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
564+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
565565
const auto &args = s.args();
566566
size_t argc = args.size();
567567

@@ -583,7 +583,7 @@ SE_BIND_FUNC(js_yasio_obstream_pop16)
583583
static bool js_yasio_obstream_push8(se::State &s)
584584
{
585585
auto cobj = (yasio::obstream *)s.nativeThisObject();
586-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
586+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
587587
const auto &args = s.args();
588588
size_t argc = args.size();
589589

@@ -598,7 +598,7 @@ SE_BIND_FUNC(js_yasio_obstream_push8)
598598
static bool js_yasio_obstream_pop8(se::State &s)
599599
{
600600
auto cobj = (yasio::obstream *)s.nativeThisObject();
601-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
601+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
602602
const auto &args = s.args();
603603
size_t argc = args.size();
604604

@@ -620,7 +620,7 @@ SE_BIND_FUNC(js_yasio_obstream_pop8)
620620
static bool js_yasio_obstream_write_bool(se::State &s)
621621
{
622622
auto cobj = (yasio::obstream *)s.nativeThisObject();
623-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
623+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
624624
const auto &args = s.args();
625625
size_t argc = args.size();
626626

@@ -635,7 +635,7 @@ SE_BIND_FUNC(js_yasio_obstream_write_bool)
635635
template <typename T> static bool js_yasio_obstream_write_ix(se::State &s)
636636
{
637637
auto cobj = (yasio::obstream *)s.nativeThisObject();
638-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
638+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
639639
const auto &args = s.args();
640640
size_t argc = args.size();
641641

@@ -655,7 +655,7 @@ SE_BIND_FUNC(js_yasio_obstream_write_i32)
655655
static bool js_yasio_obstream_write_i24(se::State &s)
656656
{
657657
auto cobj = (yasio::obstream *)s.nativeThisObject();
658-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
658+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
659659
const auto &args = s.args();
660660
size_t argc = args.size();
661661

@@ -670,7 +670,7 @@ SE_BIND_FUNC(js_yasio_obstream_write_i24)
670670
template <typename T> static bool js_yasio_obstream_write_dx(se::State &s)
671671
{
672672
auto cobj = (yasio::obstream *)s.nativeThisObject();
673-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
673+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
674674
const auto &args = s.args();
675675
size_t argc = args.size();
676676

@@ -692,7 +692,7 @@ SE_BIND_FUNC(js_yasio_obstream_write_lf)
692692
bool js_yasio_obstream_write_string(se::State &s)
693693
{
694694
auto cobj = (yasio::obstream *)s.nativeThisObject();
695-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
695+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
696696
const auto &args = s.args();
697697
size_t argc = args.size();
698698

@@ -708,7 +708,7 @@ SE_BIND_FUNC(js_yasio_obstream_write_string)
708708
bool js_yasio_obstream_length(se::State &s)
709709
{
710710
auto cobj = (yasio::obstream *)s.nativeThisObject();
711-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
711+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
712712
const auto &args = s.args();
713713
size_t argc = args.size();
714714

@@ -722,7 +722,7 @@ SE_BIND_FUNC(js_yasio_obstream_length)
722722
bool js_yasio_obstream_sub(se::State &s)
723723
{
724724
auto cobj = (yasio::obstream *)s.nativeThisObject();
725-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
725+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
726726
const auto &args = s.args();
727727
size_t argc = args.size();
728728

@@ -809,7 +809,7 @@ SE_BIND_FINALIZE_FUNC(jsb_yasio_io_event_finalize)
809809
bool js_yasio_io_event_channel_index(se::State &s)
810810
{
811811
auto cobj = (io_event *)s.nativeThisObject();
812-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
812+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
813813
const auto &args = s.args();
814814
size_t argc = args.size();
815815

@@ -822,7 +822,7 @@ SE_BIND_FUNC(js_yasio_io_event_channel_index)
822822
bool js_yasio_io_event_status(se::State &s)
823823
{
824824
auto cobj = (io_event *)s.nativeThisObject();
825-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
825+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
826826
const auto &args = s.args();
827827
size_t argc = args.size();
828828

@@ -835,11 +835,11 @@ SE_BIND_FUNC(js_yasio_io_event_status)
835835
bool js_yasio_io_event_kind(se::State &s)
836836
{
837837
auto cobj = (io_event *)s.nativeThisObject();
838-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
838+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
839839
const auto &args = s.args();
840840
size_t argc = args.size();
841841

842-
s.rval().setInt32(cobj->type());
842+
s.rval().setInt32(cobj->kind());
843843

844844
return true;
845845
}
@@ -848,7 +848,7 @@ SE_BIND_FUNC(js_yasio_io_event_kind)
848848
bool js_yasio_io_event_transport(se::State &s)
849849
{
850850
auto cobj = (io_event *)s.nativeThisObject();
851-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
851+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
852852
const auto &args = s.args();
853853
size_t argc = args.size();
854854

@@ -860,7 +860,7 @@ SE_BIND_FUNC(js_yasio_io_event_transport)
860860
bool js_yasio_io_event_take_packet(se::State &s)
861861
{
862862
auto cobj = (io_event *)s.nativeThisObject();
863-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
863+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
864864
const auto &args = s.args();
865865
size_t argc = args.size();
866866

@@ -913,7 +913,7 @@ SE_BIND_CTOR(jsb_yasio_io_service_constructor, __jsb_yasio_io_service_class,
913913
bool js_yasio_io_service_start_service(se::State &s)
914914
{
915915
auto cobj = (io_service *)s.nativeThisObject();
916-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
916+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
917917
const auto &args = s.args();
918918
size_t argc = args.size();
919919

@@ -928,7 +928,7 @@ bool js_yasio_io_service_start_service(se::State &s)
928928
se::Value jsThis(s.thisObject());
929929
se::Value jsFunc(args[1]);
930930
jsThis.toObject()->attachObject(jsFunc.toObject());
931-
io_event_callback_t callback = [=](inet::event_ptr event) {
931+
io_event_cb_t callback = [=](inet::event_ptr event) {
932932
se::ValueArray invokeArgs;
933933
invokeArgs.resize(1);
934934
native_ptr_to_seval<io_event>(event.release(), &invokeArgs[0]);
@@ -967,7 +967,7 @@ SE_BIND_FUNC(js_yasio_io_service_start_service)
967967
bool js_yasio_io_service_stop_service(se::State &s)
968968
{
969969
auto cobj = (io_service *)s.nativeThisObject();
970-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
970+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
971971

972972
cobj->stop_service();
973973
return true;
@@ -977,7 +977,7 @@ SE_BIND_FUNC(js_yasio_io_service_stop_service)
977977
bool js_yasio_io_service_open(se::State &s)
978978
{
979979
auto cobj = (io_service *)s.nativeThisObject();
980-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
980+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
981981
const auto &args = s.args();
982982
size_t argc = args.size();
983983

@@ -998,7 +998,7 @@ SE_BIND_FUNC(js_yasio_io_service_open)
998998
bool js_yasio_io_service_close(se::State &s)
999999
{
10001000
auto cobj = (io_service *)s.nativeThisObject();
1001-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
1001+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
10021002
const auto &args = s.args();
10031003
size_t argc = args.size();
10041004

@@ -1030,7 +1030,7 @@ SE_BIND_FUNC(js_yasio_io_service_close)
10301030
bool js_yasio_io_service_dispatch_events(se::State &s)
10311031
{
10321032
auto cobj = (io_service *)s.nativeThisObject();
1033-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
1033+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
10341034
const auto &args = s.args();
10351035
size_t argc = args.size();
10361036

@@ -1051,7 +1051,7 @@ SE_BIND_FUNC(js_yasio_io_service_dispatch_events)
10511051
bool js_yasio_io_service_set_option(se::State &s)
10521052
{
10531053
auto service = (io_service *)s.nativeThisObject();
1054-
SE_PRECONDITION2(service, false, __FUNCTION__ ": Invalid Native Object");
1054+
SE_PRECONDITION2(service, false, ": Invalid Native Object");
10551055
const auto &args = s.args();
10561056
size_t argc = args.size();
10571057

@@ -1090,7 +1090,7 @@ bool js_yasio_io_service_set_option(se::State &s)
10901090
se::Value jsThis(s.thisObject());
10911091
se::Value jsFunc(args[1]);
10921092
jsThis.toObject()->attachObject(jsFunc.toObject());
1093-
io_event_callback_t callback = [=](inet::event_ptr event) {
1093+
io_event_cb_t callback = [=](inet::event_ptr event) {
10941094
se::ValueArray invokeArgs;
10951095
invokeArgs.resize(1);
10961096
native_ptr_to_seval<io_event>(event.release(), &invokeArgs[0]);
@@ -1121,7 +1121,7 @@ SE_BIND_FUNC(js_yasio_io_service_set_option)
11211121
bool js_yasio_io_service_write(se::State &s)
11221122
{
11231123
auto cobj = (io_service *)s.nativeThisObject();
1124-
SE_PRECONDITION2(cobj, false, __FUNCTION__ ": Invalid Native Object");
1124+
SE_PRECONDITION2(cobj, false, ": Invalid Native Object");
11251125
const auto &args = s.args();
11261126
size_t argc = args.size();
11271127

0 commit comments

Comments
 (0)