[BUGFIX] parser.hpp: fix include guard so the header is actually usable.

[ginac.git] / ginac / function.pl

diff --git a/ginac/function.pl b/ginac/function.pl
index e91278c6b2ab107ba8909903aa8db274acea4340..7a4d5e78cbc25fb4431f7807f9b424cd9bb6edd0 100644 (file)
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -507,6 +507,7 @@ public:
        ex expand(unsigned options=0) const;
        ex eval(int level=0) const;
        ex evalf(int level=0) const;
+       ex eval_ncmul(const exvector & v) const;
        unsigned calchash() const;
        ex series(const relational & r, int order, unsigned options = 0) const;
        ex thiscontainer(const exvector & v) const;
@@ -1053,6 +1054,16 @@ ${evalf_switch_statement}
        throw(std::logic_error("function::evalf(): invalid nparams"));
 }
 
+/**
+ *  This method is defined to be in line with behaviour of function::return_type()
+ */
+ex function::eval_ncmul(const exvector & v) const
+{
+       // If this function is called then the list of arguments is non-empty
+       // and the first argument is non-commutative, see  function::return_type()
+       return seq.begin()->eval_ncmul(v);
+}
+
 unsigned function::calchash() const
 {
        unsigned v = golden_ratio_hash(golden_ratio_hash((p_int)tinfo()) ^ serial);
@@ -1319,8 +1330,8 @@ ${power_switch_statement}
 
 std::vector<function_options> & function::registered_functions()
 {
-       static std::vector<function_options> * rf = new std::vector<function_options>;
-       return *rf;
+       static std::vector<function_options> rf = std::vector<function_options>();
+       return rf;
 }
 
 bool function::lookup_remember_table(ex & result) const