Mercurial > octave
comparison libinterp/corefcn/variables.cc @ 33365:fb44a9db1bc6
Replace `xint_value` and related functions with stricter versions (bug #65538)
The conversion function `xint_value`, `xbool_value`, and `xidx_type_value`
were being used to convert input arguments to integers, booleans, or index
values respectively, and to provide a meaningful error message if the
conversion failed. The problem, as described in bug #65538, is that this
allows user code like `all (true (3), 2.718)` to be silently converted to
`all (true (3), 2)` instead of giving an error that the dimension needs to
be an integer. The same happens with `cell (e, pi)`, which silently creates
a 2x3 cell array. In both cases, this permissive conversion is a Matlab
incompatibility.
This patch provides an analogue of `xint_value` called `yint_value` that uses a
stricter conversion to integer, and also does the same for `bool` and
`idx_type` conversions. With this patch, passing non-integer sizes now gives
an error, and passing non-boolean values to boolean arguments now give a warning.
* libinterp/octave-value/ov.h: Define new functions `strict_int_value` and
`strict_bool_value` and declare new function `strict_idx_type_value`.
Declare corresponding new wrapper functions `yint_value`, `ybool_value`,
and `yidx_type_value`.
* libinterp/octave-value/ov.cc: Define `strict_idx_type_value`.
Define `yint_value`, `ybool_value`, and `yidx_type_value`
using the existing XVALUE_EXTRACTOR macro.
* Replace the corresponding function calls in: __eigs__.cc, besselj.cc,
bitfcns.cc, data.cc, file-io.cc, interpreter.cc, jsondecode.cc, load-path.cc,
oct-stream.cc, ov-cell.cc, psi.cc, pt-eval.cc, sparse.cc, strfns.cc,
syscalls.cc, time.cc, utils.cc, variables.cc, __glpk__.cc, __ode15__.cc,
pt-eval.cc
* NEWS.10.md: Add note about the Matlab compatibility of this patch.
Incidentally, the new conversion functions allow a FIXME note inside `fcntl`
to be addressed and removed.
author | Arun Giridhar <arungiridhar@gmail.com> |
---|---|
date | Mon, 08 Apr 2024 21:43:05 -0400 |
parents | 40fde86be9b0 |
children | fc12e1f3cd5d c714266d9f0d |
comparison
equal
deleted
inserted
replaced
33363:e95dabfeadb5 | 33365:fb44a9db1bc6 |
---|---|
599 if (nargin > 1) | 599 if (nargin > 1) |
600 print_usage (); | 600 print_usage (); |
601 | 601 |
602 if (nargin == 1) | 602 if (nargin == 1) |
603 { | 603 { |
604 bool bval = args(0).xbool_value ("%s: argument must be a logical value", nm); | 604 bool bval = args(0).ybool_value ("%s: argument must be a logical value", nm); |
605 | 605 |
606 var = bval; | 606 var = bval; |
607 } | 607 } |
608 | 608 |
609 return retval; | 609 return retval; |
673 if (nargin > 1) | 673 if (nargin > 1) |
674 print_usage (); | 674 print_usage (); |
675 | 675 |
676 if (nargin == 1) | 676 if (nargin == 1) |
677 { | 677 { |
678 int ival = args(0).xint_value ("%s: argument must be an integer value", nm); | 678 int ival = args(0).yint_value ("%s: argument must be an integer value", nm); |
679 | 679 |
680 if (ival < minval) | 680 if (ival < minval) |
681 error ("%s: arg must be greater than %d", nm, minval); | 681 error ("%s: arg must be greater than %d", nm, minval); |
682 if (ival > maxval) | 682 if (ival > maxval) |
683 error ("%s: arg must be less than or equal to %d", nm, maxval); | 683 error ("%s: arg must be less than or equal to %d", nm, maxval); |