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

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.75 by root, Sun Jun 3 11:22:02 2007 UTC vs.
Revision 1.108 by root, Mon Oct 12 14:00:58 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25// 25//
26// cfperl.h perl interface 26// cfperl.h perl interface
27// 27//
36 36
37#include <EXTERN.h> 37#include <EXTERN.h>
38#include <perl.h> 38#include <perl.h>
39#include <XSUB.h> 39#include <XSUB.h>
40 40
41#include <EventAPI.h> 41#include <EVAPI.h>
42#include <CoroAPI.h> 42#include <CoroAPI.h>
43 43
44#include "util.h" 44#include "util.h"
45#include "keyword.h" 45#include "keyword.h"
46#include "dynbuf.h" 46#include "dynbuf.h"
51// optimisations/workaround for functions requiring my_perl in scope (anti-bloat) 51// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
52#undef localtime 52#undef localtime
53#undef srand48 53#undef srand48
54#undef drand48 54#undef drand48
55#undef srandom 55#undef srandom
56#undef opendir
56#undef readdir 57#undef readdir
58#undef closedir
57#undef getprotobyname 59#undef getprotobyname
58#undef gethostbyname 60#undef gethostbyname
59#undef ctime 61#undef ctime
60#undef strerror 62#undef strerror
63#undef _
61 64
62// same here, massive symbol spamming 65// same here, massive symbol spamming
63#undef do_open 66#undef do_open
64#undef do_close 67#undef do_close
65#undef ref 68#undef ref
70#undef random 73#undef random
71#undef crypt 74#undef crypt
72 75
73////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 76//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
74 77
78#define _(msg) (msg)
79#define N_(msg) (msg)
80
81//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
82
75// some macros to simplify perl in-calls 83// some macros to simplify perl in-calls
76 84
77#define CHECK_ERROR \ 85#define CHECK_ERROR \
78 if (SvTRUE (ERRSV)) \ 86 if (SvTRUE (ERRSV)) \
79 LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV)); 87 LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
88
89inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
90inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); }
80 91
81#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args) 92#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
82#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc 93#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
83#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr))) 94#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
84#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN; 95#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
85#define CALL_END CHECK_ERROR; FREETMPS; LEAVE 96#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE
86 97
87////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 98//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
88 99
89void cfperl_init (); 100void cfperl_init ();
90void cfperl_main (); 101void cfperl_main ();
102void cfperl_tick ();
91void cfperl_emergency_save (); 103void cfperl_emergency_save ();
92void cfperl_cleanup (int make_core); 104void cfperl_cleanup (int make_core);
93void cfperl_make_book (object *book, int level); 105void cfperl_make_book (object *book, int level);
106void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
107int cfperl_can_merge (object *ob1, object *ob2);
108void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
94 109
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 110bool is_match_expr (const char *expr);
111/* applies the match expression and returns true if it matches */
112bool match (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
96 113
114//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
115
116#if IVSIZE >= 8
117 typedef IV val64;
118 typedef IV uval64;
119# define newSVval64 newSViv
120# define SvVAL64 SvIV
121# define newSVuval64 newSVuv
122# define SvUVAL64 SvUV
123#else
124 typedef double val64;
125 typedef double uval64;
126# define newSVval64 newSVnv
127# define SvVAL64 SvNV
128# define newSVuval64 newSVnv
129# define SvUVAL64 SvNV
130#endif
131
97// virtual server time, excluding time jumps and lag 132extern tstamp runtime; // virtual server time, excluding time jumps and lag
98extern double runtime; 133extern tstamp NOW; // real time of current server tick
99 134
100enum event_klass 135enum event_klass
101{ 136{
102 KLASS_NONE, 137 KLASS_NONE,
103 KLASS_GLOBAL, 138 KLASS_GLOBAL,
153int cfperl_result_INT (int idx); 188int cfperl_result_INT (int idx);
154 189
155////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 190//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
156 191
157INTERFACE_CLASS (attachable) 192INTERFACE_CLASS (attachable)
158struct attachable 193struct attachable : refcnt_base
159{ 194{
160 static MGVTBL vtbl; 195 static MGVTBL vtbl;
161
162 static unordered_vector<attachable *> mortals;
163 MTH static void check_mortals ();
164 196
165 enum { 197 enum {
166 F_DESTROYED = 0x01, 198 F_DESTROYED = 0x01,
167 F_DEBUG_TRACE = 0x02, 199 F_DEBUG_TRACE = 0x02,
168 }; 200 };
201 uint8 ACC (RW, flags);
202
203 static unordered_vector<attachable *> mortals;
204 MTH static void check_mortals ();
169 205
170 // object is delete'd after the refcount reaches 0 206 // object is delete'd after the refcount reaches 0
171 int ACC (RW, flags);
172 mutable int ACC (RW, refcnt);
173
174 MTH void refcnt_inc () const { ++refcnt; }
175 MTH void refcnt_dec () const { --refcnt; }
176
177 MTH int refcnt_cnt () const; 207 MTH int refcnt_cnt () const;
178 // check wether the object has died and destroy 208 // check wether the object has died and destroy
179 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); } 209 MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
180 210
181 // destroy the object unless it was already destroyed 211 // destroy the object unless it was already destroyed
200 230
201 void sever_self (); // sever this object from its self, if it has one. 231 void sever_self (); // sever this object from its self, if it has one.
202 void optimise (); // possibly save some memory by destroying unneeded data 232 void optimise (); // possibly save some memory by destroying unneeded data
203 233
204 attachable () 234 attachable ()
205 : flags (0), refcnt (0), self (0), cb (0), attach (0) 235 : flags (0), self (0), cb (0), attach (0)
206 { 236 {
207 } 237 }
208 238
209 attachable (const attachable &src) 239 attachable (const attachable &src)
210 : flags (0), refcnt (0), self (0), cb (0), attach (src.attach) 240 : flags (0), self (0), cb (0), attach (src.attach)
211 { 241 {
212 } 242 }
213 243
214 virtual ~attachable (); 244 // set a custom key to the given value, or delete it if value = 0
245 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
246
247 void set_key_text (const char *key, const char *value = 0)
248 {
249 set_key (key, value, 1);
250 }
251
252 void set_key_data (const char *key, const char *value = 0)
253 {
254 set_key (key, value, 0);
255 }
215 256
216 attachable &operator =(const attachable &src); 257 attachable &operator =(const attachable &src);
217 258
218 // used to _quickly_ device wether to shortcut the evaluation 259 // used to _quickly_ device wether to shortcut the evaluation
219 bool should_invoke (event_type event) 260 bool should_invoke (event_type event)
230 // do the real refcount checking work 271 // do the real refcount checking work
231 void do_check (); 272 void do_check ();
232 273
233 // the method that does the real destroy work 274 // the method that does the real destroy work
234 virtual void do_destroy (); 275 virtual void do_destroy ();
276
277 // destructor is protected, should not be called by anybody
278 virtual ~attachable ();
235}; 279};
236 280
237// the global object is a pseudo object that cares for the global events 281// the global object is a pseudo object that cares for the global events
238struct global : attachable 282struct global : attachable
239{ 283{
242 286
243extern struct global gbl_ev; 287extern struct global gbl_ev;
244 288
245////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 289//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
246 290
291INTERFACE_CLASS(object_freezer)
247struct object_freezer : dynbuf_text 292struct object_freezer : dynbuf_text
248{ 293{
249 AV *av; 294 AV *av;
250 295
251 object_freezer (); 296 object_freezer ();
252 ~object_freezer (); 297 ~object_freezer ();
253 298
254 void put (attachable *ext); 299 void put (attachable *ext);
255 300
256 // used only for user-defined key-value pairs 301 // used only for user-defined key-value pairs
257 void put (const shstr &k, const shstr &v) 302 void put (shstr_tmp k, shstr_tmp v)
258 { 303 {
259 add (k); 304 add (k);
260 305
261 if (expect_true (v)) 306 if (expect_true (v))
262 add (' '), add (v); 307 add (' '), add (v);
263 308
264 add ('\n'); 309 add ('\n');
265 } 310 }
266 311
267 template<typename T> 312 template<typename T>
268 void put_string (keyword k, const T &v) 313 void put_kw_string (keyword k, const T &v)
269 { 314 {
270 int klen = keyword_len [k]; 315 int klen = keyword_len [k];
271 int vlen = v ? strlen (v) + 1 : 0; 316 int vlen = v ? strlen (v) + 1 : 0;
272 317
273 char *p = (char *)alloc (klen + vlen + 1); 318 char *p = (char *)alloc (klen + vlen + 1);
283 *p = '\n'; 328 *p = '\n';
284 } 329 }
285 330
286 void put (keyword k, const char *v = 0) 331 void put (keyword k, const char *v = 0)
287 { 332 {
288 put_string (k, v); 333 put_kw_string (k, v);
289 } 334 }
290 335
291 void put (keyword k, const shstr &v) 336 void put (keyword k, shstr_tmp v)
292 { 337 {
293 put_string (k, v); 338 put_kw_string (k, v);
294 } 339 }
295 340
296 void put (keyword k, double v) 341 void put (keyword k, double v)
297 { 342 {
298 force (MAX_KEYWORD_LEN + 2 + 32); 343 force (MAX_KEYWORD_LEN + 2 + 32);
330 void put (keyword k, signed long v) { put_(k, (sint64)v); } 375 void put (keyword k, signed long v) { put_(k, (sint64)v); }
331 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 376 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
332 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 377 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
333 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 378 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
334 379
335 void put (keyword kbeg, keyword kend, const shstr &v) 380 void put (keyword kbeg, keyword kend, shstr_tmp v)
336 { 381 {
337 force (MAX_KEYWORD_LEN + 1); 382 force (MAX_KEYWORD_LEN + 1);
338 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 383 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
339 384
340 if (expect_true (v)) 385 if (expect_true (v))
345 390
346 force (MAX_KEYWORD_LEN + 1); 391 force (MAX_KEYWORD_LEN + 1);
347 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 392 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
348 } 393 }
349 394
350 template<typename T> 395 void put (keyword k, archetype *v);
396 void put (keyword k, treasurelist *v);
351 void put (keyword k, const T *v) 397 void put (keyword k, faceinfo *v);
352 {
353 if (v)
354 put (k, v->name);
355 else
356 put (k, (const char *)0);
357 }
358 398
359 template<typename T> 399 template<typename T>
360 void put (keyword k, const refptr<T> &v) 400 void put (keyword k, const refptr<T> &v)
361 { 401 {
362 put (k, (T *)v); 402 put (k, (T *)v);
363 } 403 }
364 404
365 bool save (const char *path); 405 MTH bool save (const_octet_string path);
366 char *as_string (); // like strdup 406 char *as_string (); // like strdup
367 407
368 operator bool () { return !!av; } 408 operator bool () { return !!av; }
369}; 409};
370 410
411INTERFACE_CLASS(object_thawer)
371struct object_thawer 412struct object_thawer
372{ 413{
373 char *line; // current beginning of line 414 char *line; // current beginning of line
374 SV *text; // text part 415 SV *text; // text part
375 AV *av; // perl part 416 AV *av; // perl part
376 int linenum; 417 int linenum;
377 keyword kw; 418 keyword kw;
378 char *kw_str; // the keyword parsed, as string 419 char *kw_str; // the keyword parsed, as string
379 char *value; // the value, or 0 if no value 420 char *value; // the value, or 0 if no value
380 char *value_nn; // the value, or the empty string if no value 421 const char *value_nn; // the value, or the empty string if no value
381 const char *name; 422 const char *name;
382 423
383 operator bool () { return !!text; } 424 operator bool () const { return !!text; }
384 425
385 object_thawer (const char *path = 0); 426 object_thawer (const char *path = 0);
386 object_thawer (const char *data, AV *perlav); 427 object_thawer (const char *data, AV *perlav);
387 ~object_thawer (); 428 ~object_thawer ();
388 429
389 void get (attachable *obj, int oid); 430 void get (attachable *obj, int oid);
390 431
391 // parse next line 432 // parse next line
392 void next (); 433 MTH void next ();
393 // skip the current key-value (usually fetch next line, for 434 // skip the current key-value (usually fetch next line, for
394 // multiline-fields, skips till the corresponding end-kw 435 // multiline-fields, skips till the corresponding end-kw
395 void skip (); 436 MTH void skip ();
437 MTH void skip_block (); // skips till and over KW_end
396 438
397 char *get_str () { return value; } // may be 0 439 char *get_str () { return value; } // may be 0
398 void get_ml (keyword kend, shstr &sh); 440 void get_ml (keyword kend, shstr &sh);
399 441
400 void get_ornull (shstr &sh) const { sh = value; } 442 void get_ornull (shstr &sh) const { sh = value; }
416 void get (sint32 &i) { i = get_sint32 (); } 458 void get (sint32 &i) { i = get_sint32 (); }
417 459
418 void get (uint32 &i) { i = get_sint64 (); } 460 void get (uint32 &i) { i = get_sint64 (); }
419 void get (sint64 &i) { i = get_sint64 (); } 461 void get (sint64 &i) { i = get_sint64 (); }
420 462
463 MTH void parse_warn (const char *msg);
421 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 464 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
465
466 struct delayed_ref {
467 attachable *op;
468 object_ptr *ptr;
469 const char *ref;
470 };
471 std::vector<delayed_ref> delrefs;
472
473 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
474 MTH void resolve_delayed_derefs (bool deref = true);
422}; 475};
423 476
424//TODO: remove 477//TODO: remove
425char *fgets (char *s, int n, object_thawer &thawer); 478char *fgets (char *s, int n, object_thawer &thawer);
426 479
427////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 480//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
428 481
429struct coroapi { 482struct coroapi {
430 static struct CoroAPI *GCoroAPI; 483 static struct CoroAPI *GCoroAPI;
431 484
485 static EV_ATOMIC_T cede_pending;
486
432 static int nready () { return CORO_NREADY; } 487 static int nready () { return CORO_NREADY; }
433 static int cede () { return CORO_CEDE ; } 488 static int cede () { cede_pending = 0; return CORO_CEDE ; }
434 489
435 static double (*time)();
436 static double next_cede;
437 static int cede_counter;
438
439 static void do_cede_every ();
440 static void do_cede_to_tick (); 490 static void do_cede_to_tick ();
441 static void do_cede_to_tick_every ();
442 491
443 static void cede_every (int count) 492 // actually cede's far more often
444 {
445 if (expect_false (++cede_counter >= count))
446 do_cede_every ();
447 }
448
449 static void cede_to_tick () 493 static bool cede_to_tick ()
450 { 494 {
451 if (expect_false (time () >= next_cede)) 495 if (expect_true (!cede_pending))
496 return false;
497
452 do_cede_to_tick (); 498 do_cede_to_tick ();
453 } 499 return true;
454
455 static void cede_to_tick_every (int count)
456 {
457 if (expect_false (++cede_counter >= count))
458 cede_to_tick ();
459 } 500 }
460 501
461 static void wait_for_tick (); 502 static void wait_for_tick ();
462 static void wait_for_tick_begin (); 503 static void wait_for_tick_begin ();
463}; 504};
464 505
465struct watcher_base 506struct evapi
466{ 507{
467 static struct EventAPI *GEventAPI; 508 static struct EVAPI *GEVAPI;
468}; 509};
469 510
470template<class base>
471struct watcher : watcher_base
472{
473 base *pe;
474
475 void start (bool repeat = false) { GEventAPI->start ((pe_watcher *)pe, repeat); }
476 void stop (bool cancel_events = false) { GEventAPI->stop ((pe_watcher *)pe, cancel_events); }
477 void now () { GEventAPI->now ((pe_watcher *)pe); }
478 void suspend () { GEventAPI->suspend ((pe_watcher *)pe); }
479 void resume () { GEventAPI->resume ((pe_watcher *)pe); }
480
481 void prio (int new_prio) { ((pe_watcher *)pe)->prio = new_prio; }
482
483 ~watcher ()
484 {
485 cancel ();
486 }
487
488private:
489 void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private
490};
491
492struct iw : watcher<pe_idle>, callback<void (iw &)>
493{
494 template<class O, class M>
495 iw (O object, M method)
496 : callback<void (iw &)> (object, method)
497 {
498 alloc ();
499 }
500
501private:
502 void alloc ();
503};
504
505struct iow : watcher<pe_io>, callback<void (iow &, int)> 511struct iow : ev_io, evapi, callback<void (iow &, int)>
506{ 512{
513 static void thunk (EV_P_ struct ev_io *w_, int revents)
514 {
515 iow &w = *static_cast<iow *>(w_);
516
517 w (w, revents);
518 }
519
507 template<class O, class M> 520 template<class O, class M>
508 iow (O object, M method) 521 iow (O object, M method)
509 : callback<void (iow &, int)> (object, method) 522 : callback<void (iow &, int)> (object, method)
510 { 523 {
511 alloc (); 524 ev_init ((ev_io *)this, thunk);
512 } 525 }
513 526
514 void fd (int fd); 527 void prio (int prio)
515 int poll (); 528 {
529 ev_set_priority ((ev_io *)this, prio);
530 }
531
532 void set (int fd, int events)
533 {
534 ev_io_set ((ev_io *)this, fd, events);
535 }
536
537 int poll () const { return events; }
538
516 void poll (int events); 539 void poll (int events);
517 540
518private: 541 void start ()
519 void alloc (); 542 {
543 ev_io_start (EV_DEFAULT, (ev_io *)this);
544 }
545
546 void stop ()
547 {
548 ev_io_stop (EV_DEFAULT, (ev_io *)this);
549 }
550
551 ~iow ()
552 {
553 stop ();
554 }
555};
556
557struct asyncw : ev_async, evapi, callback<void (ev_async &, int)>
558{
559 static void thunk (EV_P_ struct ev_async *w_, int revents)
560 {
561 asyncw &w = *static_cast<asyncw *>(w_);
562
563 w (w, revents);
564 }
565
566 template<class O, class M>
567 asyncw (O object, M method)
568 : callback<void (asyncw &, int)> (object, method)
569 {
570 ev_init ((ev_async *)this, thunk);
571 }
572
573 void start ()
574 {
575 ev_async_start (EV_DEFAULT, (ev_async *)this);
576 }
577
578 void stop ()
579 {
580 ev_async_stop (EV_DEFAULT, (ev_async *)this);
581 }
582
583 ~asyncw ()
584 {
585 stop ();
586 }
520}; 587};
521 588
522#endif 589#endif
523 590

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines