Correct csrc output for fderivative [Grabner].

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 48a8e75fecd7f448279743d642dde17cee761266..d207027240dde09c75ebd47d6f8177fce0fecdfb 100644 (file)
--- a/ginac/fderivative.cpp
+++ b/ginac/fderivative.cpp
@@ -31,6 +31,7 @@ namespace GiNaC {
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
   print_func<print_context>(&fderivative::do_print).
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
   print_func<print_context>(&fderivative::do_print).

+  print_func<print_csrc>(&fderivative::do_print_csrc).

   print_func<print_tree>(&fderivative::do_print_tree))
 
 //////////
   print_func<print_tree>(&fderivative::do_print_tree))
 
 //////////


@@ -106,12 +107,24 @@ void fderivative::do_print(const print_context & c, unsigned level) const
        c.s << "D[";
        paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
        --end;
        c.s << "D[";
        paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
        --end;

-       while (i != end)
+       while (i != end) {

                c.s << *i++ << ",";
                c.s << *i++ << ",";

+       }

        c.s << *i << "](" << registered_functions()[serial].name << ")";
        printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence());
 }
 
        c.s << *i << "](" << registered_functions()[serial].name << ")";
        printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence());
 }
 

+void fderivative::do_print_csrc(const print_csrc & c, unsigned level) const
+{
+       c.s << "D_";
+       paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
+       --end;
+       while (i != end)
+               c.s << *i++ << "_";
+       c.s << *i << "_" << registered_functions()[serial].name;
+       printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence());
+}
+

 void fderivative::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " "
 void fderivative::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " "

diff --git a/ginac/fderivative.h b/ginac/fderivative.h
index bc2eb916119b66ab62f37d59323862b8a82b2337..904538bbdc3b916d3b0fb5a3d9583d03b419ad89 100644 (file)
--- a/ginac/fderivative.h
+++ b/ginac/fderivative.h
@@ -74,6 +74,7 @@ protected:
        // non-virtual functions in this class
 protected:
        void do_print(const print_context & c, unsigned level) const;
        // non-virtual functions in this class
 protected:
        void do_print(const print_context & c, unsigned level) const;

+       void do_print_csrc(const print_csrc & c, unsigned level) const;

        void do_print_tree(const print_tree & c, unsigned level) const;
 
        // member variables
        void do_print_tree(const print_tree & c, unsigned level) const;
 
        // member variables