Mercurial > pytave
comparison octave_to_python.cc @ 227:c56b85f405ba
maint: apply Octave whitespace rules
* @pyobject/display.m, @pyobject/dummy.m, @pyobject/methods.m,
@pyobject/pyobject.m, @pyobject/subsref.m, octave_to_python.cc: Use Octave
whitespace conventions around operators and function argument lists.
* pyeval.cc: Break up long line for readability.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 20 Jul 2016 11:57:14 -0700 |
| parents | 0c6f7ae8a95b |
| children | d51b3d120c85 |
comparison
equal
deleted
inserted
replaced
| 226:382bb1d91239 | 227:c56b85f405ba |
|---|---|
| 278 octvalue_to_pyarr (py_object, octvalue); | 278 octvalue_to_pyarr (py_object, octvalue); |
| 279 else if (octvalue.is_map ()) | 279 else if (octvalue.is_map ()) |
| 280 octmap_to_pyobject (py_object, octvalue.map_value ()); | 280 octmap_to_pyobject (py_object, octvalue.map_value ()); |
| 281 else if (octvalue.is_object ()) { | 281 else if (octvalue.is_object ()) { |
| 282 octave_value_list tmp = feval ("getid", ovl (octvalue), 1); | 282 octave_value_list tmp = feval ("getid", ovl (octvalue), 1); |
| 283 std::string hexid = tmp(0).string_value(); | 283 std::string hexid = tmp(0).string_value (); |
| 284 //std::cerr << "passed in hexid: " << hexid << std::endl; | |
| 285 // FIXME: added a messy ref to __InOct__ in __main__, find a better way | 284 // FIXME: added a messy ref to __InOct__ in __main__, find a better way |
| 286 py_object = boost::python::import("__main__").attr("__InOct__")[hexid]; | 285 py_object = boost::python::import ("__main__").attr ("__InOct__")[hexid]; |
| 287 } else | 286 } else |
| 288 throw value_convert_exception ( | 287 throw value_convert_exception ( |
| 289 "Conversion from Octave value not implemented"); | 288 "Conversion from Octave value not implemented"); |
| 290 } | 289 } |
| 291 | 290 |