Use C++11 'nullptr' where applicable.

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index a8bc5575c07cfc7a079b8eca27fd062bbadc735f..27ebfb8970a219349df7d54e4f3eebcc5d34aaed 100644 (file)
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -550,7 +550,7 @@ ex archive_node::unarchive(lst &sym_lst) const
 }
 
 int unarchive_table_t::usecount = 0;
 }
 
 int unarchive_table_t::usecount = 0;

-unarchive_map_t* unarchive_table_t::unarch_map = 0;
+unarchive_map_t* unarchive_table_t::unarch_map = nullptr;

 
 unarchive_table_t::unarchive_table_t()
 {
 
 unarchive_table_t::unarchive_table_t()
 {

diff --git a/ginac/function.cppy b/ginac/function.cppy
index d9a59dc781cc81de8fa6d75fb4ba8d9227c4381d..d020d65fe54fbadfa4f4d62b6f83bd20d418bd5a 100644 (file)
--- a/ginac/function.cppy
+++ b/ginac/function.cppy
@@ -79,7 +79,7 @@ void function_options::initialize()
        nparams = 0;
        eval_f = evalf_f = real_part_f = imag_part_f = conjugate_f = expand_f
                = derivative_f = expl_derivative_f = power_f = series_f = nullptr;
        nparams = 0;
        eval_f = evalf_f = real_part_f = imag_part_f = conjugate_f = expand_f
                = derivative_f = expl_derivative_f = power_f = series_f = nullptr;

-       info_f = 0;
+       info_f = nullptr;

        evalf_params_first = true;
        use_return_type = false;
        eval_use_exvector_args = false;
        evalf_params_first = true;
        use_return_type = false;
        eval_use_exvector_args = false;


@@ -430,7 +430,7 @@ ex function::evalf() const
                }
        }
 
                }
        }
 

-       if (opt.evalf_f==0) {
+       if (opt.evalf_f==nullptr) {

                return function(serial,eseq).hold();
        }
        current_serial = serial;
                return function(serial,eseq).hold();
        }
        current_serial = serial;


@@ -489,7 +489,7 @@ ex function::series(const relational & r, int order, unsigned options) const
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options &opt = registered_functions()[serial];
 
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options &opt = registered_functions()[serial];
 

-       if (opt.series_f==0) {
+       if (opt.series_f==nullptr) {

                return basic::series(r, order);
        }
        ex res;
                return basic::series(r, order);
        }
        ex res;


@@ -524,7 +524,7 @@ ex function::conjugate() const
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 

-       if (opt.conjugate_f==0) {
+       if (opt.conjugate_f==nullptr) {

                return conjugate_function(*this).hold();
        }
 
                return conjugate_function(*this).hold();
        }
 


@@ -549,7 +549,7 @@ ex function::real_part() const
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 

-       if (opt.real_part_f==0)
+       if (opt.real_part_f==nullptr)

                return basic::real_part();
 
        if (opt.real_part_use_exvector_args)
                return basic::real_part();
 
        if (opt.real_part_use_exvector_args)


@@ -572,7 +572,7 @@ ex function::imag_part() const
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 

-       if (opt.imag_part_f==0)
+       if (opt.imag_part_f==nullptr)

                return basic::imag_part();
 
        if (opt.imag_part_use_exvector_args)
                return basic::imag_part();
 
        if (opt.imag_part_use_exvector_args)


@@ -595,7 +595,7 @@ bool function::info(unsigned inf) const
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 
        GINAC_ASSERT(serial<registered_functions().size());
        const function_options & opt = registered_functions()[serial];
 

-       if (opt.info_f==0) {
+       if (opt.info_f==nullptr) {

                return basic::info(inf);
        }
 
                return basic::info(inf);
        }
 

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index f27fd3aca60d7d1b090a59aa6562e3bb2bc33620..e45fe9c98320dc3636154e93ed8d690e1b4e6a54 100644 (file)
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -1739,7 +1739,7 @@ class lanczos_coeffs
                std::vector<cln::cl_N> *current_vector;
 };
 
                std::vector<cln::cl_N> *current_vector;
 };
 

