ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.250 by root, Sat Sep 8 10:14:10 2007 UTC vs.
Revision 1.267 by root, Mon Dec 17 08:03:22 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann 5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
25 25
26#define PLUGIN_NAME "perl" 26#define PLUGIN_NAME "perl"
… …
30 30
31#if HAVE_EXECINFO_H 31#if HAVE_EXECINFO_H
32# include <execinfo.h> 32# include <execinfo.h>
33#endif 33#endif
34 34
35#include <plugin_common.h>
36#include <sounds.h>
37#include <cstdarg> 35#include <cstdarg>
36
37#include "global.h"
38#include "loader.h"
39#include "../random_maps/random_map.h"
38#include <sproto.h> 40#include <sproto.h>
39
40#include "loader.h"
41#include "cfperl.h"
42#include "shstr.h"
43 41
44#include <unistd.h> 42#include <unistd.h>
45#if _POSIX_MEMLOCK 43#if _POSIX_MEMLOCK
46# include <sys/mman.h> 44# include <sys/mman.h>
45#endif
46
47#if HAVE_MALLOC_H
48# include <malloc.h>
47#endif 49#endif
48 50
49#include <EXTERN.h> 51#include <EXTERN.h>
50#include <perl.h> 52#include <perl.h>
51#include <XSUB.h> 53#include <XSUB.h>
… …
68 typedef double val64; 70 typedef double val64;
69# define newSVval64 newSVnv 71# define newSVval64 newSVnv
70# define SvVAL64 SvNV 72# define SvVAL64 SvNV
71#endif 73#endif
72 74
73static f_plug_api gethook = cfapi_get_hooks;
74static f_plug_api object_insert = cfapi_object_insert;
75
76static PerlInterpreter *perl; 75static PerlInterpreter *perl;
77 76
78tstamp NOW, runtime; 77tstamp NOW, runtime;
79 78
80global gbl_ev; 79global gbl_ev;
81static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 80static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
82static SV *sv_runtime, *sv_next_tick; 81static SV *sv_runtime, *sv_next_tick, *sv_now;
83 82
84bitset<NUM_EVENT_TYPES> ev_want_event; 83bitset<NUM_EVENT_TYPES> ev_want_event;
85bitset<NUM_TYPES> ev_want_type; 84bitset<NUM_TYPES> ev_want_type;
86 85
87static HV 86static HV
… …
97 *stash_cf_living_wrap; 96 *stash_cf_living_wrap;
98 97
99static inline SV * 98static inline SV *
100newSVpv_utf8 (const char *s) 99newSVpv_utf8 (const char *s)
101{ 100{
101 if (!s)
102 return newSV (0);
103
102 SV *sv = newSVpv (s, 0); 104 SV *sv = newSVpv (s, 0);
103 SvUTF8_on (sv); 105 SvUTF8_on (sv);
104 return sv; 106 return sv;
105} 107}
106 108
107static inline SV * 109static inline SV *
108newSVpvn_utf8 (const char *s, STRLEN l) 110newSVpvn_utf8 (const char *s, STRLEN l)
109{ 111{
112 if (!s)
113 return newSV (0);
114
110 SV *sv = newSVpvn (s, l); 115 SV *sv = newSVpvn (s, l);
111 SvUTF8_on (sv); 116 SvUTF8_on (sv);
112 return sv; 117 return sv;
113} 118}
114 119
… …
321newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 326newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
322{ 327{
323 SV *sv; 328 SV *sv;
324 329
325 if (!ptr) 330 if (!ptr)
326 return &PL_sv_undef; 331 return newSV (0);
327 332
328 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 333 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
329 return sv_bless (newRV_noinc ((SV *)hv), stash); 334 return sv_bless (newRV_noinc ((SV *)hv), stash);
330} 335}
331 336
… …
350 355
351static SV * 356static SV *
352newSVattachable (attachable *obj, HV *stash) 357newSVattachable (attachable *obj, HV *stash)
353{ 358{
354 if (!obj) 359 if (!obj)
355 return &PL_sv_undef; 360 return newSV (0);
356 361
357 if (!obj->self) 362 if (!obj->self)
358 obj->self = newHV (); 363 obj->self = newHV ();
359 364
360 if (!SvOBJECT (obj->self)) 365 if (!SvOBJECT (obj->self))
… …
407 return SvPTR (sv, klass); 412 return SvPTR (sv, klass);
408 else 413 else
409 return 0; 414 return 0;
410} 415}
411 416
412inline SV *to_sv (const shstr & v) { return v ? newSVpvn_utf8 ((const char *)v, v.length ()) : &PL_sv_undef; } 417inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : &PL_sv_undef; } 418inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 419inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 420inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 421inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 422inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 423inline SV *to_sv (unsigned short v) { return newSVuv (v); }
… …
524 break; 529 break;
525 530
526 case DT_STRING: 531 case DT_STRING:
527 { 532 {
528 char *str = (char *)va_arg (ap, const char *); 533 char *str = (char *)va_arg (ap, const char *);
529 sv = str ? newSVpv (str, 0) : &PL_sv_undef; 534 sv = str ? newSVpv (str, 0) : newSV (0);
530 } 535 }
531 break; 536 break;
532 537
533 case DT_DATA: 538 case DT_DATA:
534 { 539 {
535 char *str = (char *)va_arg (ap, const void *); 540 char *str = (char *)va_arg (ap, const void *);
536 int len = va_arg (ap, int); 541 int len = va_arg (ap, int);
537 sv = str ? newSVpv (str, len) : &PL_sv_undef; 542 sv = str ? newSVpv (str, len) : newSV (0);
538 } 543 }
539 break; 544 break;
540 545
541 case DT_OBJECT: 546 case DT_OBJECT:
542 sv = to_sv (va_arg (ap, object *)); 547 sv = to_sv (va_arg (ap, object *));
… …
584 va_end (ap); 589 va_end (ap);
585 590
586 return sv; 591 return sv;
587} 592}
588 593
589static SV *
590newSVcfapi (int type, ...)
591{
592 SV *sv;
593
594 va_list ap;
595 va_start (ap, type);
596
597 switch (type)
598 {
599 case CFAPI_INT: sv = newSViv (*va_arg (ap, int * )); break;
600 case CFAPI_LONG: sv = newSVval64 (*va_arg (ap, sint64 *)); break;
601 case CFAPI_DOUBLE: sv = newSVnv (*va_arg (ap, double *)); break;
602 case CFAPI_STRING: sv = newSVdt_va (ap, DT_STRING); break;
603 case CFAPI_POBJECT: sv = newSVdt_va (ap, DT_OBJECT); break;
604 case CFAPI_PMAP: sv = newSVdt_va (ap, DT_MAP ); break;
605 case CFAPI_PPLAYER: sv = newSVdt_va (ap, DT_PLAYER); break;
606 case CFAPI_PARCH: sv = newSVdt_va (ap, DT_ARCH ); break;
607 case CFAPI_PPARTY: sv = newSVdt_va (ap, DT_PARTY ); break;
608 case CFAPI_PREGION: sv = newSVdt_va (ap, DT_REGION); break;
609
610 default:
611 assert (("unhandled type in newSVcfapi", 0));
612 }
613
614 va_end (ap);
615
616 return sv;
617}
618
619////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 594//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
620 595
621SV * 596SV *
622registry (attachable *ext) 597registry (attachable *ext)
623{ 598{
… …
626 601
627 return newRV_inc ((SV *)ext->cb); 602 return newRV_inc ((SV *)ext->cb);
628} 603}
629 604
630///////////////////////////////////////////////////////////////////////////// 605/////////////////////////////////////////////////////////////////////////////
631
632extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
633{
634 return 0;
635}
636
637static CommArray_s rtn_cmd;
638
639static int
640runPluginCommand (object *obj, char *params)
641{
642 return -1;
643}
644
645extern "C" void *cfperl_getPluginProperty (int *type, ...)
646{
647 va_list args;
648 char *propname;
649 int i;
650 va_start (args, type);
651 propname = va_arg (args, char *);
652 //printf ("Property name: %s\n", propname);
653
654 if (!strcmp (propname, "command?"))
655 return NULL;
656 else if (!strcmp (propname, "Identification"))
657 {
658 va_end (args);
659 return (void *)PLUGIN_NAME;
660 }
661 else if (!strcmp (propname, "FullName"))
662 {
663 va_end (args);
664 return (void *)PLUGIN_VERSION;
665 }
666 else
667 va_end (args);
668
669 return NULL;
670}
671
672extern "C" int cfperl_postInitPlugin ()
673{
674 int hooktype = 1;
675 int rtype = 0;
676
677 cf_init_plugin (gethook);
678
679 return 0;
680}
681
682extern "C" int cfperl_closePlugin ()
683{
684 return 0;
685}
686 606
687void 607void
688cfperl_init () 608cfperl_init ()
689{ 609{
690 PERL_SYS_INIT3 (&settings.argc, &settings.argv, 0); 610 PERL_SYS_INIT3 (&settings.argc, &settings.argv, 0);
… …
694 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 614 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
695 615
696 const char *argv[] = { 616 const char *argv[] = {
697 settings.argv [0], 617 settings.argv [0],
698 "-e" 618 "-e"
699 "use Event; use Coro;" // required for bootstrap 619 "use EV; use Coro;" // required for bootstrap
700 "cf->bootstrap;" // required for datadir :*> 620 "cf->bootstrap;" // required for datadir :*>
701 "unshift @INC, cf::datadir ();" 621 "unshift @INC, cf::datadir ();"
702 "require cf;" 622 "require cf;"
703 }; 623 };
704 624
705 if (perl_parse (perl, xs_init, 2, (char **)argv, (char **)NULL) 625 if (perl_parse (perl, xs_init, 2, (char **)argv, (char **)NULL)
… …
1179#endif 1099#endif
1180} 1100}
1181 1101
1182///////////////////////////////////////////////////////////////////////////// 1102/////////////////////////////////////////////////////////////////////////////
1183 1103
1184struct EventAPI *watcher_base::GEventAPI; 1104struct EVAPI *evapi::GEVAPI;
1185struct CoroAPI *coroapi::GCoroAPI; 1105struct CoroAPI *coroapi::GCoroAPI;
1186 1106
1187int coroapi::cede_counter; 1107int coroapi::cede_counter;
1188tstamp coroapi::next_cede; 1108tstamp coroapi::next_cede;
1189 1109
1190void coroapi::do_cede_to_tick () 1110void coroapi::do_cede_to_tick ()
… …
1192 cede_counter = 0; 1112 cede_counter = 0;
1193 1113
1194 cede (); 1114 cede ();
1195 1115
1196 next_cede += (TICK / CEDES_PER_TICK) * 0.99; 1116 next_cede += (TICK / CEDES_PER_TICK) * 0.99;
1197 if (next_cede > SvNV (sv_next_tick) - 0.02) 1117 if (next_cede > SvNVx (sv_next_tick) - 0.02)
1198 next_cede = SvNV (sv_next_tick); 1118 next_cede = SvNVx (sv_next_tick);
1199} 1119}
1200 1120
1201void coroapi::do_cede_every () 1121void coroapi::do_cede_every ()
1202{ 1122{
1203 cede_counter = 0; 1123 cede_counter = 0;
… …
1227 CALL_BEGIN (0); 1147 CALL_BEGIN (0);
1228 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD); 1148 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD);
1229 CALL_END; 1149 CALL_END;
1230} 1150}
1231 1151
1232static void
1233iw_dispatch (pe_event *ev)
1234{
1235 iw *w = (iw *)ev->ext_data;
1236 w->call (*w);
1237}
1238
1239void
1240iw::alloc ()
1241{
1242 pe = GEventAPI->new_idle (0, 0);
1243
1244 WaREENTRANT_off (pe);
1245 pe->base.callback = (void *)iw_dispatch;
1246 pe->base.ext_data = (void *)this;
1247}
1248
1249static void iow_dispatch (pe_event *ev)
1250{
1251 iow *w = (iow *)ev->ext_data;
1252 w->call (*w, ((pe_ioevent *)ev)->got);
1253}
1254
1255void
1256iow::alloc ()
1257{
1258 pe = GEventAPI->new_io (0, 0);
1259
1260 WaREENTRANT_off (pe);
1261 pe->base.callback = (void *)iow_dispatch;
1262 pe->base.ext_data = (void *)this;
1263
1264 pe->fd = -1;
1265 pe->poll = 0;
1266}
1267
1268void
1269iow::fd (int fd)
1270{
1271 pe->fd = fd;
1272}
1273
1274int
1275iow::poll ()
1276{
1277 return pe->poll;
1278}
1279
1280void 1152void
1281iow::poll (int events) 1153iow::poll (int events)
1282{ 1154{
1283 if (pe->poll != events) 1155 if (events != this->events)
1284 { 1156 {
1157 int active = ev_is_active ((ev_io *)this);
1285 if (pe->poll) stop (); 1158 if (active) stop ();
1286 pe->poll = events; 1159 ev_io_set ((ev_io *)this, fd, events);
1287 if (pe->poll) start (); 1160 if (active) start ();
1288 } 1161 }
1289} 1162}
1290 1163
1291void 1164void
1292_connect_to_perl () 1165_connect_to_perl ()
… …
1301 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1174 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1302 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1175 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1303 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1176 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1304 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1177 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1305 1178
1179 sv_now = get_sv ("cf::NOW" , 1); sv_upgrade (sv_now , SVt_NV);
1306 sv_runtime = get_sv ("cf::RUNTIME" , 1); sv_upgrade (sv_runtime , SVt_NV); 1180 sv_runtime = get_sv ("cf::RUNTIME" , 1); sv_upgrade (sv_runtime , SVt_NV);
1307 sv_next_tick = get_sv ("cf::NEXT_TICK", 1); sv_upgrade (sv_next_tick, SVt_NV); 1181 sv_next_tick = get_sv ("cf::NEXT_TICK", 1); sv_upgrade (sv_next_tick, SVt_NV);
1308 1182
1309 cb_global = get_av ("cf::CB_GLOBAL", 1); 1183 cb_global = get_av ("cf::CB_GLOBAL", 1);
1310 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1184 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
… …
1317 1191
1318MODULE = cf PACKAGE = cf PREFIX = cf_ 1192MODULE = cf PACKAGE = cf PREFIX = cf_
1319 1193
1320BOOT: 1194BOOT:
1321{ 1195{
1322 I_EVENT_API (PACKAGE); watcher_base::GEventAPI = GEventAPI; 1196 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1323 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1197 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1324 1198
1325 _connect_to_perl (); 1199 _connect_to_perl ();
1326 1200
1327 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1201 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1328 1202
… …
1346 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1220 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1347 1221
1348 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1222 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1349 1223
1350 const_iv (MAX_TIME) 1224 const_iv (MAX_TIME)
1225 const_iv (MAXSOCKBUF)
1351 1226
1352 const_iv (NUM_BODY_LOCATIONS) 1227 const_iv (NUM_BODY_LOCATIONS)
1353 const_iv (body_range) const_iv (body_shield) const_iv (body_combat) 1228 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1354 const_iv (body_arm) const_iv (body_torso) const_iv (body_head) 1229 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1355 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger) 1230 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
… …
1500 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1375 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1501 1376
1502 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1377 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1503 1378
1504 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1379 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1505 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR) const_iv (INS_MAP_LOAD) 1380 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1506 1381
1507 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL) 1382 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1508 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD) 1383 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1509 1384
1510 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1385 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
… …
1549 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1424 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1550 1425
1551 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1426 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1552 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1427 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1553 1428
1429 const_iv (VERSION_CS) const_iv (VERSION_SC)
1430
1554 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1431 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1555 1432
1556 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM) 1433 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1557 1434
1558 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1435 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
… …
1659 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1536 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1660} 1537}
1661 1538
1662void _post_tick () 1539void _post_tick ()
1663 CODE: 1540 CODE:
1664 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK); 1541 coroapi::next_cede = SvNVx (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK);
1665 1542
1666NV till_cede () 1543NV till_cede ()
1667 CODE: 1544 CODE:
1668 RETVAL = coroapi::next_cede - now (); 1545 RETVAL = coroapi::next_cede - now ();
1669 OUTPUT: 1546 OUTPUT:
1670 RETVAL 1547 RETVAL
1671 1548
1672NV till_tick () 1549NV till_tick ()
1673 CODE: 1550 CODE:
1674 RETVAL = SvNV (sv_next_tick) - now (); 1551 RETVAL = SvNVx (sv_next_tick) - now ();
1675 OUTPUT: 1552 OUTPUT:
1676 RETVAL 1553 RETVAL
1677 1554
1678NV floor (NV x) 1555NV floor (NV x)
1679 1556
… …
1707 CODE: 1584 CODE:
1708 coroapi::cede_to_tick (); 1585 coroapi::cede_to_tick ();
1709 1586
1710void server_tick () 1587void server_tick ()
1711 CODE: 1588 CODE:
1712 NOW = now (); 1589 NOW = SvNVx (sv_now);
1713 runtime = SvNVx (sv_runtime); 1590 runtime = SvNVx (sv_runtime);
1714 server_tick (); 1591 server_tick ();
1715 1592
1716void 1593void
1717log_backtrace (utf8_string msg) 1594log_backtrace (utf8_string msg)
… …
1724octet_string path_combine (octet_string base, octet_string path) 1601octet_string path_combine (octet_string base, octet_string path)
1725 PROTOTYPE: $$ 1602 PROTOTYPE: $$
1726 1603
1727octet_string path_combine_and_normalize (octet_string base, octet_string path) 1604octet_string path_combine_and_normalize (octet_string base, octet_string path)
1728 PROTOTYPE: $$ 1605 PROTOTYPE: $$
1606
1607void
1608mallinfo ()
1609 PPCODE:
1610{
1611#if __GLIBC__
1612 struct mallinfo mai = mallinfo ();
1613 EXTEND (SP, 10*2);
1614 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1615 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1616 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1617 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1618 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1619 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1620 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1621 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1622 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1623 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1624#endif
1625 EXTEND (SP, 2*2);
1626 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1627 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1628}
1729 1629
1730void 1630void
1731sub_generation_inc () 1631sub_generation_inc ()
1732 CODE: 1632 CODE:
1733 PL_sub_generation++; 1633 PL_sub_generation++;
… …
1766 1666
1767void emergency_save () 1667void emergency_save ()
1768 1668
1769void _exit (int status = EXIT_SUCCESS) 1669void _exit (int status = EXIT_SUCCESS)
1770 1670
1771UV sv_2watcher (SV *w)
1772 CODE:
1773 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1774 OUTPUT:
1775 RETVAL
1776
1777#if _POSIX_MEMLOCK 1671#if _POSIX_MEMLOCK
1778 1672
1779int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1673int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1780 1674
1781int munlockall () 1675int munlockall ()
… …
1931void 1825void
1932inv (object *obj) 1826inv (object *obj)
1933 PROTOTYPE: $ 1827 PROTOTYPE: $
1934 PPCODE: 1828 PPCODE:
1935{ 1829{
1936 object *o;
1937 for (o = obj->inv; o; o = o->below) 1830 for (object *o = obj->inv; o; o = o->below)
1938 XPUSHs (sv_2mortal (to_sv (o))); 1831 XPUSHs (sv_2mortal (to_sv (o)));
1939} 1832}
1940 1833
1941void 1834void
1942set_animation (object *op, int idx) 1835set_animation (object *op, int idx)
… …
1974 1867
1975int need_identify (object *obj); 1868int need_identify (object *obj);
1976 1869
1977int apply_shop_mat (object *shop_mat, object *op); 1870int apply_shop_mat (object *shop_mat, object *op);
1978 1871
1979int move_player (object *op, int dir)
1980 CODE:
1981 RETVAL = move_player (op, dir);
1982 OUTPUT:
1983 RETVAL
1984
1985int move (object *op, int dir, object *originator = op) 1872int move (object *op, int dir, object *originator = op)
1986 CODE: 1873 CODE:
1987 RETVAL = move_ob (op, dir, originator); 1874 RETVAL = move_ob (op, dir, originator);
1988 OUTPUT: 1875 OUTPUT:
1989 RETVAL 1876 RETVAL
… …
1995void apply_below (object *op) 1882void apply_below (object *op)
1996 CODE: 1883 CODE:
1997 player_apply_below (op); 1884 player_apply_below (op);
1998 1885
1999int cast_heal (object *op, object *caster, object *spell, int dir = 0) 1886int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2000
2001object *cf_object_present_archname_inside (object *op, utf8_string whatstr)
2002
2003int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
2004
2005int cf_object_change_map (object *op, int x, int y, maptile *map)
2006 1887
2007#//TODO 1888#//TODO
2008object *clone_ (object *op, int recursive = 0) 1889object *clone_ (object *op, int recursive = 0)
2009 CODE: 1890 CODE:
2010 if (recursive) 1891 if (recursive)
… …
2057 1938
2058void drop (object *who, object *op) 1939void drop (object *who, object *op)
2059 1940
2060void pick_up (object *who, object *op) 1941void pick_up (object *who, object *op)
2061 1942
2062int cf_object_teleport (object *op, maptile *map, int x, int y)
2063
2064void update_object (object *op, int action) 1943void update_object (object *op, int action)
2065 1944
2066object *cf_create_object_by_name (utf8_string name)
2067
2068void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 1945void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0)
2069 1946
2070void player_lvl_adj (object *who, object *skill = 0) 1947void player_lvl_adj (object *who, object *skill = 0)
2071 1948
2072int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 1949int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
… …
2083 1960
2084void handle_apply_yield (object *op); 1961void handle_apply_yield (object *op);
2085 1962
2086 1963
2087MODULE = cf PACKAGE = cf::object PREFIX = cf_ 1964MODULE = cf PACKAGE = cf::object PREFIX = cf_
2088
2089object *cf_insert_ob_in_ob (object *ob, object *where)
2090 1965
2091# no clean way to get an object from an archetype - stupid idiotic 1966# no clean way to get an object from an archetype - stupid idiotic
2092# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 1967# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2093 1968
2094object *new (utf8_string archetype = 0) 1969object *new (utf8_string archetype = 0)
… …
2103# TODO: nuke 1978# TODO: nuke
2104object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 1979object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2105 PROTOTYPE: $$$$$$ 1980 PROTOTYPE: $$$$$$
2106 CODE: 1981 CODE:
2107{ 1982{
2108 int unused_type; 1983 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2109 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
2110} 1984}
2111 1985
2112const_utf8_string get_ob_key_value (object *op, utf8_string key) 1986const_utf8_string get_ob_key_value (object *op, utf8_string key)
2113 1987
2114bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 1988bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1)
… …
2127 EXTEND (SP, 5); 2001 EXTEND (SP, 5);
2128 PUSHs (newSVuv (rv.distance)); 2002 PUSHs (newSVuv (rv.distance));
2129 PUSHs (newSViv (rv.distance_x)); 2003 PUSHs (newSViv (rv.distance_x));
2130 PUSHs (newSViv (rv.distance_y)); 2004 PUSHs (newSViv (rv.distance_y));
2131 PUSHs (newSViv (rv.direction)); 2005 PUSHs (newSViv (rv.direction));
2132 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part)); 2006 PUSHs (to_sv (rv.part));
2133} 2007}
2134 2008
2135bool on_same_map_as (object *ob, object *other) 2009bool on_same_map_as (object *ob, object *other)
2136 CODE: 2010 CODE:
2137 RETVAL = on_same_map (ob, other); 2011 RETVAL = on_same_map (ob, other);
… …
2143 RETVAL = query_base_name (op, plural); 2017 RETVAL = query_base_name (op, plural);
2144 OUTPUT: RETVAL 2018 OUTPUT: RETVAL
2145 2019
2146object *decrease_ob_nr (object *op, unsigned long i) 2020object *decrease_ob_nr (object *op, unsigned long i)
2147 2021
2022# return the tail of an object, excluding itself
2023void
2024tail (object *op)
2025 PPCODE:
2026 while ((op = op->more))
2027 XPUSHs (sv_2mortal (to_sv (op)));
2028
2148MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2029MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
2149 2030
2150player *player (object *op) 2031player *player (object *op)
2151 CODE: 2032 CODE:
2152 RETVAL = op->contr; 2033 RETVAL = op->contr;
2153 OUTPUT: RETVAL 2034 OUTPUT: RETVAL
2154 2035
2036bool move_player (object *op, int dir)
2037
2155void check_score (object *op) 2038void check_score (object *op)
2156 2039
2157void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2040void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2158 CODE: 2041 CODE:
2159 new_draw_info (flags, 0, op, txt); 2042 new_draw_info (flags, 0, op, txt);
2160 2043
2161void kill_player (object *op) 2044void kill_player (object *op)
2162 2045
2046void esrv_send_item (object *pl, object *item)
2047
2163void esrv_update_item (object *op, int what, object *item) 2048void esrv_update_item (object *pl, int what, object *item)
2164 C_ARGS: what, op, item 2049 C_ARGS: what, pl, item
2050
2051void esrv_del_item (object *pl, int tag)
2052 C_ARGS: pl->contr, tag
2165 2053
2166int command_summon (object *op, utf8_string params) 2054int command_summon (object *op, utf8_string params)
2167 2055
2168int command_arrest (object *op, utf8_string params) 2056int command_arrest (object *op, utf8_string params)
2169 2057
… …
2190 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2078 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2191 pl->orig_stats = pl->ob->stats; 2079 pl->orig_stats = pl->ob->stats;
2192 2080
2193void clear_los (player *pl) 2081void clear_los (player *pl)
2194 2082
2195void cf_player_move (player *pl, int dir)
2196
2197bool 2083bool
2198cell_visible (player *pl, int dx, int dy) 2084cell_visible (player *pl, int dx, int dy)
2199 CODE: 2085 CODE:
2200 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2086 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2201 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]; 2087 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
… …
2207 CODE: 2093 CODE:
2208{ 2094{
2209 STRLEN len; 2095 STRLEN len;
2210 char *buf = SvPVbyte (packet, len); 2096 char *buf = SvPVbyte (packet, len);
2211 2097
2098 if (len > MAXSOCKBUF)
2099 pl->failmsg ("[packet too long for client]");
2212 if (pl->ns) 2100 else if (pl->ns)
2213 pl->ns->send_packet (buf, len); 2101 pl->ns->send_packet (buf, len);
2214} 2102}
2215 2103
2216int 2104int
2217listening (player *pl, int new_value = -1) 2105listening (player *pl, int new_value = -1)
… …
2253 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END); 2141 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END);
2254 OUTPUT: RETVAL 2142 OUTPUT: RETVAL
2255 2143
2256SV *registry (maptile *map) 2144SV *registry (maptile *map)
2257 2145
2146void
2147find_tagged_objects (maptile *map, utf8_string tag = 0)
2148 PPCODE:
2149{
2150 if (!map->spaces)
2151 XSRETURN_EMPTY;
2152
2153 if (tag)
2154 {
2155 shstr_cmp tag_ (tag);
2156
2157 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2158 for (object *op = ms->bot; op; op = op->above)
2159 if (op->tag == tag_)
2160 XPUSHs (sv_2mortal (to_sv (op)));
2161 }
2162 else
2163 {
2164 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2165 for (object *op = ms->bot; op; op = op->above)
2166 if (op->tag)
2167 XPUSHs (sv_2mortal (to_sv (op)));
2168 }
2169}
2170
2258INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2171INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2259 2172
2260void 2173void
2261maptile::instantiate () 2174maptile::instantiate ()
2262 2175
… …
2393get_connection (maptile *map, long connection) 2306get_connection (maptile *map, long connection)
2394 PPCODE: 2307 PPCODE:
2395 oblinkpt *obp = get_connection_links (map, connection); 2308 oblinkpt *obp = get_connection_links (map, connection);
2396 if (obp) 2309 if (obp)
2397 for (objectlink *ol = obp->link; ol; ol = ol->next) 2310 for (objectlink *ol = obp->link; ol; ol = ol->next)
2398 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob))); 2311 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2399
2400object *cf_map_insert_object_there (maptile *where, object *op, object *originator, int flags)
2401
2402object *cf_map_insert_object (maptile *where, object* op, int x, int y)
2403
2404object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2405 C_ARGS: str, map, nx, ny
2406 2312
2407void 2313void
2408get_map_flags (maptile *map, int x, int y) 2314get_map_flags (maptile *map, int x, int y)
2409 PPCODE: 2315 PPCODE:
2410{ 2316{
… …
2415 EXTEND (SP, 4); 2321 EXTEND (SP, 4);
2416 PUSHs (sv_2mortal (newSViv (flags))); 2322 PUSHs (sv_2mortal (newSViv (flags)));
2417 2323
2418 if (GIMME_V == G_ARRAY) 2324 if (GIMME_V == G_ARRAY)
2419 { 2325 {
2420 PUSHs (sv_2mortal (newSVcfapi (CFAPI_PMAP, nmap))); 2326 PUSHs (sv_2mortal (to_sv (nmap)));
2421 PUSHs (sv_2mortal (newSViv (nx))); 2327 PUSHs (sv_2mortal (newSViv (nx)));
2422 PUSHs (sv_2mortal (newSViv (ny))); 2328 PUSHs (sv_2mortal (newSViv (ny)));
2423 } 2329 }
2424} 2330}
2425 2331
… …
2434 2340
2435 get_map_flags (map, &nmap, x, y, &nx, &ny); 2341 get_map_flags (map, &nmap, x, y, &nx, &ny);
2436 2342
2437 if (nmap) 2343 if (nmap)
2438 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2344 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above)
2439 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 2345 XPUSHs (sv_2mortal (to_sv (o)));
2440} 2346}
2441 2347
2442SV * 2348SV *
2443bot_at (maptile *obj, unsigned int x, unsigned int y) 2349bot_at (maptile *obj, unsigned int x, unsigned int y)
2444 PROTOTYPE: $$$ 2350 PROTOTYPE: $$$
… …
2453 INIT: 2359 INIT:
2454 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF; 2360 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2455 CODE: 2361 CODE:
2456 switch (ix) 2362 switch (ix)
2457 { 2363 {
2458 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break; 2364 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break;
2459 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break; 2365 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break;
2460 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break; 2366 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break;
2461 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break; 2367 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break;
2462 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2368 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2463 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break; 2369 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break;
2464 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break; 2370 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break;
2465 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 2371 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break;
2466 } 2372 }
2467 OUTPUT: RETVAL 2373 OUTPUT: RETVAL
2468 2374
2469void fix_walls (maptile *map, int x, int y) 2375void fix_walls (maptile *map, int x, int y)
2470 2376
… …
2651 CODE: 2557 CODE:
2652{ 2558{
2653 STRLEN len; 2559 STRLEN len;
2654 char *buf = SvPVbyte (packet, len); 2560 char *buf = SvPVbyte (packet, len);
2655 2561
2562 if (len > MAXSOCKBUF)
2563 {
2564 // ugly
2565 if (THIS->pl)
2566 THIS->pl->failmsg ("[packet too long for client]");
2567 }
2568 else
2656 THIS->send_packet (buf, len); 2569 THIS->send_packet (buf, len);
2657} 2570}
2658 2571
2659faceidx 2572faceidx
2660client::need_face (utf8_string name, int pri = 0) 2573client::need_face (utf8_string name, int pri = 0)
2661 CODE: 2574 CODE:
… …
2760 } 2673 }
2761} 2674}
2762 2675
2763int get_data_size (faceidx idx, int faceset = 0) 2676int get_data_size (faceidx idx, int faceset = 0)
2764 CODE: 2677 CODE:
2765 facedata *d = face_data (idx, faceset); assert (d); 2678 facedata *d = face_data (idx, faceset);
2679 if (!d) XSRETURN_UNDEF;
2766 RETVAL = d->data.size (); 2680 RETVAL = d->data.size ();
2767 OUTPUT: 2681 OUTPUT:
2768 RETVAL 2682 RETVAL
2769 2683
2770SV *get_chksum (faceidx idx, int faceset = 0) 2684SV *get_chksum (faceidx idx, int faceset = 0)
2771 CODE: 2685 CODE:
2772 facedata *d = face_data (idx, faceset); assert (d); 2686 facedata *d = face_data (idx, faceset);
2687 if (!d) XSRETURN_UNDEF;
2773 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2688 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);
2689 OUTPUT:
2690 RETVAL
2691
2692SV *get_data (faceidx idx, int faceset = 0)
2693 CODE:
2694 facedata *d = face_data (idx, faceset);
2695 if (!d) XSRETURN_UNDEF;
2696 RETVAL = newSVpvn (d->data.data (), d->data.length ());
2774 OUTPUT: 2697 OUTPUT:
2775 RETVAL 2698 RETVAL
2776 2699
2777void invalidate (faceidx idx) 2700void invalidate (faceidx idx)
2778 CODE: 2701 CODE:
… …
2864 CODE: 2787 CODE:
2865 object_thawer *self; 2788 object_thawer *self;
2866 sv_to (sv, self); 2789 sv_to (sv, self);
2867 delete self; 2790 delete self;
2868 2791
2792void
2793extract_tags (object_thawer *self)
2794 PPCODE:
2795 while (self->kw != KW_EOF)
2796 {
2797 PUTBACK;
2798 coroapi::cede_to_tick_every (5000);
2799 SPAGAIN;
2800
2801 if (self->kw == KW_tag)
2802 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2803
2804 self->skip ();
2805 }
2806

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines