diff oct-py-eval.cc @ 402:c4b78e449c62

maint: indent functions declared in the pytave namespace * oct-py-eval.cc, oct-py-eval.h, oct-py-types.cc, oct-py-types.h, oct-py-util.cc, oct-py-util.h: Indent functions declared in the pytave namespace, adjust line wrap where necessary.
author Mike Miller <mtmiller@octave.org>
date Fri, 28 Apr 2017 14:07:57 -0700
parents 445df7f96fbc
children 3644df6564bc
line wrap: on
line diff
--- a/oct-py-eval.cc	Fri Apr 28 14:04:58 2017 -0700
+++ b/oct-py-eval.cc	Fri Apr 28 14:07:57 2017 -0700
@@ -36,113 +36,113 @@
 namespace pytave
 {
 
-PyObject *
-py_call_function (const std::string& func, const octave_value_list& args)
-{
-  PyObject *func_obj = py_find_function (func);
-  PyObject *retval = py_call_function (func_obj, args);
-  Py_DECREF (func_obj);
-  return retval;
-}
+  PyObject *
+  py_call_function (const std::string& func, const octave_value_list& args)
+  {
+    PyObject *func_obj = py_find_function (func);
+    PyObject *retval = py_call_function (func_obj, args);
+    Py_DECREF (func_obj);
+    return retval;
+  }
 
-PyObject *
-py_call_function (const std::string& func, PyObject *args, PyObject *kwargs)
-{
-  PyObject *func_obj = py_find_function (func);
-  PyObject *retval = py_call_function (func_obj, args, kwargs);
-  Py_DECREF (func_obj);
-  return retval;
-}
+  PyObject *
+  py_call_function (const std::string& func, PyObject *args, PyObject *kwargs)
+  {
+    PyObject *func_obj = py_find_function (func);
+    PyObject *retval = py_call_function (func_obj, args, kwargs);
+    Py_DECREF (func_obj);
+    return retval;
+  }
 
-PyObject *
-py_call_function (PyObject *callable, const octave_value_list& args)
-{
-  PyObject *kwargs = 0;
-  PyObject *args_list = PyList_New (0);
-  if (! args_list)
-    octave_throw_bad_alloc ();
+  PyObject *
+  py_call_function (PyObject *callable, const octave_value_list& args)
+  {
+    PyObject *kwargs = 0;
+    PyObject *args_list = PyList_New (0);
+    if (! args_list)
+      octave_throw_bad_alloc ();
 
-  for (int i = 0; i < args.length (); ++i)
-    {
-      boost::python::object arg;
-      pytave::octvalue_to_pyobj (arg, args(i));
-      PyObject *obj = arg.ptr ();
+    for (int i = 0; i < args.length (); ++i)
+      {
+        boost::python::object arg;
+        pytave::octvalue_to_pyobj (arg, args(i));
+        PyObject *obj = arg.ptr ();
 
-      if (pytave::is_py_kwargs_argument (obj))
-        kwargs = pytave::update_py_dict (kwargs, obj);
-      else
-        {
-          Py_INCREF (obj);
-          PyList_Append (args_list, obj);
-        }
-    }
+        if (pytave::is_py_kwargs_argument (obj))
+          kwargs = pytave::update_py_dict (kwargs, obj);
+        else
+          {
+            Py_INCREF (obj);
+            PyList_Append (args_list, obj);
+          }
+      }
 
-  PyObject *args_tuple = PyList_AsTuple (args_list);
-  Py_DECREF (args_list);
+    PyObject *args_tuple = PyList_AsTuple (args_list);
+    Py_DECREF (args_list);
 
-  PyObject *retval =  py_call_function (callable, args_tuple, kwargs);
-  Py_DECREF (args_tuple);
-  Py_XDECREF (kwargs);
+    PyObject *retval =  py_call_function (callable, args_tuple, kwargs);
+    Py_DECREF (args_tuple);
+    Py_XDECREF (kwargs);
 
-  return retval;
-}
+    return retval;
+  }
 
-PyObject *
-py_call_function (PyObject *callable, PyObject *args, PyObject *kwargs)
-{
-  PyObject *retval = PyEval_CallObjectWithKeywords (callable, args, kwargs);
-  if (! retval)
-    throw boost::python::error_already_set ();
+  PyObject *
+  py_call_function (PyObject *callable, PyObject *args, PyObject *kwargs)
+  {
+    PyObject *retval = PyEval_CallObjectWithKeywords (callable, args, kwargs);
+    if (! retval)
+      throw boost::python::error_already_set ();
 
-  return retval;
-}
+    return retval;
+  }
 
-PyObject *
-py_run_string_safe (const std::string& expr, int start, PyObject *globals,
-                    PyObject *locals)
-{
-  bool alloc = false;
+  PyObject *
+  py_run_string_safe (const std::string& expr, int start, PyObject *globals,
+                      PyObject *locals)
+  {
+    bool alloc = false;
 
-  if (! globals || (globals == Py_None))
-    {
-      PyObject *main = py_import_module ("__main__");
-      globals = PyModule_GetDict (main);
-      Py_DECREF (main);
-      if (! globals)
-        {
-          globals = PyDict_New ();
-          alloc = true;
-        }
-    }
+    if (! globals || (globals == Py_None))
+      {
+        PyObject *main = py_import_module ("__main__");
+        globals = PyModule_GetDict (main);
+        Py_DECREF (main);
+        if (! globals)
+          {
+            globals = PyDict_New ();
+            alloc = true;
+          }
+      }
 
-  if (! locals || (locals == Py_None))
-    locals = globals;
+    if (! locals || (locals == Py_None))
+      locals = globals;
 
-  // Evaluate all expressions under "from __future__ import print_function"
-  PyCompilerFlags flags { CO_FUTURE_PRINT_FUNCTION };
+    // Evaluate all expressions under "from __future__ import print_function"
+    PyCompilerFlags flags { CO_FUTURE_PRINT_FUNCTION };
 
-  PyObject *retval = PyRun_StringFlags (expr.c_str (), start, globals, locals,
-                                        &flags);
+    PyObject *retval = PyRun_StringFlags (expr.c_str (), start, globals, locals,
+                                          &flags);
 
-  if (alloc)
-    Py_DECREF (globals);
+    if (alloc)
+      Py_DECREF (globals);
 
-  if (! retval)
-    throw boost::python::error_already_set ();
+    if (! retval)
+      throw boost::python::error_already_set ();
 
-  return retval;
-}
+    return retval;
+  }
 
-PyObject *
-py_eval_string (const std::string& expr, PyObject *globals, PyObject *locals)
-{
-  return py_run_string_safe (expr, Py_eval_input, globals, locals);
-}
+  PyObject *
+  py_eval_string (const std::string& expr, PyObject *globals, PyObject *locals)
+  {
+    return py_run_string_safe (expr, Py_eval_input, globals, locals);
+  }
 
-PyObject *
-py_exec_string (const std::string& expr, PyObject *globals, PyObject *locals)
-{
-  return py_run_string_safe (expr, Py_file_input, globals, locals);
-}
+  PyObject *
+  py_exec_string (const std::string& expr, PyObject *globals, PyObject *locals)
+  {
+    return py_run_string_safe (expr, Py_file_input, globals, locals);
+  }
 
 }