X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=9e303d070196a0d06d3ced1a9ef7c80f297cbdc0;hp=f6e7b33276ea306d6bd6c7df7d2a46d26962c539;hb=a23befbfe262832c398f4742eb54f8b19fe9f2d0;hpb=aef64ef1f63f7b4cb9236c5c189873e48c6c999b

diff --git a/ginac/function.pl b/ginac/function.pl
index f6e7b332..9e303d07 100755
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -264,6 +264,7 @@ public:
 	~function_options();
 	void initialize(void);
 	function_options & set_name(std::string const & n, std::string const & tn=std::string());
+	function_options & latex_name(std::string const & tn);
 // the following lines have been generated for max. ${maxargs} parameters
 $eval_func_interface
 $evalf_func_interface
@@ -333,10 +334,7 @@ $constructors_interface
 
 	// functions overriding virtual functions from bases classes
 public:
-	void printraw(std::ostream & os) const; 
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
-	void printtree(std::ostream & os, unsigned indent) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+	void print(const print_context & c, unsigned level = 0) const;
 	int degree(const ex & s) const;
 	int ldegree(const ex & s) const;
 	ex coeff(const ex & s, int n = 1) const;
@@ -345,7 +343,6 @@ public:
 	ex evalf(int level=0) const;
 	unsigned calchash(void) const;
 	ex series(const relational & r, int order, unsigned options = 0) const;
-	ex subs(const lst & ls, const lst & lr) const;
 	ex thisexprseq(const exvector & v) const;
 	ex thisexprseq(exvector * vp) const;
 protected:
@@ -366,7 +363,8 @@ protected:
 public:
 	static unsigned register_new(function_options const & opt);
 	static unsigned find_function(const std::string &name, unsigned nparams);
-	unsigned getserial(void) const {return serial;}
+	unsigned get_serial(void) const {return serial;}
+	std::string get_name(void) const;
 	
 // member variables
 
@@ -381,12 +379,7 @@ inline const function &ex_to_function(const ex &e)
 }
 
 #define is_ex_the_function(OBJ, FUNCNAME) \\
