X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.cpp;h=31fc1d66117f7455a6d08127c621c9f69d9d4f94;hp=39f2335abcd1911c8e4460aaa1d16c0ba1989e8a;hb=c4c269f1a22affca5b243cfe160527d574e9ddcf;hpb=3a63743e24046766b37c3d1bd38605542ee0a536 diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp index 39f2335a..31fc1d66 100644 --- a/ginac/symbol.cpp +++ b/ginac/symbol.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's symbolic objects. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 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 @@ -25,71 +25,43 @@ #include "symbol.h" #include "lst.h" -#include "print.h" #include "archive.h" #include "tostring.h" #include "utils.h" namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(symbol, basic) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symbol, basic, + print_func(&symbol::do_print). + print_func(&symbol::do_print_latex). + print_func(&symbol::do_print_tree). + print_func(&symbol::do_print_python_repr)) ////////// -// default ctor, dtor, copy ctor, assignment operator and helpers +// default constructor ////////// -symbol::symbol() : inherited(TINFO_symbol), serial(next_serial++) +symbol::symbol() + : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name) { - name = TeX_name = autoname_prefix()+ToString(serial); - asexinfop = new assigned_ex_info; setflag(status_flags::evaluated | status_flags::expanded); } -/** For use by copy ctor and assignment operator. */ -void symbol::copy(const symbol & other) -{ - inherited::copy(other); - name = other.name; - TeX_name = other.TeX_name; - serial = other.serial; - asexinfop = other.asexinfop; - ++asexinfop->refcount; -} - -void symbol::destroy(bool call_parent) -{ - if (--asexinfop->refcount == 0) - delete asexinfop; - if (call_parent) - inherited::destroy(call_parent); -} - ////////// -// other ctors +// other constructors ////////// // public -symbol::symbol(const symbol & other) +symbol::symbol(const std::string & initname) + : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()) { - copy(other); -} - -symbol::symbol(const std::string & initname) : inherited(TINFO_symbol) -{ - name = initname; - TeX_name = default_TeX_name(); - serial = next_serial++; - asexinfop = new assigned_ex_info; setflag(status_flags::evaluated | status_flags::expanded); } -symbol::symbol(const std::string & initname, const std::string & texname) : inherited(TINFO_symbol) +symbol::symbol(const std::string & initname, const std::string & texname) + : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname) { - name = initname; - TeX_name = texname; - serial = next_serial++; - asexinfop = new assigned_ex_info; setflag(status_flags::evaluated | status_flags::expanded); } @@ -98,27 +70,29 @@ symbol::symbol(const std::string & initname, const std::string & texname) : inhe ////////// /** Construct object from archive_node. */ -symbol::symbol(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) +symbol::symbol(const archive_node &n, lst &sym_lst) + : inherited(n, sym_lst), asexinfop(new assigned_ex_info), serial(next_serial++) { - serial = next_serial++; if (!(n.find_string("name", name))) name = autoname_prefix() + ToString(serial); if (!(n.find_string("TeXname", TeX_name))) TeX_name = default_TeX_name(); - asexinfop = new assigned_ex_info; setflag(status_flags::evaluated); } /** Unarchive the object. */ -ex symbol::unarchive(const archive_node &n, const lst &sym_lst) +ex symbol::unarchive(const archive_node &n, lst &sym_lst) { ex s = (new symbol(n, sym_lst))->setflag(status_flags::dynallocated); - + // If symbol is in sym_lst, return the existing symbol - for (unsigned i=0; i(sym_lst.op(i)).name == ex_to(s).name)) - return sym_lst.op(i); + for (lst::const_iterator it = sym_lst.begin(); it != sym_lst.end(); ++it) { + if (is_a(*it) && (ex_to(*it).name == ex_to(s).name)) + return *it; } + + // Otherwise add new symbol to list and return it + sym_lst.append(s); return s; } @@ -137,29 +111,30 @@ void symbol::archive(archive_node &n) const // public -basic *symbol::duplicate() const +void symbol::do_print(const print_context & c, unsigned level) const +{ + c.s << name; +} + +void symbol::do_print_latex(const print_latex & c, unsigned level) const { - return new symbol(*this); + c.s << TeX_name; } -void symbol::print(const print_context & c, unsigned level) const +void symbol::do_print_tree(const print_tree & c, unsigned level) const { - if (is_a(c)) { - - c.s << std::string(level, ' ') << name << " (" << class_name() << ")" - << ", serial=" << serial - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << std::endl; - - } else if (is_a(c)) { - c.s << TeX_name; - } else if (is_a(c)) { - c.s << class_name() << "('" << name; - if (TeX_name != default_TeX_name()) - c.s << "','" << TeX_name; - c.s << "')"; - } else - c.s << name; + c.s << std::string(level, ' ') << name << " (" << class_name() << ")" + << ", serial=" << serial + << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec + << std::endl; +} + +void symbol::do_print_python_repr(const print_python_repr & c, unsigned level) const +{ + c.s << class_name() << "('" << name; + if (TeX_name != default_TeX_name()) + c.s << "','" << TeX_name; + c.s << "')"; } bool symbol::info(unsigned inf) const @@ -176,24 +151,6 @@ bool symbol::info(unsigned inf) const return inherited::info(inf); } -int symbol::degree(const ex & s) const -{ - return is_equal(ex_to(s)) ? 1 : 0; -} - -int symbol::ldegree(const ex & s) const -{ - return is_equal(ex_to(s)) ? 1 : 0; -} - -ex symbol::coeff(const ex & s, int n) const -{ - if (is_equal(ex_to(s))) - return n==1 ? _ex1 : _ex0; - else - return n==0 ? *this : _ex0; -} - ex symbol::eval(int level) const { if (level == -max_recursion_level) @@ -239,12 +196,9 @@ bool symbol::is_equal_same_type(const basic & other) const return serial==o->serial; } -unsigned symbol::calchash(void) const +unsigned symbol::calchash() const { - // this is where the schoolbook method - // (golden_ratio_hash(tinfo()) ^ serial) - // is not good enough yet... - hashvalue = golden_ratio_hash(golden_ratio_hash(tinfo()) ^ serial); + hashvalue = golden_ratio_hash(tinfo() ^ serial); setflag(status_flags::hash_calculated); return hashvalue; } @@ -263,15 +217,15 @@ unsigned symbol::calchash(void) const void symbol::assign(const ex & value) { - asexinfop->is_assigned = 1; + asexinfop->is_assigned = true; asexinfop->assigned_expression = value; clearflag(status_flags::evaluated | status_flags::expanded); } -void symbol::unassign(void) +void symbol::unassign() { if (asexinfop->is_assigned) { - asexinfop->is_assigned = 0; + asexinfop->is_assigned = false; asexinfop->assigned_expression = _ex0; } setflag(status_flags::evaluated | status_flags::expanded); @@ -281,14 +235,14 @@ void symbol::unassign(void) /** Symbols not constructed with a string get one assigned using this * prefix and a number. */ -std::string & symbol::autoname_prefix(void) +std::string & symbol::autoname_prefix() { static std::string *s = new std::string("symbol"); return *s; } /** Return default TeX name for symbol. This recognizes some greek letters. */ -std::string symbol::default_TeX_name(void) const +std::string symbol::default_TeX_name() const { if (name=="alpha" || name=="beta" || name=="gamma" || name=="delta" || name=="epsilon" || name=="varepsilon" @@ -322,7 +276,7 @@ unsigned symbol::next_serial = 0; ////////// /** Default ctor. Defaults to unassigned. */ -symbol::assigned_ex_info::assigned_ex_info(void) : is_assigned(0), refcount(1) +symbol::assigned_ex_info::assigned_ex_info() : is_assigned(false) { }