* Wrapper template for making GiNaC classes out of C++ structures. */
/*
- * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __GINAC_STRUCTURE_H__
-#define __GINAC_STRUCTURE_H__
-
-#include <functional>
+#ifndef GINAC_STRUCTURE_H
+#define GINAC_STRUCTURE_H
#include "ex.h"
#include "ncmul.h"
#include "operators.h"
#include "print.h"
-namespace GiNaC {
+#include <functional>
+namespace GiNaC {
/** Comparison policy: all structures of one type are equal */
template <class T>
GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
// helpers
- static tinfo_t get_tinfo() { return reg_info.options.get_id(); }
static const char *get_class_name() { return "structure"; }
- static tinfo_t next_structure_tinfo_key() { return new tinfo_static_t; }
-
// constructors
public:
/** Construct structure as a copy of a given C++ structure. */
- structure(const T & t) : inherited(get_tinfo()), obj(t) { }
+ structure(const T & t) : obj(t) { }
// functions overriding virtual functions from base classes
// All these are just defaults that can be specialized by the user
// pattern matching
bool has(const ex & other, unsigned options = 0) const { return inherited::has(other, options); }
- bool match(const ex & pattern, lst & repl_lst) const { return inherited::match(pattern, repl_lst); }
+ bool match(const ex & pattern, exmap& repl_lst) const { return inherited::match(pattern, repl_lst); }
protected:
bool match_same_type(const basic & other) const { return true; }
public:
// noncommutativity
unsigned return_type() const { return return_types::commutative; }
- tinfo_t return_type_tinfo() const { return this; }
+ return_type_t return_type_tinfo() const
+ {
+ return_type_t r;
+ r.rl = 0;
+ r.tinfo = &typeid(*this);
+ return r;
+ }
protected:
bool is_equal_same_type(const basic & other) const
GINAC_ASSERT(is_a<structure>(other));
const structure & o = static_cast<const structure &>(other);
- return struct_is_equal(&obj, &o.obj);
+ return this->struct_is_equal(&obj, &o.obj);
}
unsigned calchash() const { return inherited::calchash(); }
/** Default constructor */
template <class T, template <class> class CP>
-structure<T, CP>::structure() : inherited(get_tinfo()) { }
-
-/** Construct object from archive_node. */
-template <class T, template <class> class CP>
-structure<T, CP>::structure(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {}
-
-/** Unarchive the object. */
-template <class T, template <class> class CP>
-ex structure<T, CP>::unarchive(const archive_node &n, lst &sym_lst)
-{
- return (new structure(n, sym_lst))->setflag(status_flags::dynallocated);
-}
-
-/** Archive the object. */
-template <class T, template <class> class CP>
-void structure<T, CP>::archive(archive_node &n) const
-{
- inherited::archive(n);
-}
+structure<T, CP>::structure() { }
/** Compare two structures of the same type. */
template <class T, template <class> class CP>
GINAC_ASSERT(is_a<structure>(other));
const structure & o = static_cast<const structure &>(other);
- return struct_compare(&obj, &o.obj);
+ return this->struct_compare(&obj, &o.obj);
}
template <class T, template <class> class CP>
-registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", structure::next_structure_tinfo_key(), &structure::unarchive));
-
+registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", typeid(structure<T, CP>)));
} // namespace GiNaC
-#endif // ndef __GINAC_STRUCTURE_H__
+#endif // ndef GINAC_STRUCTURE_H