-	(is_ex_exactly_of_type(OBJ, function) && static_cast<GiNaC::function *>(OBJ.bp)->getserial() == function_index_##FUNCNAME)
-
-// global constants
-
-extern const function some_function;
-extern const std::type_info & typeid_function;
+	(is_ex_exactly_of_type(OBJ, function) && static_cast<GiNaC::function *>(OBJ.bp)->get_serial() == function_index_##FUNCNAME)
 
 } // namespace GiNaC
 
@@ -428,6 +421,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
 #include "function.h"
 #include "ex.h"
 #include "lst.h"
+#include "print.h"
 #include "archive.h"
 #include "inifcns.h"
 #include "utils.h"
@@ -458,7 +452,7 @@ function_options::~function_options()
 
 void function_options::initialize(void)
 {
-	set_name("unnamed_function","\\\\operatorname{unnamed}");
+	set_name("unnamed_function","\\\\mbox{unnamed}");
 	nparams=0;
 	eval_f=evalf_f=derivative_f=series_f=0;
 	evalf_params_first=true;
@@ -472,13 +466,19 @@ function_options & function_options::set_name(std::string const & n,
 {
 	name=n;
 	if (tn==std::string()) {
-		TeX_name="\\\\operatorname{"+name+"}";
+		TeX_name="\\\\mbox{"+name+"}";
 	} else {
 		TeX_name=tn;
 	}
 	return *this;
 }
 
+function_options & function_options::latex_name(std::string const & tn)
+{
+	TeX_name=tn;
+	return *this;
+}
+
 // the following lines have been generated for max. ${maxargs} parameters
 $eval_func_implementation
 $evalf_func_implementation
@@ -640,71 +640,49 @@ void function::archive(archive_node &n) const
 
 // public
 
-void function::printraw(std::ostream & os) const
-{
-	debugmsg("function printraw",LOGLEVEL_PRINT);
-
-	GINAC_ASSERT(serial<registered_functions().size());
-
-	os << class_name() << "(name=" << registered_functions()[serial].name;
-	for (exvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-		os << ",";
-		(*it).bp->print(os);
-	}
-	os << ")";
-}
-
-void function::print(std::ostream & os, unsigned upper_precedence) const
+void function::print(const print_context & c, unsigned level) const
 {
-	debugmsg("function print",LOGLEVEL_PRINT);
+	debugmsg("function print", LOGLEVEL_PRINT);
 
 	GINAC_ASSERT(serial<registered_functions().size());
 
-	os << registered_functions()[serial].name;
-	printseq(os,'(',',',')',exprseq::precedence,function::precedence);
-}
-
-void function::printtree(std::ostream & os, unsigned indent) const
-{
-	debugmsg("function printtree",LOGLEVEL_PRINT);
-
-	GINAC_ASSERT(serial<registered_functions().size());
-
-	os << std::string(indent,' ') << class_name() << " "
-	   << registered_functions()[serial].name
-	   << ", hash=" << hashvalue 
-	   << " (0x" << std::hex << hashvalue << std::dec << ")"
-	   << ", flags=" << flags
-	   << ", nops=" << nops() << std::endl;
-	for (unsigned i=0; i<nops(); ++i) {
-		seq[i].printtree(os,indent+delta_indent);
-	}
-	os << std::string(indent+delta_indent,' ') << "=====" << std::endl;
-}
-
-void function::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
-{
-	debugmsg("function print csrc",LOGLEVEL_PRINT);
-
-	GINAC_ASSERT(serial<registered_functions().size());
+	if (is_of_type(c, print_tree)) {
+
+		c.s << std::string(level, ' ') << class_name() << " "
+		    << registered_functions()[serial].name
+		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+		    << ", nops=" << nops()
+		    << std::endl;
+		unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
+		for (unsigned i=0; i<nops(); ++i)
+			seq[i].print(c, level + delta_indent);
+		c.s << std::string(level + delta_indent, ' ') << "=====" << std::endl;
+
+	} else if (is_of_type(c, print_csrc)) {
+
+		// Print function name in lowercase
+		std::string lname = registered_functions()[serial].name;
+		for (unsigned i=0; i<lname.size(); i++)
+			lname[i] = tolower(lname[i]);
+		c.s << lname << "(";
+
+		// Print arguments, separated by commas
+		exvector::const_iterator it = seq.begin(), itend = seq.end();
+		while (it != itend) {
+			it->print(c);
+			it++;
+			if (it != itend)
+				c.s << ",";
+		}
+		c.s << ")";
 
-	// Print function name in lowercase
-	std::string lname;
-	lname=registered_functions()[serial].name;
-	for (unsigned i=0; i<lname.size(); i++)
-		lname[i] = tolower(lname[i]);
-	os << lname << "(";
-
-	// Print arguments, separated by commas
-	exvector::const_iterator it = seq.begin();
-	exvector::const_iterator itend = seq.end();
-	while (it != itend) {
-		it->bp->printcsrc(os, type, 0);
-		it++;
-		if (it != itend)
-			os << ",";
+	} else if is_of_type(c, print_latex) {
+		c.s << registered_functions()[serial].TeX_name;
+		printseq(c, '(', ',', ')', exprseq::precedence, function::precedence);
+	} else {
+		c.s << registered_functions()[serial].name;
+		printseq(c, '(', ',', ')', exprseq::precedence, function::precedence);
 	}
-	os << ")";
 }
 
 ex function::expand(unsigned options) const
@@ -822,19 +800,6 @@ ${series_switch_statement}
 	throw(std::logic_error("function::series(): invalid nparams"));
 }
 
-ex function::subs(const lst & ls, const lst & lr) const
-{
-	GINAC_ASSERT(ls.nops() == lr.nops());
-
-	for (unsigned i=0; i<ls.nops(); i++) {
-		if (is_ex_of_type(ls.op(i), function) &&
-		    compare_same_type(ex_to_function(ls.op(i)))==0)
-			return lr.op(i);
-	}
-
-	return inherited::subs(ls, lr);
-}
-
 // protected
 
 
@@ -1003,18 +968,12 @@ unsigned function::find_function(const std::string &name, unsigned nparams)
 	throw (std::runtime_error("no function '" + name + "' with " + ToString(nparams) + " parameters defined"));
 }
 
-//////////
-// static member variables
-//////////
-
-// none
-
-//////////
-// global constants
-//////////
-
-const function some_function;
-const std::type_info & typeid_function=typeid(some_function);
+/** Return the print name of the function. */
+std::string function::get_name(void) const
+{
+	GINAC_ASSERT(serial<registered_functions().size());
+	return registered_functions()[serial].name;
+}
 
 } // namespace GiNaC