Improved CLN output [Sheplyakov].

[ginac.git] / ginac / add.cpp

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 353b4a7744079ec1d73549454746a5a36eaf632f..98e8c798e206763a5cb8965d75b12db543bd8493 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -22,6 +22,8 @@
 
 #include <iostream>
 #include <stdexcept>
+#include <limits>
+#include <string>
 
 #include "add.h"
 #include "mul.h"
@@ -171,37 +173,32 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const
        if (precedence() <= level)
                c.s << "(";
        
-       // Print arguments, separated by "+"
+       // Print arguments, separated by "+" or "-"
        epvector::const_iterator it = seq.begin(), itend = seq.end();
+       char separator = ' ';
        while (it != itend) {
                
-               // If the coefficient is -1, it is replaced by a single minus sign
-               if (it->coeff.is_equal(_ex1)) {
+               // If the coefficient is negative, separator is "-"
+               if (it->coeff.is_equal(_ex_1) || 
+                       ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p))
+                       separator = '-';
+               c.s << separator;
+               if (it->coeff.is_equal(_ex1) || it->coeff.is_equal(_ex_1)) {
                        it->rest.print(c, precedence());
-               } else if (it->coeff.is_equal(_ex_1)) {
-                       c.s << "-";
+               } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p) ||
+                                ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p))
+               {
                        it->rest.print(c, precedence());
-               } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p)) {
-                       it->rest.print(c, precedence());
-                       c.s << "/";
-                       ex_to<numeric>(it->coeff).denom().print(c, precedence());
-               } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p)) {
-                       c.s << "-";
-                       it->rest.print(c, precedence());
-                       c.s << "/";
+                       c.s << '/';
                        ex_to<numeric>(it->coeff).denom().print(c, precedence());
                } else {
                        it->coeff.print(c, precedence());
-                       c.s << "*";
+                       c.s << '*';
                        it->rest.print(c, precedence());
                }
                
-               // Separator is "+", except if the following expression would have a leading minus sign or the sign is sitting in parenthesis (as in a ctor)
                ++it;
-               if (it != itend
-                && (is_a<print_csrc_cl_N>(c) || !it->coeff.info(info_flags::real)  // sign inside ctor arguments
-                 || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(*_num1_p) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
-                       c.s << "+";
+               separator = '+';
        }
        
        if (!overall_coeff.is_zero()) {
@@ -258,7 +255,7 @@ bool add::info(unsigned inf) const
 
 int add::degree(const ex & s) const
 {
-       int deg = INT_MIN;
+       int deg = std::numeric_limits<int>::min();
        if (!overall_coeff.is_zero())
                deg = 0;
        
@@ -275,7 +272,7 @@ int add::degree(const ex & s) const
 
 int add::ldegree(const ex & s) const
 {
-       int deg = INT_MAX;
+       int deg = std::numeric_limits<int>::max();
        if (!overall_coeff.is_zero())
                deg = 0;