X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.cpp;h=fcf2d05dc088052d60e7d12f9e577b7a103cd4f9;hp=e8531a062e8e7d6b2baed72620c23006c48ff8c8;hb=8d08b902f1bb734fe91b5aa29c66c59788464be7;hpb=61434b009f39c40ea85ae7bb4ec14d8d203e2a85

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index e8531a06..fcf2d05d 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -171,41 +171,19 @@ static ex Order_series(const ex & x, const symbol & s, const ex & point, int ord
 REGISTER_FUNCTION(Order, eval_func(Order_eval).
                          series_func(Order_series));
 
-//////////
-// Inert differentiation
-//////////
-
-static ex Diff_eval(const ex & f, const ex & x)
-{
-	return Diff(f, x).hold();
-}
-
-static ex Diff_deriv(const ex & f, const ex & x, unsigned deriv_param)
-{
-	GINAC_ASSERT(deriv_param == 0 || deriv_param == 1);
-	if (deriv_param == 1)
-		return Diff(Diff(f, x), x);
-	else
-		return _ex0();
-}
-
-REGISTER_FUNCTION(Diff, eval_func(Diff_eval).
-                        derivative_func(Diff_deriv));
-
 //////////
 // Inert partial differentiation operator
 //////////
 
-static ex Derivative_eval(const ex & f, const ex & n)
+static ex Derivative_eval(const ex & f, const ex & l)
 {
-	if (is_ex_exactly_of_type(n, numeric) && ex_to_numeric(n).is_nonneg_integer()) {
-		unsigned i = ex_to_numeric(n).to_int();
-		if (is_ex_exactly_of_type(f, function)) {
-			if (i < f.nops() && is_ex_exactly_of_type(f.op(i), symbol))
-				return Diff(f, f.op(i));
-		}
+	if (!is_ex_exactly_of_type(f, function)) {
+        throw(std::invalid_argument("Derivative(): 1st argument must be a function"));
 	}
-	return Derivative(f, n).hold();
+    if (!is_ex_exactly_of_type(l, lst)) {
+        throw(std::invalid_argument("Derivative(): 2nd argument must be a list"));
+    }
+	return Derivative(f, l).hold();
 }
 
 REGISTER_FUNCTION(Derivative, eval_func(Derivative_eval));