fixed support for multiple argument passing to Python functions

3 files changed, 53 insertions, 18 deletions

diff --git a/ledger.texi b/ledger.texi
index b024e33c..00b5fb01 100644
--- a/ledger.texi
+++ b/ledger.texi
@@ -2200,7 +2200,7 @@ it demonstrates the potential for more complex extensions:
 
 @example
 !python
-from ledger import *
+import ledger
 def foo(d, val):
     return d.xact.amount + val
 !end
diff --git a/sample.dat b/sample.dat
index 4e714275..534231ba 100644
--- a/sample.dat
+++ b/sample.dat
@@ -1,3 +1,10 @@
+!python
+def foo(d, val, x):
+    return d.xact.amount + val
+!end
+
+--amount-expr 'foo'({$100}, 20)
+
 2004/05/01 Checking balance
   Assets:Checking               $500.00
   Equity:Opening Balances
diff --git a/valexpr.cc b/valexpr.cc
index 1524e00d..ad23cf26 100644
--- a/valexpr.cc
+++ b/valexpr.cc
@@ -287,15 +287,39 @@ void value_expr_t::compute(value_t& result, const details_t& details) const
     try {
       object func = python_interpretor->main_namespace[constant_s];
       if (right) {
-	assert(right->kind == O_ARG);
-	right->left->compute(result, details);
-	result = call<value_t>(func.ptr(), details, result);
+	if (right->right) {
+	  list args;
+	  args.append(details);
+	  for (value_expr_t * arg = right; arg; arg = arg->right) {
+	    assert(arg->kind == O_ARG);
+	    arg->left->compute(result, details);
+	    args.append(result);
+	  }
+
+	  PyObject * val = PyObject_CallObject(func.ptr(), tuple(args).ptr());
+	  if (val) {
+	    result = extract<value_t>(val)();
+	    Py_DECREF(val);
+	  }
+	  else if (PyObject * err = PyErr_Occurred()) {
+	    PyErr_Print();
+	    result = 0;
+	  }
+	  else {
+	    result = 0;
+	  }
+	} else {
+	  assert(right->kind == O_ARG);
+	  right->left->compute(result, details);
+	  result = call<value_t>(func.ptr(), details, result);
+	}
       } else {
 	result = call<value_t>(func.ptr(), details);
       }
     }
     catch(const boost::python::error_already_set&) {
       PyErr_Print();
+      result = 0;
     }
 #endif
     break;
@@ -542,22 +566,26 @@ value_expr_t * parse_value_term(std::istream& in)
     in.get(c);
     node.reset(new value_expr_t(value_expr_t::F_INTERP_FUNC));
     node->constant_s = buf;
-    if (peek_next_nonws(in) == '(') {
-      in.get(c);
-      node->right = new value_expr_t(value_expr_t::O_ARG);
-      value_expr_t * cur = node->right;
-      cur->left = parse_value_expr(in, true);
-      while (peek_next_nonws(in) == ',') {
-	in.get(c);
-	cur->right = new value_expr_t(value_expr_t::O_ARG);
-	cur = cur->right;
+    in.get(c);
+    if (! in.eof()) {
+      if (c == '(') {
+	node->right = new value_expr_t(value_expr_t::O_ARG);
+	value_expr_t * cur = node->right;
 	cur->left = parse_value_expr(in, true);
+	while (peek_next_nonws(in) == ',') {
+	  in.get(c);
+	  cur->right = new value_expr_t(value_expr_t::O_ARG);
+	  cur = cur->right;
+	  cur->left = parse_value_expr(in, true);
+	}
+	in.get(c);
+	if (c != ')')
+	  unexpected(c, ')');
+      } else {
+	in.unget();
+	node->right = new value_expr_t(value_expr_t::O_ARG);
+	node->right->left = parse_value_term(in);
       }
-      in.get(c);
-      if (c != ')')
-	unexpected(c, ')');
-    } else {
-      node->left = parse_value_term(in);
     }
     break;
   }