--- deliantra/server/include/cfperl.h 2009/01/01 19:42:43 1.102
+++ deliantra/server/include/cfperl.h 2010/04/06 21:11:48 1.118
@@ -1,22 +1,21 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
*
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -27,10 +26,6 @@
#ifndef CFPERL_H__
#define CFPERL_H__
-#include
-#include
-#include
-
using namespace std;
#include
@@ -85,10 +80,13 @@
if (SvTRUE (ERRSV)) \
LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
+inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
+inline int call_pvsv (SV *ob, I32 flags) { return call_sv (ob, flags); }
+
#define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
#define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
#define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
-#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN;
+#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
#define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,8 +97,15 @@
void cfperl_emergency_save ();
void cfperl_cleanup (int make_core);
void cfperl_make_book (object *book, int level);
-void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
+void cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg);
int cfperl_can_merge (object *ob1, object *ob2);
+void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
+
+bool is_match_expr (const_utf8_string expr);
+// applies the match expression and returns true if it matches
+bool match (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
+// same as above, but returns the first object found, or 0
+object *match_one (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -189,7 +194,7 @@
F_DESTROYED = 0x01,
F_DEBUG_TRACE = 0x02,
};
- uint8 ACC (RW, flags);
+ uint8 ACC (RW, attachable_flags);
static unordered_vector mortals;
MTH static void check_mortals ();
@@ -205,7 +210,7 @@
MTH void destroy ();
// return wether an object was destroyed already
- MTH bool destroyed () const { return flags & F_DESTROYED; }
+ MTH bool destroyed () const { return attachable_flags & F_DESTROYED; }
virtual void gather_callbacks (AV *&callbacks, event_type event) const;
@@ -223,31 +228,31 @@
void optimise (); // possibly save some memory by destroying unneeded data
attachable ()
- : flags (0), self (0), cb (0), attach (0)
+ : attachable_flags (0), self (0), cb (0), attach (0)
{
}
attachable (const attachable &src)
- : flags (0), self (0), cb (0), attach (src.attach)
+ : attachable_flags (0), self (0), cb (0), attach (src.attach)
{
}
// set a custom key to the given value, or delete it if value = 0
- void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
+ void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0);
- void set_key_text (const char *key, const char *value = 0)
+ void set_key_text (const_utf8_string key, const_utf8_string value = 0)
{
set_key (key, value, 1);
}
- void set_key_data (const char *key, const char *value = 0)
+ void set_key_data (const_utf8_string key, const_utf8_string value = 0)
{
set_key (key, value, 0);
}
attachable &operator =(const attachable &src);
- // used to _quickly_ device wether to shortcut the evaluation
+ // used to _quickly_ decide wether to shortcut the evaluation
bool should_invoke (event_type event)
{
return ev_want_event [event] || cb;
@@ -279,6 +284,30 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// a little dirty hack, maybe unify with something else at a later time
+struct keyword_string
+{
+ const char *s;
+ const int l;
+
+ keyword_string (const char *s, int l)
+ : s(s), l(l)
+ { }
+
+ keyword_string (keyword kw)
+ : s(keyword_str [kw]), l(keyword_len [kw])
+ {
+ }
+
+ keyword_string (shstr_tmp sh)
+ : s(&sh), l(sh.length ())
+ {
+ }
+};
+
+#define CS(keyword) keyword_string (# keyword, sizeof (# keyword) - 1)
+#define KW(keyword) CS(keyword)
+
INTERFACE_CLASS(object_freezer)
struct object_freezer : dynbuf_text
{
@@ -287,91 +316,85 @@
object_freezer ();
~object_freezer ();
- void put (attachable *ext);
-
- // used only for user-defined key-value pairs
- void put (shstr_tmp k, shstr_tmp v)
+ // serialise perl part
+ void put_ (attachable *ext);
+ void put (attachable *ext)
{
- add (k);
-
- if (expect_true (v))
- add (' '), add (v);
-
- add ('\n');
+ if (expect_false (ext->self))
+ put_ (ext);
}
- template
- void put_kw_string (keyword k, const T &v)
+ // null value (== no space after keyword)
+ void put (const keyword_string k)
{
- int klen = keyword_len [k];
- int vlen = v ? strlen (v) + 1 : 0;
-
- char *p = (char *)alloc (klen + vlen + 1);
-
- memcpy (p, keyword_str [k], klen); p += klen;
-
- if (expect_true (v))
- {
- *p++ = ' '; vlen--;
- memcpy (p, v, vlen); p += vlen;
- }
+ char *p = force (k.l + 1);
+ memcpy (p, k.s, k.l); p += k.l; *p++ = '\n';
+ alloc (p);
+ }
- *p = '\n';
+ void put (const keyword_string k, const keyword_string v)
+ {
+ char *p = force (k.l + 1 + v.l + 1);
+ memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
+ memcpy (p, v.s, v.l); p += v.l; *p++ = '\n';
+ alloc (p);
}
- void put (keyword k, const char *v = 0)
+ void put (const keyword_string k, const_utf8_string v)
{
- put_kw_string (k, v);
+ if (expect_true (v))
+ put (k, keyword_string (v, strlen (v)));
+ else
+ put (k);
}
- void put (keyword k, shstr_tmp v)
+ void put (const keyword_string k, shstr_tmp v)
{
- put_kw_string (k, v);
+ put (k, keyword_string (v));
}
- void put (keyword k, double v)
+ void put (const keyword_string k, double v)
{
- force (MAX_KEYWORD_LEN + 2 + 32);
- fadd (keyword_str [k], keyword_len [k]);
- fadd (' ');
- falloc (sprintf (ptr, "%.7g", v));
- fadd ('\n');
+ char *p = force (MAX_KEYWORD_LEN + 2 + 32);
+ memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
+ p += sprintf (p, "%.7g", v); *p++ = '\n';
+ alloc (p);
}
- void put_(keyword k, sint64 v)
+ void put_(const keyword_string k, sint64 v)
{
force (MAX_KEYWORD_LEN + 2 + sint64_digits);
- fadd (keyword_str [k], keyword_len [k]);
+ fadd (k.s, k.l);
fadd (' ');
add (v);
fadd ('\n');
}
- void put_(keyword k, sint32 v)
+ void put_(const keyword_string k, sint32 v)
{
force (MAX_KEYWORD_LEN + 2 + sint32_digits);
- fadd (keyword_str [k], keyword_len [k]);
+ fadd (k.s, k.l);
fadd (' ');
add (v);
fadd ('\n');
}
- void put (keyword k, float v) { put (k, (double)v); }
- void put (keyword k, signed char v) { put_(k, (sint32)v); }
- void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
- void put (keyword k, signed short v) { put_(k, (sint32)v); }
- void put (keyword k, unsigned short v) { put_(k, (sint32)v); }
- void put (keyword k, signed int v) { put_(k, (sint32)v); }
- void put (keyword k, unsigned int v) { put_(k, (sint64)v); }
- void put (keyword k, signed long v) { put_(k, (sint64)v); }
- void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
- void put (keyword k, signed long long v) { put_(k, (sint64)v); }
- void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
+ void put (const keyword_string k, float v) { put (k, (double)v); }
+ void put (const keyword_string k, signed char v) { put_(k, (sint32)v); }
+ void put (const keyword_string k, unsigned char v) { put_(k, (sint32)v); }
+ void put (const keyword_string k, signed short v) { put_(k, (sint32)v); }
+ void put (const keyword_string k, unsigned short v) { put_(k, (sint32)v); }
+ void put (const keyword_string k, signed int v) { put_(k, (sint32)v); }
+ void put (const keyword_string k, unsigned int v) { put_(k, (sint64)v); }
+ void put (const keyword_string k, signed long v) { put_(k, (sint64)v); }
+ void put (const keyword_string k, unsigned long v) { put_(k, (sint64)v); }
+ void put (const keyword_string k, signed long long v) { put_(k, (sint64)v); }
+ void put (const keyword_string k, unsigned long long v) { put_(k, (sint64)v); }
- void put (keyword kbeg, keyword kend, shstr_tmp v)
+ void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v)
{
force (MAX_KEYWORD_LEN + 1);
- fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
+ fadd (kbeg.s, kbeg.l); fadd ('\n');
if (expect_true (v))
{
@@ -380,21 +403,21 @@
}
force (MAX_KEYWORD_LEN + 1);
- fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
+ fadd (kend.s, kend.l); fadd ('\n');
}
- void put (keyword k, archetype *v);
- void put (keyword k, treasurelist *v);
- void put (keyword k, faceinfo *v);
+ void put (const keyword_string k, archetype *v);
+ void put (const keyword_string k, treasurelist *v);
+ void put (const keyword_string k, faceinfo *v);
template
- void put (keyword k, const refptr &v)
+ void put (const keyword_string k, const refptr &v)
{
put (k, (T *)v);
}
MTH bool save (const_octet_string path);
- char *as_string (); // like strdup
+ utf8_string as_string (); // like strdup
operator bool () { return !!av; }
};
@@ -414,8 +437,8 @@
operator bool () const { return !!text; }
- object_thawer (const char *path = 0);
- object_thawer (const char *data, AV *perlav);
+ object_thawer (const_utf8_string path = 0);
+ object_thawer (const_utf8_string data, AV *perlav);
~object_thawer ();
void get (attachable *obj, int oid);
@@ -427,7 +450,8 @@
MTH void skip ();
MTH void skip_block (); // skips till and over KW_end
- char *get_str () { return value; } // may be 0
+ bool has_value () { return value; }
+ const_utf8_string get_str () { return value_nn; } // empty string when missing
void get_ml (keyword kend, shstr &sh);
void get_ornull (shstr &sh) const { sh = value; }
@@ -451,17 +475,17 @@
void get (uint32 &i) { i = get_sint64 (); }
void get (sint64 &i) { i = get_sint64 (); }
- MTH void parse_warn (const char *msg);
- MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+ MTH void parse_warn (const_utf8_string msg);
+ MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true);
struct delayed_ref {
attachable *op;
object_ptr *ptr;
- const char *ref;
+ const_utf8_string ref;
};
std::vector delrefs;
- void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
+ void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
MTH void resolve_delayed_derefs (bool deref = true);
};