Mercurial > octave
diff src/pt-arg-list.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 | 37a08e0ce2dc |
children | fd0a3ac60b0e |
line wrap: on
line diff
--- a/src/pt-arg-list.cc Thu Feb 11 12:23:32 2010 -0500 +++ b/src/pt-arg-list.cc Thu Feb 11 12:41:46 2010 -0500 @@ -65,7 +65,7 @@ tree_expression *elt = *p; if (elt && elt->has_magic_end ()) - return true; + return true; } return false; @@ -94,7 +94,7 @@ tree_expression *elt = *p; if (! elt->is_constant ()) - return false; + return false; } return true; @@ -112,46 +112,46 @@ if (indexed_object) { if (indexed_object->is_object ()) - { - octave_value_list args; + { + octave_value_list args; - args(2) = num_indices; - args(1) = index_position + 1; - args(0) = *indexed_object; + args(2) = num_indices; + args(1) = index_position + 1; + args(0) = *indexed_object; - std::string class_name = indexed_object->class_name (); + std::string class_name = indexed_object->class_name (); - octave_value meth = symbol_table::find_method ("end", class_name); + octave_value meth = symbol_table::find_method ("end", class_name); - if (meth.is_defined ()) - return feval (meth.function_value (), args, 1); - } + if (meth.is_defined ()) + return feval (meth.function_value (), args, 1); + } dim_vector dv = indexed_object->dims (); int ndims = dv.length (); if (num_indices < ndims) - { - for (int i = num_indices; i < ndims; i++) - dv(num_indices-1) *= dv(i); + { + for (int i = num_indices; i < ndims; i++) + dv(num_indices-1) *= dv(i); - if (num_indices == 1) - { - ndims = 2; - dv.resize (ndims); - dv(1) = 1; - } - else - { - ndims = num_indices; - dv.resize (ndims); - } - } + if (num_indices == 1) + { + ndims = 2; + dv.resize (ndims); + dv(1) = 1; + } + else + { + ndims = num_indices; + dv.resize (ndims); + } + } if (index_position < ndims) - retval = dv(index_position); + retval = dv(index_position); else - retval = 1; + retval = 1; } else ::error ("invalid use of end"); @@ -166,9 +166,9 @@ // way of asking an octave_value object this question? bool stash_object = (list_includes_magic_end - && object - && ! (object->is_function () - || object->is_function_handle ())); + && object + && ! (object->is_function () + || object->is_function_handle ())); unwind_protect frame; @@ -187,39 +187,39 @@ for (int k = 0; k < len; k++) { if (stash_object) - { - frame.protect_var (index_position); - frame.protect_var (num_indices); + { + frame.protect_var (index_position); + frame.protect_var (num_indices); - index_position = k; - num_indices = len; - } + index_position = k; + num_indices = len; + } tree_expression *elt = *p++; if (elt) - { - octave_value tmp = elt->rvalue1 (); + { + octave_value tmp = elt->rvalue1 (); - if (error_state) - { - ::error ("evaluating argument list element number %d", k+1); - args.clear (); - break; - } - else - { - if (tmp.is_cs_list ()) + if (error_state) + { + ::error ("evaluating argument list element number %d", k+1); + args.clear (); + break; + } + else + { + if (tmp.is_cs_list ()) args.push_back (tmp.list_value ()); - else if (tmp.is_defined ()) + else if (tmp.is_defined ()) args.push_back (tmp); - } - } + } + } else - { - args.push_back (octave_value ()); - break; - } + { + args.push_back (octave_value ()); + break; + } } return args; @@ -263,7 +263,7 @@ tree_argument_list * tree_argument_list::dup (symbol_table::scope_id scope, - symbol_table::context_id context) const + symbol_table::context_id context) const { tree_argument_list *new_list = new tree_argument_list ();