Mercurial > hg > octave-nkf
diff src/ov-builtin.cc @ 10315:57a59eae83cc
untabify src C++ source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 11 Feb 2010 12:41:46 -0500 |
parents | b39bd23019eb |
children | f10d0bc8f9cc |
line wrap: on
line diff
--- a/src/ov-builtin.cc +++ b/src/ov-builtin.cc @@ -36,13 +36,13 @@ DEFINE_OCTAVE_ALLOCATOR (octave_builtin); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_builtin, - "built-in function", - "built-in function"); + "built-in function", + "built-in function"); octave_value_list octave_builtin::subsref (const std::string& type, - const std::list<octave_value_list>& idx, - int nargout) + const std::list<octave_value_list>& idx, + int nargout) { octave_value_list retval; @@ -50,17 +50,17 @@ { case '(': { - int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout; + int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout; - retval = do_multi_index_op (tmp_nargout, idx.front ()); + retval = do_multi_index_op (tmp_nargout, idx.front ()); } break; case '{': case '.': { - std::string nm = type_name (); - error ("%s cannot be indexed with %c", nm.c_str (), type[0]); + std::string nm = type_name (); + error ("%s cannot be indexed with %c", nm.c_str (), type[0]); } break; @@ -103,8 +103,8 @@ frame.add_fcn (octave_call_stack::pop); try - { - retval = (*f) (args, nargout); + { + retval = (*f) (args, nargout); // Do not allow null values to be returned from functions. // FIXME -- perhaps true builtins should be allowed? retval.make_storable_values (); @@ -116,11 +116,11 @@ // the idiom is very common, so we solve that here. if (retval.length () == 1 && retval.xelem (0).is_undefined ()) retval.clear (); - } + } catch (octave_execution_exception) - { - gripe_library_execution_error (); - } + { + gripe_library_execution_error (); + } } return retval;