-std::vector<cln::cl_N>* lanczos_coeffs::coeffs = 0;
+std::vector<cln::cl_N>* lanczos_coeffs::coeffs = nullptr;

 
 bool lanczos_coeffs::sufficiently_accurate(int digits)
 {      if (digits<=20) {
 
 bool lanczos_coeffs::sufficiently_accurate(int digits)
 {      if (digits<=20) {

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index 9f81e2e50a25026dd4549ce8c5372239fda727f6..eb8566c3457f055150376e3ff2e6ba806abb6b4b 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -289,8 +289,8 @@ static void my_ios_callback(std::ios_base::event ev, std::ios_base & s, int i)
        print_context *p = static_cast<print_context *>(s.pword(i));
        if (ev == std::ios_base::erase_event) {
                delete p;
        print_context *p = static_cast<print_context *>(s.pword(i));
        if (ev == std::ios_base::erase_event) {
                delete p;

-               s.pword(i) = 0;
-       } else if (ev == std::ios_base::copyfmt_event && p != 0)
+               s.pword(i) = nullptr;
+       } else if (ev == std::ios_base::copyfmt_event && p != nullptr)

                s.pword(i) = p->duplicate();
 }
 
                s.pword(i) = p->duplicate();
 }
 

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index 8b18897eb927df8947b4587ef0866e5d9aa06589..72d19f5d08e8431b4de6707323b3382d6a8d7b3b 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -298,7 +298,7 @@ unsigned relational::calchash() const
 
 relational::safe_bool relational::make_safe_bool(bool cond) const
 {
 
 relational::safe_bool relational::make_safe_bool(bool cond) const
 {

-       return cond? &safe_bool_helper::nonnull : 0;
+       return cond? &safe_bool_helper::nonnull : nullptr;

 }
 
 /** Cast the relational into a Boolean, mainly for evaluation within an
 }
 
 /** Cast the relational into a Boolean, mainly for evaluation within an

diff --git a/ginsh/ginsh_lexer.lpp b/ginsh/ginsh_lexer.lpp
index eba25be7440551af183d9931c6c5734fd2367cba..000b1333addaa1bda1b725ac253c5fa9aa0bc2d2 100644 (file)
--- a/ginsh/ginsh_lexer.lpp
+++ b/ginsh/ginsh_lexer.lpp
@@ -144,7 +144,7 @@ real_symbols    return T_REAL_SYMBOLS;
  */
 
 static int line_length = 0;
  */
 
 static int line_length = 0;

-static char *line_read = NULL;
+static char *line_read = nullptr;

 static char *line_ptr;
 
 // Input function that uses libreadline for interactive input
 static char *line_ptr;
 
 // Input function that uses libreadline for interactive input


@@ -208,7 +208,7 @@ static int ginsh_input(char *buf, int max_size)
 
 // List of input files to be processed
 int num_files = 0;
 
 // List of input files to be processed
 int num_files = 0;

-char **file_list = NULL;
+char **file_list = nullptr;

 
 // EOF encountered, connect to next file. If this was the last file,
 // connect to stdin. If this was stdin, terminate the scanner.
 
 // EOF encountered, connect to next file. If this was the last file,
 // connect to stdin. If this was stdin, terminate the scanner.


@@ -220,7 +220,7 @@ int yywrap()
        fclose(yyin);
        if (num_files) {
                yyin = fopen(*file_list, "r");
        fclose(yyin);
        if (num_files) {
                yyin = fopen(*file_list, "r");

-               if (yyin == NULL) {
+               if (yyin == nullptr) {

                        cerr << "Can't open " << *file_list << endl;
                        return 1;
                }
                        cerr << "Can't open " << *file_list << endl;
                        return 1;
                }

diff --git a/ginsh/ginsh_parser.ypp b/ginsh/ginsh_parser.ypp
index 2bdfc491b4c6b286a1003cc00db963e5b6db2a7e..4813f63a37de2410a4f2af11d2a407bf21de35a9 100644 (file)
--- a/ginsh/ginsh_parser.ypp
+++ b/ginsh/ginsh_parser.ypp
@@ -90,7 +90,7 @@ typedef ex (*fcnp)(const exprseq &e);
 typedef ex (*fcnp2)(const exprseq &e, int serial);
 
 struct fcn_desc {
 typedef ex (*fcnp2)(const exprseq &e, int serial);
 
 struct fcn_desc {

-       fcn_desc() : p(NULL), num_params(0), is_ginac(false), serial(0) {}
+       fcn_desc() : p(nullptr), num_params(0), is_ginac(false), serial(0) {}

        fcn_desc(fcnp func, int num) : p(func), num_params(num), is_ginac(false), serial(0) {}
        fcn_desc(fcnp2 func, int num, int ser) : p((fcnp)func), num_params(num), is_ginac(true), serial(ser) {}
 
        fcn_desc(fcnp func, int num) : p(func), num_params(num), is_ginac(false), serial(0) {}
        fcn_desc(fcnp2 func, int num, int ser) : p((fcnp)func), num_params(num), is_ginac(true), serial(ser) {}
 


@@ -647,7 +647,7 @@ static const fcn_init builtin_fcns[] = {
        {"transpose", f_transpose, 1},
        {"unassign", f_unassign, 1},
        {"unit", f_unit, 2},
        {"transpose", f_transpose, 1},
        {"unassign", f_unassign, 1},
        {"unit", f_unit, 2},

-       {NULL, f_dummy, 0}           // End marker
+       {nullptr, f_dummy, 0}        // End marker

 };
 
 struct fcn_help_init {
 };
 
 struct fcn_help_init {


@@ -685,7 +685,7 @@ static const fcn_help_init builtin_help[] = {
        {"H", "harmonic polylogarithm"},
        {"Order", "order term function (for truncated power series)"},
        {"Derivative", "inert differential operator"},
        {"H", "harmonic polylogarithm"},
        {"Order", "order term function (for truncated power series)"},
        {"Derivative", "inert differential operator"},

-       {NULL, NULL}    // End marker
+       {nullptr, nullptr}  // End marker

 };
 
 #include "ginsh_extensions.h"
 };
 
 #include "ginsh_extensions.h"


@@ -840,7 +840,7 @@ static char *fcn_generator(const char *text, int state)
                if (strncmp(fcn_name, text, len) == 0)
                        return strdup(fcn_name);
        }
                if (strncmp(fcn_name, text, len) == 0)
                        return strdup(fcn_name);
        }

-       return NULL;
+       return nullptr;

 }
 
 #ifdef HAVE_LIBREADLINE
 }
 
 #ifdef HAVE_LIBREADLINE


@@ -923,7 +923,7 @@ int main(int argc, char **argv)
        file_list = argv + 1;
        if (num_files) {
                yyin = fopen(*file_list, "r");
        file_list = argv + 1;
        if (num_files) {
                yyin = fopen(*file_list, "r");

-               if (yyin == NULL) {
+               if (yyin == nullptr) {

                        cerr << "Can't open " << *file_list << endl;
                        exit(1);
                }
                        cerr << "Can't open " << *file_list << endl;
                        exit(1);
                }