Mercurial > hg > octave-jordi
view libinterp/parse-tree/pt-colon.cc @ 20961:3aa293be0e8d
maint: Invert simple conditionals in if/else/error paradigm.
Invert conditional in if statement and place error next to if.
Delete else, and decrease code indent by 4.
* cellfun.cc, data.cc, debug.cc, dirfns.cc, dynamic-ld.cc, file-io.cc,
gl2ps-renderer.cc, graphics.cc, graphics.in.h, hex2num.cc, load-save.cc,
ls-mat-ascii.cc, ls-oct-text.cc, oct-hist.cc, oct-lvalue.cc, oct-map.cc,
toplev.cc, __init_fltk__.cc, ov-base-int.cc, ov-bool-mat.cc, ov-cell.cc,
ov-class.cc, ov-classdef.cc, ov-cx-mat.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-str-mat.cc, ov-struct.cc,
ov-usr-fcn.cc, ov.cc, pt-arg-list.cc, pt-assign.cc, pt-colon.cc, pt-eval.cc,
pt-exp.cc:
Invert conditional in if statement and place error next to if.
Delete else, and decrease code indent by 4.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 22 Dec 2015 10:29:22 -0800 |
parents | 48b2ad5ee801 |
children |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "ovl.h" #include "pager.h" #include "ov.h" #include "pt-bp.h" #include "pt-colon.h" #include "pt-walk.h" // Colon expressions. tree_colon_expression * tree_colon_expression::append (tree_expression *t) { tree_colon_expression *retval = 0; if (! op_base) error ("invalid colon expression"); if (op_limit) { if (op_increment) error ("invalid colon expression"); // Stupid syntax: // // base : limit // base : increment : limit op_increment = op_limit; op_limit = t; } else op_limit = t; retval = this; return retval; } octave_value_list tree_colon_expression::rvalue (int nargout) { if (nargout > 1) error ("invalid number of output arguments for colon expression"); return rvalue1 (nargout); } octave_value tree_colon_expression::rvalue1 (int) { octave_value retval; if (! op_base || ! op_limit) return retval; octave_value ov_base = op_base->rvalue1 (); octave_value ov_limit = op_limit->rvalue1 (); if (ov_base.is_object () || ov_limit.is_object ()) { octave_value_list tmp1; if (op_increment) { octave_value ov_increment = op_increment->rvalue1 (); tmp1(2) = ov_limit; tmp1(1) = ov_increment; tmp1(0) = ov_base; } else { tmp1(1) = ov_limit; tmp1(0) = ov_base; } octave_value fcn = symbol_table::find_function ("colon", tmp1); if (! fcn.is_defined ()) error ("can not find overloaded colon function"); octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1); retval = tmp2 (0); } else { octave_value ov_increment = 1.0; if (op_increment) ov_increment = op_increment->rvalue1 (); retval = do_colon_op (ov_base, ov_increment, ov_limit, is_for_cmd_expr ()); } return retval; } void tree_colon_expression::eval_error (const std::string& s) const { error ("%s", s.c_str ()); } int tree_colon_expression::line (void) const { return (op_base ? op_base->line () : (op_increment ? op_increment->line () : (op_limit ? op_limit->line () : -1))); } int tree_colon_expression::column (void) const { return (op_base ? op_base->column () : (op_increment ? op_increment->column () : (op_limit ? op_limit->column () : -1))); } tree_expression * tree_colon_expression::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_colon_expression *new_ce = new tree_colon_expression (op_base ? op_base->dup (scope, context) : 0, op_limit ? op_limit->dup (scope, context) : 0, op_increment ? op_increment->dup (scope, context) : 0, line (), column ()); new_ce->copy_base (*new_ce); return new_ce; } void tree_colon_expression::accept (tree_walker& tw) { tw.visit_colon_expression (*this); }