--- parser3/src/classes/classes.h 2002/04/18 15:54:39 1.19 +++ parser3/src/classes/classes.h 2016/04/01 16:27:31 1.37 @@ -1,22 +1,24 @@ /** @file Parser: @b Methoded class decl. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: classes.h,v 1.19 2002/04/18 15:54:39 paf Exp $ */ #ifndef CLASSES_H #define CLASSES_H +#define IDENT_CLASSES_H "$Id: classes.h,v 1.37 2016/04/01 16:27:31 moko Exp $" + +// include + #include "pa_vstateless_class.h" #include "pa_array.h" /** Pure virtual base for configurable Methoded descendants @see Methoded_array */ -class Methoded : public VStateless_class { +class Methoded: public VStateless_class { public: // Methoded /** should Methoded_array::register_directly_used register this class in @@ -24,7 +26,7 @@ public: // Methoded if not - global variable with Methoded descendant is used in VStateless_class parameter */ - virtual bool used_directly() =0; + virtual bool used_directly() { return true; } /// use this method to read parameters from root "auto.p"; access r.main_class virtual void configure_admin(Request& ) {} /// use this method to read parameters from 'MAIN' class; access r.main_class @@ -34,18 +36,16 @@ public: // Methoded public: // usage - Methoded(Pool& apool, const char *aname, VStateless_class *abase=0) : - VStateless_class(apool, new(apool) String(apool, aname), abase) { - } + Methoded(const char* aname, VStateless_class* abase=0): VStateless_class(aname, abase) {} void register_directly_used(Request& r); }; /// all Methoded registered here in autogenerated classes.C -class Methoded_array : public Array { +class Methoded_array: public Array { public: - Methoded_array(Pool& pool); + Methoded_array(); public: // Methoded for_each-es /// @see Methoded::configure_admin @@ -56,7 +56,13 @@ public: // Methoded for_each-es void register_directly_used(Request& r); }; -extern Methoded_array *methoded_array; -void init_methoded_array(Pool& pool); +// globals + +Methoded_array& methoded_array(); + +// defines + +#define DECLARE_CLASS_VAR(name, self) \ + Methoded* name##_class=self #endif