Mercurial > octave-nkf
view libinterp/corefcn/getgrent.cc @ 20574:dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
* lo-array-gripes.h, lo-array-gripes.cc (index_exception):
New base class for indexing errors.
(invalid_index, out_of_range): New classes.
(gripe_index_out_of_range): New overloaded function.
(gripe_invalid_index): New overloaded functions.
Delete version with no arguments.
(gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch):
Delete.
Change uses of gripe functions as needed.
* Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use
exceptions to collect error info about and handle indexing errors.
* data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__,
do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__):
Likewise.
* oct-map.cc (octave_map::index, octave_map::assign,
octave_map::delete_elements): Likewise.
* sparse.cc (Fsparse): Likewise.
* sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests.
* utils.cc (dims_to_numel): Likewise.
* ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op,
octave_base_diag<DMT, MT>::subsasgn): Likewise.
* ov-base-mat.cc (octave_base_matrix<MT>::subsref,
octave_base_matrix<MT>::assign): Likewise.
* ov-base-sparse.cc (octave_base_sparse<T>::do_index_op,
octave_base_sparse<T>::assign,
octave_base_sparse<MT>::delete_elements): Likewise.
* ov-classdef.cc (cdef_object_array::subsref,
cdef_object_array::subsasgn): Likewise.
* ov-java.cc (make_java_index): Likewise.
* ov-perm.cc (octave_perm_matrix::do_index_op): Likewise.
* ov-range.cc (octave_range::do_index_op): Likewise.
* ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise.
* ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise.
* pt-assign.cc (tree_simple_assignment::rvalue1): Likewise.
* pt-idx.cc (tree_index_expression::rvalue,
tree_index_expression::lvalue): Likewise.
* Array-util.cc (sub2ind): Likewise.
* toplev.cc (main_loop): Also catch unhandled index_exception
exceptions.
* ov-base.cc (octave_base_value::index_vector): Improve error message.
* ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise.
* ov-complex.cc (complex_index): New class.
(gripe_complex_index): New function.
(octave_complex::index_vector): Use it.
* pt-id.h, pt-id.cc (tree_identifier::is_variable,
tree_black_hole::is_variable): Now const.
* pt-idx.cc (final_index_error): New static function.
(tree_index_expression::rvalue, tree_index_expression::lvalue):
Use it.
* index.tst: New tests.
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Fri, 02 Oct 2015 15:07:37 -0400 |
parents | 4f45eaf83908 |
children | f90c8372b7ba |
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 <string> #include <sys/types.h> #include "oct-group.h" #include "defun.h" #include "error.h" #include "gripes.h" #include "oct-map.h" #include "ov.h" #include "oct-obj.h" #include "utils.h" // Group file functions. (Why not?) static octave_value mk_gr_map (const octave_group& gr) { octave_value retval; if (gr) { octave_scalar_map m; m.assign ("name", gr.name ()); m.assign ("passwd", gr.passwd ()); m.assign ("gid", static_cast<double> (gr.gid ())); m.assign ("mem", octave_value (gr.mem ())); retval = m; } else retval = 0; return retval; } DEFUN (getgrent, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {@var{grp_struct} =} getgrent ()\n\ Return an entry from the group database, opening it if necessary.\n\ \n\ Once the end of data has been reached, @code{getgrent} returns 0.\n\ @seealso{setgrent, endgrent}\n\ @end deftypefn") { octave_value_list retval; retval(1) = std::string (); retval(0) = 0; int nargin = args.length (); if (nargin == 0) { std::string msg; retval(1) = msg; retval(0) = mk_gr_map (octave_group::getgrent (msg)); } else print_usage (); return retval; } DEFUN (getgrgid, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {@var{grp_struct} =} getgrgid (@var{gid}).\n\ Return the first entry from the group database with the group ID\n\ @var{gid}.\n\ \n\ If the group ID does not exist in the database, @code{getgrgid} returns 0.\n\ @seealso{getgrnam}\n\ @end deftypefn") { octave_value_list retval; retval(1) = std::string (); retval(0) = 0; int nargin = args.length (); if (nargin == 1) { double dval = args(0).double_value (); if (! error_state) { if (D_NINT (dval) == dval) { gid_t gid = static_cast<gid_t> (dval); std::string msg; retval(1) = msg; retval(0) = mk_gr_map (octave_group::getgrgid (gid, msg)); } else error ("getgrgid: GID must be an integer"); } } else print_usage (); return retval; } DEFUN (getgrnam, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {@var{grp_struct} =} getgrnam (@var{name})\n\ Return the first entry from the group database with the group name\n\ @var{name}.\n\ \n\ If the group name does not exist in the database, @code{getgrnam} returns 0.\n\ @seealso{getgrgid}\n\ @end deftypefn") { octave_value_list retval; retval(1) = std::string (); retval(0) = 0; int nargin = args.length (); if (nargin == 1) { std::string s = args(0).string_value (); if (! error_state) { std::string msg; retval(1) = msg; retval(0) = mk_gr_map (octave_group::getgrnam (s.c_str (), msg)); } } else print_usage (); return retval; } DEFUN (setgrent, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} setgrent ()\n\ Return the internal pointer to the beginning of the group database.\n\ @seealso{getgrent, endgrent}\n\ @end deftypefn") { octave_value_list retval; retval(1) = std::string (); retval(0) = -1.0; int nargin = args.length (); if (nargin == 0) { std::string msg; retval(1) = msg; retval(0) = static_cast<double> (octave_group::setgrent (msg)); } else print_usage (); return retval; } DEFUN (endgrent, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} endgrent ()\n\ Close the group database.\n\ @seealso{getgrent, setgrent}\n\ @end deftypefn") { octave_value_list retval; retval(1) = std::string (); retval(0) = -1.0; int nargin = args.length (); if (nargin == 0) { std::string msg; retval(1) = msg; retval(0) = static_cast<double> (octave_group::endgrent (msg)); } else print_usage (); return retval; }